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)

3 files changed, 69 insertions, 11 deletions

diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
index 73b3c22..ac85bba 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -55,6 +55,7 @@ INCS=	archive.h archive_entry.h
 # Sources to be compiled.
 SRCS=	archive_acl.c					\
 	archive_check_magic.c				\
+	archive_cmdline.c				\
 	archive_crypto.c				\
 	archive_entry.c					\
 	archive_entry_copy_stat.c			\
@@ -70,6 +71,7 @@ SRCS=	archive_acl.c					\
 	archive_ppmd7.c					\
 	archive_rb.c					\
 	archive_read.c					\
+	archive_read_append_filter.c			\
 	archive_read_data_into_fd.c			\
 	archive_read_disk_entry_from_file.c		\
 	archive_read_disk_posix.c			\
@@ -79,11 +81,15 @@ SRCS=	archive_acl.c					\
 	archive_read_open_file.c			\
 	archive_read_open_filename.c			\
 	archive_read_open_memory.c			\
+	archive_read_set_format.c			\
 	archive_read_set_options.c			\
 	archive_read_support_filter_all.c		\
 	archive_read_support_filter_bzip2.c		\
 	archive_read_support_filter_compress.c		\
 	archive_read_support_filter_gzip.c		\
+	archive_read_support_filter_grzip.c		\
+	archive_read_support_filter_lrzip.c		\
+	archive_read_support_filter_lzop.c		\
 	archive_read_support_filter_none.c		\
 	archive_read_support_filter_program.c		\
 	archive_read_support_filter_rpm.c		\
@@ -117,11 +123,17 @@ SRCS=	archive_acl.c					\
 	archive_write_open_file.c			\
 	archive_write_open_filename.c			\
 	archive_write_open_memory.c			\
+	archive_write_add_filter_b64encode.c		\
+	archive_write_add_filter_by_name.c		\
 	archive_write_add_filter_bzip2.c		\
 	archive_write_add_filter_compress.c		\
+	archive_write_add_filter_grzip.c		\
 	archive_write_add_filter_gzip.c			\
+	archive_write_add_filter_lrzip.c		\
+	archive_write_add_filter_lzop.c			\
 	archive_write_add_filter_none.c			\
 	archive_write_add_filter_program.c		\
+	archive_write_add_filter_uuencode.c		\
 	archive_write_add_filter_xz.c			\
 	archive_write_set_format.c			\
 	archive_write_set_format_7zip.c			\
@@ -135,10 +147,11 @@ SRCS=	archive_acl.c					\
 	archive_write_set_format_pax.c			\
 	archive_write_set_format_shar.c			\
 	archive_write_set_format_ustar.c		\
+	archive_write_set_format_v7tar.c		\
 	archive_write_set_format_xar.c			\
 	archive_write_set_format_zip.c			\
 	archive_write_set_options.c			\
-	filter_fork.c
+	filter_fork_posix.c
 
 # Man pages to be installed.
 MAN=	archive_entry.3					\
@@ -174,6 +187,7 @@ MAN=	archive_entry.3					\
 	archive_write_set_options.3			\
 	cpio.5						\
 	libarchive.3					\
+	libarchive_changes.3				\
 	libarchive_internals.3				\
 	libarchive-formats.5				\
 	tar.5
@@ -382,6 +396,7 @@ MLINKS+=	archive_write_format.3 archive_write_set_format_shar.3
 MLINKS+=	archive_write_format.3 archive_write_set_format_shar_dump.3
 MLINKS+=	archive_write_format.3 archive_write_set_format_ustar.3
 MLINKS+=	archive_write_free.3 archive_write_close.3
+MLINKS+=	archive_write_free.3 archive_write_fail.3
 MLINKS+=	archive_write_free.3 archive_write_finish.3
 MLINKS+=	archive_write_open.3 archive_write_open_FILE.3
 MLINKS+=	archive_write_open.3 archive_write_open_fd.3
diff --git a/lib/libarchive/config_freebsd.h b/lib/libarchive/config_freebsd.h
index 214ffd1..bcbad16 100644
--- a/lib/libarchive/config_freebsd.h
+++ b/lib/libarchive/config_freebsd.h
@@ -47,6 +47,8 @@
 #endif
 
 #ifdef WITH_OPENSSL
+#define HAVE_LIBCRYPTO 1
+#define HAVE_OPENSSL_EVP_H 1
 #define HAVE_OPENSSL_MD5_H 1
 #define HAVE_OPENSSL_RIPEMD_H 1
 #define HAVE_OPENSSL_SHA_H 1
