diff options
| author | mm <mm@FreeBSD.org> | 2017-03-16 23:07:35 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2017-03-16 23:07:35 +0000 |
| commit | 99a56fe1b3244c4c0893cbde134f95240c2cb300 (patch) | |
| tree | b81a8b624680568b08a3fee74f150b3f7d0b45ae /lib/libarchive | |
| parent | 4416a7d59a7367310c8eadaed9724e28ed78fddd (diff) | |
| download | FreeBSD-src-99a56fe1b3244c4c0893cbde134f95240c2cb300.zip FreeBSD-src-99a56fe1b3244c4c0893cbde134f95240c2cb300.tar.gz | |
MFC r314571:
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)
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 4fb7b86..2c4b6b5 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 14ab70c..6bf4d00 100644 --- a/lib/libarchive/tests/Makefile +++ b/lib/libarchive/tests/Makefile @@ -11,7 +11,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 @@ -299,14 +300,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 |
