aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2017-02-02 00:20:18 +0000
committerMartin Matuska <mm@FreeBSD.org>2017-02-02 00:20:18 +0000
commit91360634ece33ffde0dc7c89bdb0ba8a0eb97d66 (patch)
tree53a8f9e8137b415bcb63b98463e2eb9821dabe3a /build
parent2a59734ec264ae1b692d282b01434fa4d4a1a083 (diff)
downloadsrc-91360634ece33ffde0dc7c89bdb0ba8a0eb97d66.tar.gz
src-91360634ece33ffde0dc7c89bdb0ba8a0eb97d66.zip
Update vendor/libarchive to git d77b577b2d5aa259fca06313c4940e1e61ab1e0e
Vendor changes (relevant to FreeBSD): - bugfixes, improvemens and optimizations in ACL code - NFSv4 ACLs can now be extracted from Solaris tar archives Security fixes: - cab reader: endless loop when parsing MSZIP signature (OSS-Fuzz 335) - LHA reader: heap-buffer-overflow in lha_read_file_header_1() (CVE-2017-5601) - LZ4 reader: null-pointer dereference in lz4_filter_read_legacy_stream() (OSS-Fuzz 453) - mtree reader: heap-buffer-overflow in detect_form() (OSS-Fuzz 421, 443) - WARC reader: heap-buffer-overflow in xstrpisotime() (OSS-Fuzz 382, 458) Memory leak fixes: - ACL support: free memory allocated by acl_get_qualifier() - disk writer: missing free in create_filesystem_object() - file reader: fd leak (Coverity 1016755) - gnutar writer: fix free in archive_write_gnutar_header() (Coverity 1016752) - iso 9660 reader: missing free in parse_file_info() (part. Coverity 1016754) - program reader: missing free in __archive_read_program() - program writer: missing free in __archive_write_program_free() - xar reader: missing free in xar_cleanup() - xar reader: missing frees in expat_xmlattr_setup() (Coverity 1229979-1229981) - xar writer: missing free in file_free() - zip reader: missing free in zip_read_locazip_read_local_file_header()
Notes
Notes: svn path=/vendor/libarchive/dist/; revision=313071
Diffstat (limited to 'build')
-rwxr-xr-xbuild/ci_build.sh10
-rwxr-xr-xbuild/ci_test_driver4
-rw-r--r--build/cmake/config.h.in6
3 files changed, 14 insertions, 6 deletions
diff --git a/build/ci_build.sh b/build/ci_build.sh
index 96f3aeaecb65..65e5ceb54478 100755
--- a/build/ci_build.sh
+++ b/build/ci_build.sh
@@ -12,6 +12,8 @@
ACTIONS=
BUILD_SYSTEM="${BUILD_SYSTEM:-autotools}"
+MAKE="${MAKE:-make}"
+CMAKE="${CMAKE:-cmake}"
CURDIR=`pwd`
SRCDIR="${SRCDIR:-`pwd`}"
RET=0
@@ -79,21 +81,21 @@ for action in ${ACTIONS}; do
configure)
case "${BUILD_SYSTEM}" in
autotools) "${SRCDIR}/configure" ${CONFIGURE_ARGS} ;;
- cmake) cmake ${CONFIGURE_ARGS} "${SRCDIR}" ;;
+ cmake) ${CMAKE} ${CONFIGURE_ARGS} "${SRCDIR}" ;;
esac
RET="$?"
;;
build)
- make ${MAKE_ARGS}
+ ${MAKE} ${MAKE_ARGS}
RET="$?"
;;
test)
case "${BUILD_SYSTEM}" in
autotools)
- make ${MAKE_ARGS} check LOG_DRIVER="${SRCDIR}/build/ci_test_driver"
+ ${MAKE} ${MAKE_ARGS} check LOG_DRIVER="${SRCDIR}/build/ci_test_driver"
;;
cmake)
- make ${MAKE_ARGS} test
+ ${MAKE} ${MAKE_ARGS} test
;;
esac
RET="$?"
diff --git a/build/ci_test_driver b/build/ci_test_driver
index 5feb950dae1a..69a5463c10e8 100755
--- a/build/ci_test_driver
+++ b/build/ci_test_driver
@@ -104,8 +104,8 @@ trap "st=141; $do_exit" 13
trap "st=143; $do_exit" 15
# Test script is run here.
-"$@" | tee $log_file 2>&1
-estatus=$?
+( "$@"; echo "$?" > $log_file.s ) | tee $log_file 2>&1
+estatus=`cat $log_file.s`
if test $enable_hard_errors = no && test $estatus -eq 99; then
tweaked_estatus=1
diff --git a/build/cmake/config.h.in b/build/cmake/config.h.in
index 053d2051171e..ec64d9937fab 100644
--- a/build/cmake/config.h.in
+++ b/build/cmake/config.h.in
@@ -326,6 +326,12 @@ typedef uint64_t uintmax_t;
/* Define to 1 if you have the `acl_set_file' function. */
#cmakedefine HAVE_ACL_SET_FILE 1
+/* True for FreeBSD with NFSv4 ACL support */
+#cmakedefine HAVE_ACL_TYPE_NFS4 1
+
+/* True for MacOS ACL support */
+#cmakedefine HAVE_ACL_TYPE_EXTENDED 1
+
/* True for systems with POSIX ACL support */
#cmakedefine HAVE_ACL_USER 1