diff options
| author | mm <mm@FreeBSD.org> | 2016-05-12 10:16:16 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2016-05-12 10:16:16 +0000 |
| commit | 38e8840f4092f38d069f10e0098d0b3ef7b553d3 (patch) | |
| tree | b8221b5b091ffc72b700d5da57daaa86ae023d82 /usr.bin/cpio | |
| parent | 8fc2673ccd9558e8b138810452cbddc215a38b16 (diff) | |
| parent | 3404e2c539d8aa7c8a2fcf64dc5700817487fd3c (diff) | |
| download | FreeBSD-src-38e8840f4092f38d069f10e0098d0b3ef7b553d3.zip FreeBSD-src-38e8840f4092f38d069f10e0098d0b3ef7b553d3.tar.gz | |
MFV r299425:
Update libarchive to 3.2.0
New features:
- new bsdcat command-line utility
- LZ4 compression (in src only via external utility from ports)
- Warc format support
- 'Raw' format writer
- Zip: Support archives >4GB, entries >4GB
- Zip: Support encrypting and decrypting entries
- Zip: Support experimental streaming extension
- Identify encrypted entries in several formats
- New --clear-nochange-flags option to bsdtar tries to remove noschg and
similar flags before deleting files
- New --ignore-zeros option to bsdtar to handle concatenated tar archives
- Use multi-threaded LZMA decompression if liblzma supports it
- Expose version info for libraries used by libarchive
Patched files (fixed compiler warnings):
contrib/libarchive/cat/bsdcat.c (vendor PR #702)
contrib/libarchive/cat/bsdcat.h (vendor PR #702)
contrib/libarchive/libarchive/archive_read_support_format_mtree.c (PR #701)
contrib/libarchive/libarchive_fe/err.c (vendor PR #703)
MFC after: 1 month
Relnotes: yes
Diffstat (limited to 'usr.bin/cpio')
| -rw-r--r-- | usr.bin/cpio/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/cpio/tests/Makefile | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile index a057822..539f44e 100644 --- a/usr.bin/cpio/Makefile +++ b/usr.bin/cpio/Makefile @@ -6,13 +6,13 @@ _LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive _LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive PROG= bsdcpio -BSDCPIO_VERSION_STRING= 3.1.2 +BSDCPIO_VERSION_STRING= 3.2.0 .PATH: ${_LIBARCHIVEDIR}/cpio SRCS= cpio.c cmdline.c .PATH: ${_LIBARCHIVEDIR}/libarchive_fe -SRCS+= err.c line_reader.c +SRCS+= err.c line_reader.c passphrase.c CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\" CFLAGS+= -DPLATFORM_CONFIG_H=\"${_LIBARCHIVECONFDIR}/config_freebsd.h\" diff --git a/usr.bin/cpio/tests/Makefile b/usr.bin/cpio/tests/Makefile index a2a3c11..2a23f17 100644 --- a/usr.bin/cpio/tests/Makefile +++ b/usr.bin/cpio/tests/Makefile @@ -38,6 +38,7 @@ TESTS_SRCS= \ test_extract_cpio_gz.c \ test_extract_cpio_lrz.c \ test_extract_cpio_lz.c \ + test_extract_cpio_lz4.c \ test_extract_cpio_lzma.c \ test_extract_cpio_lzo.c \ test_extract_cpio_xz.c \ @@ -58,9 +59,11 @@ TESTS_SRCS= \ test_option_help.c \ test_option_l.c \ test_option_lrzip.c \ + test_option_lz4.c \ test_option_lzma.c \ test_option_lzop.c \ test_option_m.c \ + test_option_passphrase.c \ test_option_t.c \ test_option_u.c \ test_option_uuencode.c \ @@ -95,6 +98,7 @@ ${PACKAGE}FILES+= test_extract.cpio.grz.uu ${PACKAGE}FILES+= test_extract.cpio.gz.uu ${PACKAGE}FILES+= test_extract.cpio.lrz.uu ${PACKAGE}FILES+= test_extract.cpio.lz.uu +${PACKAGE}FILES+= test_extract.cpio.lz4.uu ${PACKAGE}FILES+= test_extract.cpio.lzma.uu ${PACKAGE}FILES+= test_extract.cpio.lzo.uu ${PACKAGE}FILES+= test_extract.cpio.xz.uu @@ -108,6 +112,7 @@ ${PACKAGE}FILES+= test_gcpio_compat_ref_nosym.newc.uu ${PACKAGE}FILES+= test_gcpio_compat_ref_nosym.ustar.uu ${PACKAGE}FILES+= test_option_f.cpio.uu ${PACKAGE}FILES+= test_option_m.cpio.uu +${PACKAGE}FILES+= test_option_passphrase.zip.uu ${PACKAGE}FILES+= test_option_t.cpio.uu ${PACKAGE}FILES+= test_option_t.stdout.uu ${PACKAGE}FILES+= test_option_tv.stdout.uu |
