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)

5 files changed, 49 insertions, 6 deletions

diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile
index e9bb893..fa25072 100644
--- a/usr.bin/ar/Makefile
+++ b/usr.bin/ar/Makefile
@@ -5,8 +5,8 @@
 PROG=	ar
 SRCS=	ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h
 
-DPADD=	${LIBARCHIVE} ${LIBELF}
-LDADD=	-larchive -lelf
+DPADD=	${LIBARCHIVE} ${LIBELF} ${LIBZ}
+LDADD=	-larchive -lelf -lz
 
 CFLAGS+=-I. -I${.CURDIR}
 
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile
index d1a3cca..635f4bc 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.0.4
+BSDCPIO_VERSION_STRING=	3.1.2
 
 .PATH:	${LIBARCHIVEDIR}/cpio
 SRCS=	cpio.c cmdline.c
diff --git a/usr.bin/cpio/test/Makefile b/usr.bin/cpio/test/Makefile
index 3a17f8e..4c8a6e5 100644
--- a/usr.bin/cpio/test/Makefile
+++ b/usr.bin/cpio/test/Makefile
@@ -12,6 +12,16 @@ CPIO_SRCS+= err.c
 TESTS=	\
 	test_0.c				\
 	test_basic.c				\
+	test_cmdline.c				\
+	test_extract_cpio_Z.c			\
+	test_extract_cpio_bz2.c			\
+	test_extract_cpio_grz.c			\
+	test_extract_cpio_gz.c			\
+	test_extract_cpio_lrz.c			\
+	test_extract_cpio_lz.c			\
+	test_extract_cpio_lzma.c		\
+	test_extract_cpio_lzo.c			\
+	test_extract_cpio_xz.c			\
 	test_format_newc.c			\
 	test_gcpio_compat.c			\
 	test_option_0.c				\
@@ -21,16 +31,22 @@ TESTS=	\
 	test_option_L_upper.c			\
 	test_option_Z_upper.c			\
 	test_option_a.c				\
+	test_option_b64encode.c			\
 	test_option_c.c				\
 	test_option_d.c				\
 	test_option_f.c				\
+	test_option_grzip.c			\
 	test_option_help.c			\
 	test_option_l.c				\
+	test_option_lrzip.c			\
 	test_option_lzma.c			\
+	test_option_lzop.c			\
 	test_option_m.c				\
 	test_option_t.c				\
 	test_option_u.c				\
+	test_option_uuencode.c			\
 	test_option_version.c			\
+	test_option_xz.c			\
 	test_option_y.c				\
 	test_option_z.c				\
 	test_owner_parse.c			\
@@ -43,6 +59,9 @@ SRCS= list.h					\
 	${TESTS}				\
 	main.c
 
+.PATH:	${LIBARCHIVEDIR}/test_utils
+SRCS+=	test_utils.c
+
 CLEANFILES+= list.h bsdcpio_test
 
 NO_MAN=yes
@@ -56,6 +75,7 @@ LDADD= -larchive -lz -lbz2 -llzma
 CFLAGS+= -g -O2 -Wall
 CFLAGS+= -I${.OBJDIR}
 CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe
+CFLAGS+= -I${LIBARCHIVEDIR}/test_utils
 
 # Uncomment to link against dmalloc
 #LDADD+= -L/usr/local/lib -ldmalloc
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