MFC r314571:

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)

6 files changed, 20 insertions, 17 deletions

diff --git a/usr.bin/bsdcat/Makefile b/usr.bin/bsdcat/Makefile
index f3dd812..c5e8c02 100644
--- a/usr.bin/bsdcat/Makefile
+++ b/usr.bin/bsdcat/Makefile
@@ -6,7 +6,7 @@ _LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive
 _LIBARCHIVECONFDIR=	${SRCTOP}/lib/libarchive
 
 PROG=	bsdcat
-BSDCAT_VERSION_STRING=	3.2.2
+BSDCAT_VERSION_STRING=	3.3.1
 
 .PATH:	${_LIBARCHIVEDIR}/cat
 SRCS=	bsdcat.c cmdline.c
diff --git a/usr.bin/bsdcat/tests/Makefile b/usr.bin/bsdcat/tests/Makefile
index d8e8ac8..a236505 100644
--- a/usr.bin/bsdcat/tests/Makefile
+++ b/usr.bin/bsdcat/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}/cat -I${_LIBARCHIVEDIR}/libarchive_fe
-CFLAGS+=	-I${_LIBARCHIVEDIR}/test_utils
+CFLAGS+=	-I${_LIBARCHIVEDIR}/cat -I${_LIBARCHIVEDIR}/cat/test
+CFLAGS+=	-I${_LIBARCHIVEDIR}/libarchive_fe -I${_LIBARCHIVEDIR}/test_utils
 
 # Uncomment to link against dmalloc
 #LDADD+= -L/usr/local/lib -ldmalloc
@@ -40,11 +40,11 @@ TESTS_SRCS=	\
 	test_version.c
 
 SRCS.bsdcat_test= list.h			\
-	${TESTS_SRCS}				\
-	main.c
+	${TESTS_SRCS}
 
 .PATH:	${_LIBARCHIVEDIR}/test_utils
-SRCS.bsdcat_test+=	test_utils.c
+SRCS.bsdcat_test+=	test_main.c		\
+			test_utils.c
 
 LIBADD.bsdcat_test=	archive
 
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile
index f1ca143..a1f823b 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 38e7f20..06a4d59 100644
--- a/usr.bin/cpio/tests/Makefile
+++ b/usr.bin/cpio/tests/Makefile
@@ -15,8 +15,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
@@ -79,11 +79,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
 
 DPADD.bsdcpio_test=	${LIBARCHIVE}
 LDADD.bsdcpio_test=	-larchive
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index bf7924a..538be16 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.2.2
+BSDTAR_VERSION_STRING=	3.3.1
 
 .PATH: ${LIBARCHIVEDIR}/tar
 SRCS=	bsdtar.c	\
diff --git a/usr.bin/tar/tests/Makefile b/usr.bin/tar/tests/Makefile
index d77c1ea..583c6ee 100644
--- a/usr.bin/tar/tests/Makefile
+++ b/usr.bin/tar/tests/Makefile
@@ -11,7 +11,8 @@ BINDIR=		${TESTSDIR}
 
 CFLAGS+=	-DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\"
 CFLAGS+=	-I${SRCTOP}/lib/libarchive -I${.OBJDIR}
-CFLAGS+=	-I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/test_utils
+CFLAGS+=	-I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/tar/test
+CFLAGS+=	-I${LIBARCHIVEDIR}/test_utils
 
 # Uncomment to link against dmalloc
 #LDADD+= -L/usr/local/lib -ldmalloc
@@ -46,9 +47,11 @@ TESTS_SRCS=	\
 	test_option_U_upper.c			\
 	test_option_X_upper.c			\
 	test_option_a.c				\
+	test_option_acls.c			\
 	test_option_b.c				\
 	test_option_b64encode.c			\
 	test_option_exclude.c			\
+	test_option_fflags.c			\
 	test_option_gid_gname.c			\
 	test_option_grzip.c			\
 	test_option_j.c				\
@@ -79,11 +82,11 @@ TESTS_SRCS=	\
 
 SRCS.bsdtar_test=	\
 	${TESTS_SRCS}	\
-	list.h		\
-	main.c
+	list.h
 
 .PATH: ${LIBARCHIVEDIR}/test_utils
-SRCS.bsdtar_test+=	test_utils.c
+SRCS.bsdtar_test+=	test_main.c		\
+			test_utils.c
 
 DPADD.bsdtar_test=	${LIBARCHIVE}
 LDADD.bsdtar_test=	-larchive