summaryrefslogtreecommitdiffstats
path: root/usr.bin/tar
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2016-06-17 22:40:10 +0000
committermm <mm@FreeBSD.org>2016-06-17 22:40:10 +0000
commitc11d326853c1481383222c04e0e06f1ed38956ca (patch)
treec36277ceb452e4862141a9167b27e72819038726 /usr.bin/tar
parent6497d87fb01990e4599884b769bb7776c03be24a (diff)
downloadFreeBSD-src-c11d326853c1481383222c04e0e06f1ed38956ca.zip
FreeBSD-src-c11d326853c1481383222c04e0e06f1ed38956ca.tar.gz
MFC r299529,r299540,r299576,r299896:
r299529,r299540: 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 r299576,r299896: Fix broken cpio behavior. Relnotes: yes
Diffstat (limited to 'usr.bin/tar')
-rw-r--r--usr.bin/tar/Makefile5
-rw-r--r--usr.bin/tar/tests/Makefile7
2 files changed, 10 insertions, 2 deletions
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index 0aaff2e..8b0ebc2 100644
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@@ -4,7 +4,7 @@
LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive
PROG= bsdtar
-BSDTAR_VERSION_STRING= 3.1.2
+BSDTAR_VERSION_STRING= 3.2.0
.PATH: ${LIBARCHIVEDIR}/tar
SRCS= bsdtar.c \
@@ -17,7 +17,8 @@ SRCS= bsdtar.c \
.PATH: ${LIBARCHIVEDIR}/libarchive_fe
SRCS+= err.c \
- line_reader.c
+ line_reader.c \
+ passphrase.c
DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} ${LIBPTHREAD} ${LIBBSDXML}
LDADD= -larchive -lbz2 -lz -llzma -lpthread -lbsdxml
diff --git a/usr.bin/tar/tests/Makefile b/usr.bin/tar/tests/Makefile
index c078ed9..e57cb3e 100644
--- a/usr.bin/tar/tests/Makefile
+++ b/usr.bin/tar/tests/Makefile
@@ -31,11 +31,13 @@ TESTS_SRCS= \
test_extract_tar_gz.c \
test_extract_tar_lrz.c \
test_extract_tar_lz.c \
+ test_extract_tar_lz4.c \
test_extract_tar_lzma.c \
test_extract_tar_lzo.c \
test_extract_tar_xz.c \
test_format_newc.c \
test_help.c \
+ test_leading_slash.c \
test_option_C_upper.c \
test_option_H_upper.c \
test_option_L_upper.c \
@@ -53,12 +55,14 @@ TESTS_SRCS= \
test_option_k.c \
test_option_keep_newer_files.c \
test_option_lrzip.c \
+ test_option_lz4.c \
test_option_lzma.c \
test_option_lzop.c \
test_option_n.c \
test_option_newer_than.c \
test_option_nodump.c \
test_option_older_than.c \
+ test_option_passphrase.c \
test_option_q.c \
test_option_r.c \
test_option_s.c \
@@ -97,10 +101,13 @@ FILES+= test_extract.tar.grz.uu
FILES+= test_extract.tar.gz.uu
FILES+= test_extract.tar.lrz.uu
FILES+= test_extract.tar.lz.uu
+FILES+= test_extract.tar.lz4.uu
FILES+= test_extract.tar.lzma.uu
FILES+= test_extract.tar.lzo.uu
FILES+= test_extract.tar.xz.uu
+FILES+= test_leading_slash.tar.uu
FILES+= test_option_keep_newer_files.tar.Z.uu
+FILES+= test_option_passphrase.zip.uu
FILES+= test_option_s.tar.Z.uu
FILES+= test_patterns_2.tar.uu
FILES+= test_patterns_3.tar.uu
OpenPOWER on IntegriCloud