summaryrefslogtreecommitdiffstats
path: root/usr.bin/tar
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2013-03-22 13:36:03 +0000
committermm <mm@FreeBSD.org>2013-03-22 13:36:03 +0000
commit5ee0a7b76c4addc27bb45864cb4e0ce790a4b80e (patch)
treee741e3532b574e7c25aa9bb07c18cdb16139824f /usr.bin/tar
parentaf89cb16bfde2fc8e93708b89daff55026d3b216 (diff)
parent366f42737cba40ceb2e83af8d17c61c0242703c5 (diff)
downloadFreeBSD-src-5ee0a7b76c4addc27bb45864cb4e0ce790a4b80e.zip
FreeBSD-src-5ee0a7b76c4addc27bb45864cb4e0ce790a4b80e.tar.gz
MFV r248590,248594:
Update libarchive to 3.1.2 Some of new features: - support for lrzip and grzip compression - support for writing tar v7 format - b64encode and uuencode filters - support for __MACOSX directory in Zip archives - support for lzop compresion (external utility)
Diffstat (limited to 'usr.bin/tar')
-rw-r--r--usr.bin/tar/Makefile3
-rw-r--r--usr.bin/tar/test/Makefile26
2 files changed, 26 insertions, 3 deletions
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index 0e96753..d1f400b 100644
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@@ -4,11 +4,12 @@
LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive
PROG= bsdtar
-BSDTAR_VERSION_STRING= 3.0.4
+BSDTAR_VERSION_STRING= 3.1.2
.PATH: ${LIBARCHIVEDIR}/tar
SRCS= bsdtar.c \
cmdline.c \
+ creation_set.c \
read.c \
subst.c \
util.c \
diff --git a/usr.bin/tar/test/Makefile b/usr.bin/tar/test/Makefile
index 41230c7..5e849fe 100644
--- a/usr.bin/tar/test/Makefile
+++ b/usr.bin/tar/test/Makefile
@@ -8,6 +8,14 @@ TESTS= \
test_basic.c \
test_copy.c \
test_empty_mtree.c \
+ test_extract_tar_bz2.c \
+ test_extract_tar_grz.c \
+ test_extract_tar_gz.c \
+ test_extract_tar_lrz.c \
+ test_extract_tar_lz.c \
+ test_extract_tar_lzma.c \
+ test_extract_tar_lzo.c \
+ test_extract_tar_xz.c \
test_format_newc.c \
test_help.c \
test_option_C_upper.c \
@@ -17,18 +25,29 @@ TESTS= \
test_option_T_upper.c \
test_option_U_upper.c \
test_option_X_upper.c \
+ test_option_a.c \
test_option_b.c \
+ test_option_b64encode.c \
test_option_exclude.c \
test_option_gid_gname.c \
+ test_option_grzip.c \
+ test_option_j.c \
test_option_k.c \
test_option_keep_newer_files.c \
+ test_option_lrzip.c \
+ test_option_lzma.c \
+ test_option_lzop.c \
test_option_n.c \
- test_option_nodump.c \
test_option_newer_than.c \
+ test_option_nodump.c \
+ test_option_older_than.c \
test_option_q.c \
test_option_r.c \
test_option_s.c \
test_option_uid_uname.c \
+ test_option_uuencode.c \
+ test_option_xz.c \
+ test_option_z.c \
test_patterns.c \
test_print_longpath.c \
test_stdio.c \
@@ -42,6 +61,9 @@ SRCS= ${TAR_SRCS} \
list.h \
main.c
+.PATH: ${LIBARCHIVEDIR}/test_utils
+SRCS+= test_utils.c
+
CLEANFILES+= list.h
NO_MAN=yes
@@ -52,7 +74,7 @@ CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/../../../lib/libarchive/config_freebsd
LDADD= -larchive -lz -lbz2 -llzma
CFLAGS+= -static -g -O2 -Wall
CFLAGS+= -I${.CURDIR}/../../../lib/libarchive -I${.OBJDIR}
-CFLAGS+= -I${LIBARCHIVEDIR}/tar
+CFLAGS+= -I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/test_utils
# Uncomment to link against dmalloc
#LDADD+= -L/usr/local/lib -ldmalloc
OpenPOWER on IntegriCloud