diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2017-03-02 22:59:35 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2017-03-02 22:59:35 +0000 |
| commit | 642870485c089b57000fe538d3485e272b038d59 (patch) | |
| tree | eb88fb7d23d0c851d0e21ab26701dce90d7e7aff /lib/libarchive | |
| parent | e052a8b932e5ff38489ab517d092fd05ba650cb0 (diff) | |
| parent | 46ab065716a6ecbe96471bebf59ab452a0edcdac (diff) | |
| download | src-test-642870485c089b57000fe538d3485e272b038d59.tar.gz src-test-642870485c089b57000fe538d3485e272b038d59.zip | |
MFV r314565,314567,314570:
Update libarchive to version 3.3.1 (and sync with latest vendor dist)
Notable vendor changes:
PR #501: improvements in ACL path handling
PR #724: fix hang when reading malformed cpio files
PR #864: fix out of bounds read with malformed GNU tar archives
Documentation, style, test suite improvements and typo fixes.
New options to bsdtar that enable or disable reading and/or writing of:
Access Control Lists (--acls, --no-acls)
Extended file flags (--fflags, --no-fflags)
Extended attributes (--xattrs, --no-xattrs)
Mac OS X metadata (Mac OS X only) (--mac-metadata, --no-mac-metadata)
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=314571
Diffstat (limited to 'lib/libarchive')
| -rw-r--r-- | lib/libarchive/config_freebsd.h | 4 | ||||
| -rw-r--r-- | lib/libarchive/tests/Makefile | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/libarchive/config_freebsd.h b/lib/libarchive/config_freebsd.h index 4fb7b867a37a4..2c4b6b512a473 100644 --- a/lib/libarchive/config_freebsd.h +++ b/lib/libarchive/config_freebsd.h @@ -40,9 +40,9 @@ #define HAVE_ACL_SET_FD_NP 1 #define HAVE_ACL_SET_FILE 1 #define HAVE_ACL_SET_LINK_NP 1 -#define HAVE_ACL_USER 1 -#define HAVE_ACL_TYPE_NFS4 1 #define HAVE_ARC4RANDOM_BUF 1 +#define HAVE_DECL_ACL_USER 1 +#define HAVE_DECL_ACL_TYPE_NFS4 1 #define HAVE_EXTATTR_GET_FILE 1 #define HAVE_EXTATTR_LIST_FILE 1 #define HAVE_EXTATTR_SET_FD 1 diff --git a/lib/libarchive/tests/Makefile b/lib/libarchive/tests/Makefile index aec1cbbb0e321..b08b14215a38f 100644 --- a/lib/libarchive/tests/Makefile +++ b/lib/libarchive/tests/Makefile @@ -13,7 +13,8 @@ BINDIR= ${TESTSDIR} PROGS+= libarchive_test CFLAGS+= -I${.CURDIR} -I${.CURDIR:H} -I${.OBJDIR} -CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive -I${_LIBARCHIVEDIR}/test_utils +CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive -I${_LIBARCHIVEDIR}/libarchive/test +CFLAGS+= -I${_LIBARCHIVEDIR}/test_utils CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 # Uncomment to link against dmalloc @@ -302,14 +303,14 @@ BROKEN_TESTS+= test_fuzz_rar # Build the test program. SRCS.libarchive_test= \ ${TESTS_SRCS} \ - main.c \ read_open_memory.c \ list.h LIBADD.libarchive_test= archive .PATH: ${_LIBARCHIVEDIR}/test_utils -SRCS.libarchive_test+= test_utils.c +SRCS.libarchive_test+= test_main.c \ + test_utils.c # list.h is just a list of all tests, as indicated by DEFINE_TEST macro lines list.h: ${TESTS_SRCS} Makefile |