@@ -57,8 +59,10 @@
 #define HAVE_SHA384 1
 #define HAVE_SHA512 1
 #else
+#define HAVE_LIBMD 1
 #define HAVE_MD5_H 1
 #define HAVE_MD5INIT 1
+#define HAVE_RIPEMD_H 1
 #define HAVE_SHA_H 1
 #define HAVE_SHA1 1
 #define HAVE_SHA1_INIT 1
@@ -144,6 +148,7 @@
 #define HAVE_PIPE 1
 #define HAVE_POLL 1
 #define HAVE_POLL_H 1
+#define HAVE_POSIX_SPAWNP 1
 #define HAVE_PWD_H 1
 #define HAVE_READDIR_R 1
 #define HAVE_READLINK 1
@@ -154,6 +159,7 @@
 #define HAVE_SETLOCALE 1
 #define HAVE_SIGACTION 1
 #define HAVE_SIGNAL_H 1
+#define HAVE_SPAWN_H 1
 #define HAVE_STATFS 1
 #define HAVE_STATVFS 1
 #define HAVE_STDARG_H 1
diff --git a/lib/libarchive/test/Makefile b/lib/libarchive/test/Makefile
index 5e7c7a4..4ec21f9 100644
--- a/lib/libarchive/test/Makefile
+++ b/lib/libarchive/test/Makefile
@@ -10,7 +10,8 @@ DPADD=${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBCRYPTO} ${LIBBSDXML}
 LDADD= -L ${.OBJDIR}/.. -larchive
 LDADD+= -lz -lbz2 -llzma -lmd -lcrypto -lbsdxml
 CFLAGS+= -g
-CFLAGS+= -I${.CURDIR}/.. -I${LIBARCHIVEDIR}/libarchive -I${.OBJDIR}
+CFLAGS+= -I${.CURDIR}/.. -I${.OBJDIR}
+CFLAGS+= -I${LIBARCHIVEDIR}/libarchive -I${LIBARCHIVEDIR}/test_utils
 CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
 
 # Uncomment to link against dmalloc
@@ -26,6 +27,7 @@ TESTS= \
 	test_acl_posix1e.c			\
 	test_archive_api_feature.c		\
 	test_archive_clear_error.c		\
+	test_archive_cmdline.c			\
 	test_archive_crypto.c			\
 	test_archive_getdate.c			\
 	test_archive_match_time.c		\
@@ -35,6 +37,7 @@ TESTS= \
 	test_archive_read_close_twice.c		\
 	test_archive_read_close_twice_open_fd.c	\
 	test_archive_read_close_twice_open_filename.c	\
+	test_archive_read_multiple_data_objects.c	\
 	test_archive_read_next_header_empty.c	\
 	test_archive_read_next_header_raw.c	\
 	test_archive_read_open2.c		\
@@ -46,7 +49,9 @@ TESTS= \
 	test_archive_set_error.c		\
 	test_archive_string.c			\
 	test_archive_string_conversion.c	\
+	test_archive_write_add_filter_by_name.c	\
 	test_archive_write_set_filter_option.c	\
+	test_archive_write_set_format_by_name.c	\
 	test_archive_write_set_format_option.c	\
 	test_archive_write_set_option.c		\
 	test_archive_write_set_options.c	\
@@ -57,11 +62,13 @@ TESTS= \
 	test_compat_gzip.c			\
 	test_compat_lzip.c			\
 	test_compat_lzma.c			\
+	test_compat_lzop.c			\
 	test_compat_mac.c			\
 	test_compat_pax_libarchive_2x.c		\
 	test_compat_solaris_tar_acl.c		\
 	test_compat_solaris_pax_sparse.c	\
 	test_compat_tar_hardlink.c		\
+	test_compat_uudecode.c			\
 	test_compat_xz.c			\
 	test_compat_zip.c			\
 	test_empty_write.c			\
@@ -77,13 +84,19 @@ TESTS= \
 	test_open_file.c			\
 	test_open_filename.c			\
 	test_pax_filename_encoding.c		\
-	test_read_compress_program.c		\
 	test_read_data_large.c			\
 	test_read_disk.c			\
 	test_read_disk_directory_traversals.c	\
 	test_read_disk_entry_from_file.c	\
 	test_read_extract.c			\
 	test_read_file_nonexistent.c		\
