Import libarchive-2.5.0b.

1 files changed, 11 insertions, 87 deletions

diff --git a/archivers/libarchive/files/Makefile.am b/archivers/libarchive/files/Makefile.am
index ca8a7aa516e..db075c0b461 100644
--- a/archivers/libarchive/files/Makefile.am
+++ b/archivers/libarchive/files/Makefile.am
@@ -8,7 +8,7 @@ AUTOMAKE_OPTIONS= foreign subdir-objects
 lib_LTLIBRARIES=	libarchive.la
 bin_PROGRAMS=	$(bsdtar_programs) $(bsdcpio_programs)
 man_MANS= $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS)
-BUILT_SOURCES= libarchive/test/list.h tar/test/list.h cpio/test/list.h $(libarchive_test_REFFILES) $(bsdcpio_test_REFFILES)
+BUILT_SOURCES= libarchive/test/list.h tar/test/list.h cpio/test/list.h
 
 #
 # What to test: We always test libarchive, test bsdtar and bsdcpio only
@@ -48,14 +48,13 @@ dist-hook:
 #
 # Extra rules for cleanup
 #
-CLEANFILES=$(libarchive_test_REFFILES) $(bsdcpio_test_REFFILES)
-
 DISTCLEANFILES= tar/getdate.c tar/getdate.h	\
 	libarchive/test/list.h			\
 	tar/test/list.h				\
 	cpio/test/list.h
 
 distclean-local:
+	-rm -rf .ref
 	-rm -rf autom4te.cache/
 	-rm -f *~
 
@@ -118,6 +117,7 @@ libarchive_la_SOURCES=						\
 	libarchive/archive_write_open_memory.c			\
 	libarchive/archive_write_private.h			\
 	libarchive/archive_write_set_compression_bzip2.c	\
+	libarchive/archive_write_set_compression_compress.c	\
 	libarchive/archive_write_set_compression_gzip.c		\
 	libarchive/archive_write_set_compression_none.c		\
 	libarchive/archive_write_set_compression_program.c	\
@@ -208,6 +208,7 @@ libarchive_test_SOURCES=					\
 	libarchive/test/test_read_truncated.c			\
 	libarchive/test/test_tar_filenames.c			\
 	libarchive/test/test_tar_large.c			\
+	libarchive/test/test_write_compress.c			\
 	libarchive/test/test_write_compress_program.c		\
 	libarchive/test/test_write_disk.c			\
 	libarchive/test/test_write_disk_hardlink.c		\
@@ -223,7 +224,7 @@ libarchive_test_SOURCES=					\
 	libarchive/test/test_write_format_tar_empty.c		\
 	libarchive/test/test_write_open_memory.c
 
-libarchive_test_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_builddir)/libarchive/test
+libarchive_test_CPPFLAGS= -I$(top_builddir)/libarchive -I$(top_srcdir)/libarchive -I$(top_builddir)/libarchive/test
 
 # The "list.h" file just lists all of the tests defined in all of the sources.
 # Building it automatically provides a sanity-check on libarchive_test_SOURCES
@@ -231,12 +232,13 @@ libarchive_test_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_builddir)/libarchiv
 libarchive/test/list.h: Makefile
 	cat $(top_srcdir)/libarchive/test/test_*.c | grep DEFINE_TEST > libarchive/test/list.h
 
-libarchive_TESTS_ENVIRONMENT= LIBARCHIVE_TEST_FILES=`cd $(top_builddir);/bin/pwd`
+libarchive_TESTS_ENVIRONMENT= LIBARCHIVE_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/libarchive/test
 
 libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_compat_gtar_1.tgz.uu			\
 	libarchive/test/test_compat_tar_hardlink_1.tar.uu		\
 	libarchive/test/test_compat_zip_1.zip.uu			\
+	libarchive/test/test_pax_filename_encoding.tar.gz.uu		\
 	libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu	\
 	libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu	\
 	libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu \
@@ -244,45 +246,6 @@ libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu \
 	libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
 
-libarchive_test_REFFILES=\
-	test_compat_gtar_1.tgz			\
-	test_compat_tar_hardlink_1.tar		\
-	test_compat_zip_1.zip			\
-	test_read_format_gtar_sparse_1_13.tgz	\
-	test_read_format_gtar_sparse_1_17.tgz	\
-	test_read_format_gtar_sparse_1_17_posix00.tgz \
-	test_read_format_gtar_sparse_1_17_posix01.tgz \
-	test_read_format_gtar_sparse_1_17_posix10.tgz \
-	test_read_format_gtar_sparse_1_17_posix10_modified.tar
-
-# BSD make prefers $> here, GNU make prefers $<; $? works for both.
-test_compat_gtar_1.tgz: libarchive/test/test_compat_gtar_1.tgz.uu
-	cat $? | uudecode
-
-test_compat_tar_hardlink_1.tar: libarchive/test/test_compat_tar_hardlink_1.tar.uu
-	cat $? | uudecode
-
-test_compat_zip_1.zip: libarchive/test/test_compat_zip_1.zip.uu
-	cat $? | uudecode
-
-test_read_format_gtar_sparse_1_13.tgz: libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu
-	cat $? | uudecode
-
-test_read_format_gtar_sparse_1_17.tgz: libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu
-	cat $? | uudecode
-
-test_read_format_gtar_sparse_1_17_posix00.tgz: libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu
-	cat $? | uudecode
-
-test_read_format_gtar_sparse_1_17_posix01.tgz: libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu
-	cat $? | uudecode
-
-test_read_format_gtar_sparse_1_17_posix10.tgz: libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu
-	cat $? | uudecode
-
-test_read_format_gtar_sparse_1_17_posix10_modified.tar: libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
-	cat $? | uudecode
-
 #
 #
 # bsdtar source, docs, etc.
