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 /usr.bin/cpio | |
| parent | e052a8b932e5ff38489ab517d092fd05ba650cb0 (diff) | |
| parent | 46ab065716a6ecbe96471bebf59ab452a0edcdac (diff) | |
| download | src-642870485c089b57000fe538d3485e272b038d59.tar.gz src-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 'usr.bin/cpio')
| -rw-r--r-- | usr.bin/cpio/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/cpio/tests/Makefile | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile index 6af6018c39fd..d9a2d2822458 100644 --- a/usr.bin/cpio/Makefile +++ b/usr.bin/cpio/Makefile @@ -6,7 +6,7 @@ _LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive _LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive PROG= bsdcpio -BSDCPIO_VERSION_STRING= 3.2.2 +BSDCPIO_VERSION_STRING= 3.3.1 .PATH: ${_LIBARCHIVEDIR}/cpio SRCS= cpio.c cmdline.c diff --git a/usr.bin/cpio/tests/Makefile b/usr.bin/cpio/tests/Makefile index 5ffa27fe53cd..68097222dad5 100644 --- a/usr.bin/cpio/tests/Makefile +++ b/usr.bin/cpio/tests/Makefile @@ -14,8 +14,8 @@ CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\" CFLAGS+= -I${SRCTOP}/lib/libarchive -I${.OBJDIR} CFLAGS+= -I${.OBJDIR} -CFLAGS+= -I${_LIBARCHIVEDIR}/cpio -I${_LIBARCHIVEDIR}/libarchive_fe -CFLAGS+= -I${_LIBARCHIVEDIR}/test_utils +CFLAGS+= -I${_LIBARCHIVEDIR}/cpio -I${_LIBARCHIVEDIR}/cpio/test +CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive_fe -I${_LIBARCHIVEDIR}/test_utils # Uncomment to link against dmalloc #LDADD+= -L/usr/local/lib -ldmalloc @@ -78,11 +78,11 @@ TESTS_SRCS= \ SRCS.bsdcpio_test= list.h \ ${CPIO_SRCS} \ - ${TESTS_SRCS} \ - main.c + ${TESTS_SRCS} .PATH: ${_LIBARCHIVEDIR}/test_utils -SRCS.bsdcpio_test+= test_utils.c +SRCS.bsdcpio_test+= test_main.c \ + test_utils.c LIBADD.bsdcpio_test= archive |