diff options
author | Martin Matuska <mm@FreeBSD.org> | 2019-12-28 23:40:32 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2019-12-28 23:40:32 +0000 |
commit | 6922acad9a482c17c7af1acdb4d11d03f19bb1dc (patch) | |
tree | b7e2717582504805f31e2195f7c74c5d6fa82a45 /build | |
parent | a297901e6c90d415ac49c88002dd4e02dc49e32b (diff) | |
download | src-6922acad9a482c17c7af1acdb4d11d03f19bb1dc.tar.gz src-6922acad9a482c17c7af1acdb4d11d03f19bb1dc.zip |
Update vendor/libarchive/dist to git 1dae5a549fe4ab99fd3a49a9edcf897a7b2b1844
Relevant vendor changes:
Issue #351: Refactor and implement private state logic for write filters
PR #1252: RAR5 reader - verify window size for solid files (OSS-Fuzz 15482)
PR #1255: zip writer - don't append unused NUL for directories
PR #1260: Fix sparse file offset overflow on 32-bit systems
PR #1263: UNICODE filename support for reading lha/lzh format
Issue #1276: Bugfix and optimize archive_wstring_append_from_mbs()
PR #1288: Add the "xattrhdr" option to pax write options
PR #1295: 7z reader - fix reading archives with digests in PackInfo
PR #1296: RAR5 reader - verify window size for multivolume archives
PR #1297: ZIP reader - support LZMA_STREAM_END marker in 'lzma alone' files
Issue #1298: Fix a heap-buffer-overflow in archive_string_append_from_wcs()
OSS-Fuzz 19360, 19362: LHA reader - plug two memory leaks on error
Fix possible off-by-one when dealing with readlink(2)
Notes
Notes:
svn path=/vendor/libarchive/dist/; revision=356163
Diffstat (limited to 'build')
-rw-r--r-- | build/ci/cirrus_ci/Dockerfile.fc30.distcheck | 2 | ||||
-rwxr-xr-x | build/ci/github_actions/ci.cmd | 79 | ||||
-rwxr-xr-x | build/ci/github_actions/macos.sh | 10 |
3 files changed, 90 insertions, 1 deletions
diff --git a/build/ci/cirrus_ci/Dockerfile.fc30.distcheck b/build/ci/cirrus_ci/Dockerfile.fc30.distcheck index b59044be37a8..0129ec44e92a 100644 --- a/build/ci/cirrus_ci/Dockerfile.fc30.distcheck +++ b/build/ci/cirrus_ci/Dockerfile.fc30.distcheck @@ -1,3 +1,3 @@ FROM fedora:30 -RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel libasan librichacl-devel bzip2-devel libzip-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel groff ghostscript +RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel libasan librichacl-devel bzip2-devel libzip-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel groff ghostscript xz zip diff --git a/build/ci/github_actions/ci.cmd b/build/ci/github_actions/ci.cmd new file mode 100755 index 000000000000..30626d5c2a40 --- /dev/null +++ b/build/ci/github_actions/ci.cmd @@ -0,0 +1,79 @@ +@ECHO OFF +SET ZLIB_VERSION=1.2.11 +IF NOT "%BE%"=="mingw-gcc" ( + IF NOT "%BE%"=="msvc" ( + ECHO Environment variable BE must be mingw-gcc or msvc + EXIT /b 1 + ) +) + +IF "%1"=="deplibs" ( + IF NOT EXIST build_ci\libs ( + MKDIR build_ci\libs + ) + CD build_ci\libs + IF NOT EXIST zlib-%ZLIB_VERSION%.tar.gz ( + curl -o zlib-%ZLIB_VERSION%.tar.gz https://www.zlib.net/zlib-%ZLIB_VERSION%.tar.gz + ) + IF NOT EXIST zlib-%ZLIB_VERSION% ( + tar -x -z -f zlib-%ZLIB_VERSION%.tar.gz + ) + CD zlib-%ZLIB_VERSION% + IF "%BE%"=="mingw-gcc" ( + SET PATH=C:\Program Files\cmake\bin;C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin + cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE="Release" . || EXIT /b 1 + mingw32-make || EXIT /b 1 + mingw32-make test || EXIT /b 1 + mingw32-make install || EXIT /b 1 + ) ELSE IF "%BE%"=="msvc" ( + cmake -G "Visual Studio 16 2019" . || EXIT /b 1 + cmake --build . --target ALL_BUILD --config Release || EXIT /b 1 + cmake --build . --target RUN_TESTS --config Release || EXIT /b 1 + cmake --build . --target INSTALL --config Release || EXIT /b 1 + ) +) ELSE IF "%1%"=="configure" ( + IF "%BE%"=="mingw-gcc" ( + SET PATH=C:\Program Files\cmake\bin;C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin + MKDIR build_ci\cmake + CD build_ci\cmake + cmake -G "MinGW Makefiles" ..\.. || EXIT /b 1 + ) ELSE IF "%BE%"=="msvc" ( + MKDIR build_ci\cmake + CD build_ci\cmake + cmake -G "Visual Studio 16 2019" -D CMAKE_BUILD_TYPE="Release" ..\.. || EXIT /b 1 + ) +) ELSE IF "%1%"=="build" ( + IF "%BE%"=="mingw-gcc" ( + SET PATH=C:\Program Files\cmake\bin;C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin + CD build_ci\cmake + mingw32-make || EXIT /b 1 + ) ELSE IF "%BE%"=="msvc" ( + CD build_ci\cmake + cmake --build . --target ALL_BUILD --config Release + ) +) ELSE IF "%1%"=="test" ( + IF "%BE%"=="mingw-gcc" ( + SET PATH=C:\Program Files\cmake\bin;C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin + COPY "C:\Program Files (x86)\zlib\bin\libzlib.dll" build_ci\cmake\bin\ + CD build_ci\cmake + SET SKIP_TEST_SPARSE=1 + mingw32-make test + ) ELSE IF "%BE%"=="msvc" ( + ECHO "Skipping tests on this platform" + EXIT /b 0 + REM CD build_ci\cmake + REM cmake --build . --target RUN_TESTS --config Release + ) +) ELSE IF "%1%"=="install" ( + IF "%BE%"=="mingw-gcc" ( + SET PATH=C:\Program Files\cmake\bin;C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin + CD build_ci\cmake + mingw32-make install DESTDIR=%cd%\destdir + ) ELSE IF "%BE%"=="msvc" ( + cmake --build . --target INSTALL --config Release + ) +) ELSE ( + ECHO "Usage: %0% deplibs|configure|build|test|install" + @EXIT /b 0 +) +@EXIT /b 0 diff --git a/build/ci/github_actions/macos.sh b/build/ci/github_actions/macos.sh new file mode 100755 index 000000000000..e51574cb6dfa --- /dev/null +++ b/build/ci/github_actions/macos.sh @@ -0,0 +1,10 @@ +#!/bin/sh +if [ "$1" = "prepare" ] +then + set -x -e + brew update > /dev/null + for pkg in autoconf automake libtool pkg-config cmake xz lz4 zstd + do + brew list $pkg > /dev/null && brew upgrade $pkg || brew install $pkg + done +fi |