@@ -343,14 +306,14 @@ bsdtar_test_SOURCES=						\
 bsdtar_test_EXTRA_DIST=						\
 	tar/test/old
 
-bsdtar_test_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_builddir)/tar/test
+bsdtar_test_CPPFLAGS= -I$(top_builddir)/tar/test
 
 tar/test/list.h: Makefile
 	cat $(top_srcdir)/tar/test/test_*.c | grep DEFINE_TEST > tar/test/list.h
 
 if BUILD_BSDTAR
 bsdtar_test_programs= bsdtar_test
-bsdtar_TESTS_ENVIRONMENT= BSDTAR=`cd $(top_builddir);/bin/pwd`/bsdtar BSDTAR_TEST_FILES=`cd $(top_builddir);/bin/pwd`
+bsdtar_TESTS_ENVIRONMENT= BSDTAR=`cd $(top_builddir);/bin/pwd`/bsdtar BSDTAR_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/tar/test
 else
 bsdtar_test_programs=
 bsdtar_TESTS_ENVIRONMENT=
@@ -431,30 +394,19 @@ bsdcpio_test_SOURCES=						\
 	cpio/test/test_owner_parse.c				\
 	cpio/test/test_pathmatch.c
 
-bsdcpio_test_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_builddir)/cpio/test
+bsdcpio_test_CPPFLAGS= -I$(top_builddir)/libarchive -I$(top_srcdir)/libarchive -I$(top_builddir)/cpio/test
 
 cpio/test/list.h: Makefile
 	cat $(top_srcdir)/cpio/test/test_*.c | grep DEFINE_TEST > cpio/test/list.h
 
 if BUILD_BSDCPIO
 bsdcpio_test_programs= bsdcpio_test
-bsdcpio_TESTS_ENVIRONMENT= BSDCPIO=`cd $(top_builddir);/bin/pwd`/bsdcpio BSDCPIO_TEST_FILES=`cd $(top_builddir);/bin/pwd`
+bsdcpio_TESTS_ENVIRONMENT= BSDCPIO=`cd $(top_builddir);/bin/pwd`/bsdcpio BSDCPIO_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/cpio/test
 else
 bsdcpio_test_programs=
 bsdcpio_TESTS_ENVIRONMENT=
 endif
 
-bsdcpio_test_REFFILES=\
-	test_gcpio_compat_ref.bin	\
-	test_gcpio_compat_ref.crc	\
-	test_gcpio_compat_ref.newc	\
-	test_gcpio_compat_ref.ustar	\
-	test_option_f.cpio		\
-	test_option_m.cpio		\
-	test_option_t.cpio		\
-	test_option_t.stdout		\
-	test_option_tv.stdout
-
 bsdcpio_test_EXTRA_DIST=			\
 	cpio/test/test_gcpio_compat_ref.bin.uu	\
 	cpio/test/test_gcpio_compat_ref.crc.uu	\
@@ -465,31 +417,3 @@ bsdcpio_test_EXTRA_DIST=			\
 	cpio/test/test_option_t.cpio.uu		\
 	cpio/test/test_option_t.stdout.uu	\
 	cpio/test/test_option_tv.stdout.uu
-
-test_gcpio_compat_ref.bin: cpio/test/test_gcpio_compat_ref.bin.uu
-	cat $? | uudecode
-
-test_gcpio_compat_ref.crc: cpio/test/test_gcpio_compat_ref.crc.uu
-	cat $? | uudecode
-
-test_gcpio_compat_ref.newc: cpio/test/test_gcpio_compat_ref.newc.uu
-	cat $? | uudecode
-
-test_gcpio_compat_ref.ustar: cpio/test/test_gcpio_compat_ref.ustar.uu
-	cat $? | uudecode
-
-test_option_f.cpio: cpio/test/test_option_f.cpio.uu
-	cat $? | uudecode
-
-test_option_m.cpio: cpio/test/test_option_m.cpio.uu
-	cat $? | uudecode
-
-test_option_t.cpio: cpio/test/test_option_t.cpio.uu
-	cat $? | uudecode
-
-test_option_t.stdout: cpio/test/test_option_t.stdout.uu
-	cat $? | uudecode
-
-test_option_tv.stdout: cpio/test/test_option_tv.stdout.uu
-	cat $? | uudecode
-