diff options
| author | mm <mm@FreeBSD.org> | 2017-03-31 20:17:30 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2017-03-31 20:17:30 +0000 |
| commit | f0e80d829a6d0ff8bb7a46bd3a18dd6159b14284 (patch) | |
| tree | 84dbcb37ab6d18d2bdca41e5d81d0f07c4723cc5 /usr.bin | |
| parent | 7260a33b7604c94dd57a1c9a2e65bf9eb08fd238 (diff) | |
| download | FreeBSD-src-f0e80d829a6d0ff8bb7a46bd3a18dd6159b14284.zip FreeBSD-src-f0e80d829a6d0ff8bb7a46bd3a18dd6159b14284.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 a236505..1eb4de7 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 06a4d59..a303ee2 100644 --- a/usr.bin/cpio/tests/Makefile +++ b/usr.bin/cpio/tests/Makefile @@ -16,6 +16,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 583c6ee..6cd3e29 100644 --- a/usr.bin/tar/tests/Makefile +++ b/usr.bin/tar/tests/Makefile @@ -12,6 +12,7 @@ BINDIR= ${TESTSDIR} CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\" CFLAGS+= -I${SRCTOP}/lib/libarchive -I${.OBJDIR} CFLAGS+= -I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/tar/test +CFLAGS+= -I${LIBARCHIVEDIR}/libarchive CFLAGS+= -I${LIBARCHIVEDIR}/test_utils # Uncomment to link against dmalloc @@ -71,6 +72,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 \ |
