diff options
| author | mm <mm@FreeBSD.org> | 2017-03-31 20:16:24 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2017-03-31 20:16:24 +0000 |
| commit | c4acb95df997ab3d4f1acdddbcf65425cdb0d855 (patch) | |
| tree | 737cf37e997cc3779755920fc460b6f315a6ab02 /usr.bin | |
| parent | b93ced301f97c88b161a03dd5864028e55a13b57 (diff) | |
| download | FreeBSD-src-c4acb95df997ab3d4f1acdddbcf65425cdb0d855.zip FreeBSD-src-c4acb95df997ab3d4f1acdddbcf65425cdb0d855.tar.gz | |
MFC r315636,315876,316095:
Sync libarchive with vendor
Vendor changes/bugfixes (FreeBSD-related):
r315636:
PR 867 (bsdcpio): show numeric uid/gid when names are not found
PR 870 (seekable zip): accept files with valid ZIP64 EOCD headers
PR 880 (pax): Fix handling of "size" pax header keyword
PR 887 (crypto): Discard 3072 bytes instead of 1024 of first keystream
OSS-Fuzz issue 806 (mtree): rework mtree_atol10 integer parser
Break ACL read/write code into platform-specific source files
r315876:
Store extended attributes with extattr_set_link() if no fd is provided
Add extended attribute tests to libarchive and bsdtar
Fix tar's test_option_acls
Support the UF_HIDDEN file flag
r316095:
Constify variables in several places
Unify platform ACL code in a single source file
Fix unused variable if compiling on FreeBSD without NFSv4 ACL support
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/bsdcat/tests/Makefile | 1 | ||||
| -rw-r--r-- | usr.bin/cpio/tests/Makefile | 1 | ||||
| -rw-r--r-- | usr.bin/tar/tests/Makefile | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/usr.bin/bsdcat/tests/Makefile b/usr.bin/bsdcat/tests/Makefile index 67dd3d2..2aa678b 100644 --- a/usr.bin/bsdcat/tests/Makefile +++ b/usr.bin/bsdcat/tests/Makefile @@ -15,6 +15,7 @@ CFLAGS+= -I${SRCTOP}/lib/libarchive -I${.OBJDIR} CFLAGS+= -I${.OBJDIR} CFLAGS+= -I${_LIBARCHIVEDIR}/cat -I${_LIBARCHIVEDIR}/cat/test +CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive_fe -I${_LIBARCHIVEDIR}/test_utils # Uncomment to link against dmalloc diff --git a/usr.bin/cpio/tests/Makefile b/usr.bin/cpio/tests/Makefile index 6809722..b71bdca 100644 --- a/usr.bin/cpio/tests/Makefile +++ b/usr.bin/cpio/tests/Makefile @@ -15,6 +15,7 @@ CFLAGS+= -I${SRCTOP}/lib/libarchive -I${.OBJDIR} CFLAGS+= -I${.OBJDIR} CFLAGS+= -I${_LIBARCHIVEDIR}/cpio -I${_LIBARCHIVEDIR}/cpio/test +CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive_fe -I${_LIBARCHIVEDIR}/test_utils # Uncomment to link against dmalloc diff --git a/usr.bin/tar/tests/Makefile b/usr.bin/tar/tests/Makefile index 8ca241c..c64686e 100644 --- a/usr.bin/tar/tests/Makefile +++ b/usr.bin/tar/tests/Makefile @@ -10,6 +10,7 @@ BINDIR= ${TESTSDIR} CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\" CFLAGS+= -I${SRCTOP}/lib/libarchive -I${.OBJDIR} +CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive CFLAGS+= -I${_LIBARCHIVEDIR}/tar -I${_LIBARCHIVEDIR}/tar/test CFLAGS+= -I${_LIBARCHIVEDIR}/test_utils @@ -70,6 +71,7 @@ TESTS_SRCS= \ test_option_s.c \ test_option_uid_uname.c \ test_option_uuencode.c \ + test_option_xattrs.c \ test_option_xz.c \ test_option_z.c \ test_patterns.c \ |
