Update libarchive to 3.0.4

4 files changed, 11 insertions, 20 deletions

diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile
index 13579c1..d1a3cca 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.0.3
+BSDCPIO_VERSION_STRING=	3.0.4
 
 .PATH:	${LIBARCHIVEDIR}/cpio
 SRCS=	cpio.c cmdline.c
 
 .PATH:	${LIBARCHIVEDIR}/libarchive_fe
-SRCS+=	err.c line_reader.c matching.c pathmatch.c
+SRCS+=	err.c line_reader.c
 
 CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
 CFLAGS+= -DPLATFORM_CONFIG_H=\"${LIBARCHIVECONFDIR}/config_freebsd.h\"
diff --git a/usr.bin/cpio/test/Makefile b/usr.bin/cpio/test/Makefile
index 1da6b1c..3a17f8e 100644
--- a/usr.bin/cpio/test/Makefile
+++ b/usr.bin/cpio/test/Makefile
@@ -6,7 +6,7 @@ LIBARCHIVEDIR=	${.CURDIR}/../../../contrib/libarchive
 CPIO_SRCS= cmdline.c
 
 .PATH:	${LIBARCHIVEDIR}/libarchive_fe
-CPIO_SRCS+= err.c pathmatch.c
+CPIO_SRCS+= err.c
 
 .PATH:	${LIBARCHIVEDIR}/cpio/test
 TESTS=	\
@@ -35,8 +35,7 @@ TESTS=	\
 	test_option_z.c				\
 	test_owner_parse.c			\
 	test_passthrough_dotdot.c		\
-	test_passthrough_reverse.c		\
-	test_pathmatch.c
+	test_passthrough_reverse.c
 
 # Build the test program
 SRCS= list.h					\
@@ -50,8 +49,8 @@ NO_MAN=yes
 
 PROG=bsdcpio_test
 DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA}
-CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/../config_freebsd.h\"
-CFLAGS+=	-I${.CURDIR}/..
+CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/../../../lib/libarchive/config_freebsd.h\"
+CFLAGS+=	-I${.CURDIR}/../../../lib/libarchive -I${.OBJDIR}
 LDADD= -larchive -lz -lbz2 -llzma
 #CFLAGS+= -static -g -O2 -Wall
 CFLAGS+= -g -O2 -Wall
@@ -74,6 +73,6 @@ clean:
 	rm -f ${CLEANFILES}
 	rm -f *~
 	-chmod -R +w /tmp/bsdcpio_test.*
-	rm -rf /tmp/bsdcpio_test
+	rm -rf /tmp/bsdcpio_test.*
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index dc76935..0e96753 100644
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@@ -4,23 +4,19 @@
 LIBARCHIVEDIR=	${.CURDIR}/../../contrib/libarchive
 
 PROG=	bsdtar
-BSDTAR_VERSION_STRING=	3.0.3
+BSDTAR_VERSION_STRING=	3.0.4
 
 .PATH: ${LIBARCHIVEDIR}/tar
 SRCS=	bsdtar.c	\
 	cmdline.c	\
-	getdate.c	\
 	read.c		\
 	subst.c		\
-	tree.c		\
 	util.c		\
 	write.c
 
 .PATH: ${LIBARCHIVEDIR}/libarchive_fe
 SRCS+=	err.c		\
-	line_reader.c	\
-	matching.c	\
-	pathmatch.c
+	line_reader.c
 
 DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} ${LIBBSDXML}
 LDADD=	-larchive -lbz2 -lz -llzma -lbsdxml
diff --git a/usr.bin/tar/test/Makefile b/usr.bin/tar/test/Makefile
index 16fdcc6..41230c7 100644
--- a/usr.bin/tar/test/Makefile
+++ b/usr.bin/tar/test/Makefile
@@ -2,18 +2,13 @@
 
 LIBARCHIVEDIR=	${.CURDIR}/../../../contrib/libarchive
 
-.PATH: ${LIBARCHIVEDIR}/tar
-# Some tar sources are pulled in for white-box tests
-TAR_SRCS=						\
-	getdate.c
-
 .PATH: ${LIBARCHIVEDIR}/tar/test
 TESTS=	\
 	test_0.c				\
 	test_basic.c				\
 	test_copy.c				\
 	test_empty_mtree.c			\
-	test_getdate.c				\
+	test_format_newc.c			\
 	test_help.c				\
 	test_option_C_upper.c			\
 	test_option_H_upper.c			\
@@ -28,6 +23,7 @@ TESTS=	\
 	test_option_k.c				\
 	test_option_keep_newer_files.c		\
 	test_option_n.c				\
+	test_option_nodump.c			\
 	test_option_newer_than.c		\
 	test_option_q.c				\
 	test_option_r.c				\