+	test_read_filter_grzip.c		\
+	test_read_filter_lrzip.c		\
+	test_read_filter_lzop.c			\
+	test_read_filter_lzop_multiple_parts.c	\
+	test_read_filter_program.c		\
+	test_read_filter_program_signature.c	\
+	test_read_filter_uudecode.c		\
 	test_read_format_7zip.c			\
 	test_read_format_ar.c			\
 	test_read_format_cab.c			\
@@ -137,35 +150,49 @@ TESTS= \
 	test_read_format_ustar_filename.c	\
 	test_read_format_xar.c			\
 	test_read_format_zip.c			\
+	test_read_format_zip_comment_stored.c	\
 	test_read_format_zip_filename.c		\
+	test_read_format_zip_mac_metadata.c	\
+	test_read_format_zip_sfx.c		\
 	test_read_large.c			\
 	test_read_pax_truncated.c		\
 	test_read_position.c			\
+	test_read_set_format.c			\
 	test_read_truncated.c			\
 	test_read_truncated_filter.c		\
-	test_read_uu.c				\
 	test_sparse_basic.c			\
 	test_tar_filenames.c			\
 	test_tar_large.c			\
 	test_ustar_filenames.c			\
 	test_ustar_filename_encoding.c		\
-	test_write_compress.c			\
-	test_write_compress_bzip2.c		\
-	test_write_compress_gzip.c		\
-	test_write_compress_lzip.c		\
-	test_write_compress_lzma.c		\
-	test_write_compress_program.c		\
-	test_write_compress_xz.c		\
 	test_write_disk.c			\
+	test_write_disk_appledouble.c		\
 	test_write_disk_failures.c		\
 	test_write_disk_hardlink.c		\
+	test_write_disk_hfs_compression.c	\
 	test_write_disk_lookup.c		\
+	test_write_disk_mac_metadata.c		\
+	test_write_disk_no_hfs_compression.c	\
 	test_write_disk_perms.c			\
 	test_write_disk_secure.c		\
 	test_write_disk_sparse.c		\
 	test_write_disk_symlink.c		\
 	test_write_disk_times.c			\
+	test_write_filter_b64encode.c		\
+	test_write_filter_bzip2.c		\
+	test_write_filter_compress.c		\
+	test_write_filter_gzip.c		\
+	test_write_filter_gzip_timestamp.c	\
+	test_write_filter_lrzip.c		\
+	test_write_filter_lzip.c		\
+	test_write_filter_lzma.c		\
+	test_write_filter_lzop.c		\
+	test_write_filter_program.c		\
+	test_write_filter_uuencode.c		\
+	test_write_filter_xz.c			\
 	test_write_format_7zip.c		\
+	test_write_format_7zip_empty.c		\
+	test_write_format_7zip_large.c		\
 	test_write_format_ar.c			\
 	test_write_format_cpio.c		\
 	test_write_format_cpio_empty.c		\
@@ -178,18 +205,25 @@ TESTS= \
 	test_write_format_iso9660_filename.c	\
 	test_write_format_iso9660_zisofs.c	\
 	test_write_format_mtree.c		\
+	test_write_format_mtree_absolute_path.c	\
+	test_write_format_mtree_classic.c	\
+	test_write_format_mtree_classic_indent.c	\
 	test_write_format_mtree_fflags.c	\
+	test_write_format_mtree_no_separator.c	\
+	test_write_format_mtree_quoted_filename.c	\
 	test_write_format_pax.c			\
 	test_write_format_shar_empty.c		\
 	test_write_format_tar.c			\
 	test_write_format_tar_empty.c		\
 	test_write_format_tar_sparse.c		\
 	test_write_format_tar_ustar.c		\
+	test_write_format_tar_v7tar.c		\
 	test_write_format_xar.c			\
 	test_write_format_xar_empty.c		\
 	test_write_format_zip.c			\
 	test_write_format_zip_empty.c		\
 	test_write_format_zip_no_compression.c	\
+	test_write_zip_set_compression_store.c	\
 	test_write_open_memory.c		\
 	test_zip_filename_encoding.c
 
@@ -200,6 +234,9 @@ SRCS= \
 	main.c					\
 	read_open_memory.c
 
+.PATH:	${LIBARCHIVEDIR}/test_utils
+SRCS+=	test_utils.c
+
 # Build libarchive_test and run it.
 check test: libarchive_test
 	./libarchive_test -r ${LIBARCHIVEDIR}/libarchive/test