Module Name:    src
Committed By:   joerg
Date:           Thu Apr 20 13:11:04 UTC 2017

Modified Files:
        src/distrib/sets/lists/base: shl.mi
        src/distrib/sets/lists/comp: mi
        src/distrib/sets/lists/debug: shl.mi
        src/external/bsd/libarchive: prepare-import.sh
        src/external/bsd/libarchive/bin: Makefile.inc
        src/external/bsd/libarchive/bin/tar: Makefile
        src/external/bsd/libarchive/include: config_netbsd.h
        src/external/bsd/libarchive/lib/libarchive: Makefile shlib_version
        src/external/bsd/libarchive/lib/libarchive_fe: Makefile

Log Message:
Update build system for libarchive-3.3.2pre.


To generate a diff of this commit:
cvs rdiff -u -r1.810 -r1.811 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2124 -r1.2125 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.169 -r1.170 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libarchive/prepare-import.sh
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libarchive/bin/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libarchive/bin/tar/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/libarchive/include/config_netbsd.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libarchive/lib/libarchive/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/libarchive/lib/libarchive/shlib_version
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/libarchive/lib/libarchive_fe/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.810 src/distrib/sets/lists/base/shl.mi:1.811
--- src/distrib/sets/lists/base/shl.mi:1.810	Tue Apr 18 18:43:11 2017
+++ src/distrib/sets/lists/base/shl.mi	Thu Apr 20 13:11:03 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.810 2017/04/18 18:43:11 christos Exp $
+# $NetBSD: shl.mi,v 1.811 2017/04/20 13:11:03 joerg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -170,8 +170,8 @@
 ./usr/lib/libamu.so.5				base-amd-shlib		compatfile
 ./usr/lib/libamu.so.5.0				base-amd-shlib		compatfile
 ./usr/lib/libarchive.so				base-sys-shlib		compatfile
-./usr/lib/libarchive.so.3			base-sys-shlib		compatfile
-./usr/lib/libarchive.so.3.1			base-sys-shlib		compatfile
+./usr/lib/libarchive.so.4			base-sys-shlib		compatfile
+./usr/lib/libarchive.so.4.0			base-sys-shlib		compatfile
 ./usr/lib/libasan.so				base-sys-shlib		compatfile,gcc=48
 ./usr/lib/libasan.so				base-sys-shlib		compatfile,gcc=53
 ./usr/lib/libasan.so.0				base-sys-shlib		compatfile,gcc=48

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2124 src/distrib/sets/lists/comp/mi:1.2125
--- src/distrib/sets/lists/comp/mi:1.2124	Mon Apr 17 08:59:37 2017
+++ src/distrib/sets/lists/comp/mi	Thu Apr 20 13:11:03 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2124 2017/04/17 08:59:37 riastradh Exp $
+#	$NetBSD: mi,v 1.2125 2017/04/20 13:11:03 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp				comp-sys-root
@@ -5074,16 +5074,26 @@
 ./usr/share/man/cat3/archive_compression_name.0 comp-c-catman		.cat
 ./usr/share/man/cat3/archive_copy_error.0		comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry.0		comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_acl.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_acl_add_entry.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_acl_add_entry_w.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_acl_clear.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_acl_count.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_acl_from_text.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_acl_from_text_w.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_acl_next.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_acl_next_w.0 comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_acl_reset.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_entry_acl_text_w.0 comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_acl_text_w.0	comp-obsolete	obsolete
+./usr/share/man/cat3/archive_entry_acl_to_text.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_acl_to_text_w.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_acl_types.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_atime.0		comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_atime_is_set.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_atime_nsec.0		comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_birthtime.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_birthtime_is_set.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_birthtime_nsec.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_clear.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_clone.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_copy_fflags_text.0	comp-c-catman		.cat
@@ -5094,6 +5104,7 @@
 ./usr/share/man/cat3/archive_entry_copy_hardlink_w.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_copy_link.0		comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_copy_link_w.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_copy_pathname.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_copy_pathname_w.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_copy_sourcepath.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_copy_stat.0	comp-c-catman		.cat
@@ -5101,7 +5112,11 @@
 ./usr/share/man/cat3/archive_entry_copy_symlink_w.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_copy_uname.0 comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_copy_uname_w.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_ctime.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_ctime_is_set.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_ctime_nsec.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_dev.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_dev_is_set.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_devmajor.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_devminor.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_fflags.0	comp-c-catman		.cat
@@ -5112,18 +5127,31 @@
 ./usr/share/man/cat3/archive_entry_gname.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_gname_w.0	comp-obsolete		obsolete
 ./usr/share/man/cat3/archive_entry_hardlink.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_hardlink_w.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_ino.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_ino64.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_ino_is_set.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_linkify.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_linkresolver.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_linkresolver_free.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_linkresolver_new.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_linkresolver_set_strategy.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_mode.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_mtime.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_mtime_is_set.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_mtime_nsec.0 comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_new.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_nlink.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_pathname.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_pathname_w.0 comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_paths.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_perm.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_perms.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_rdev.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_rdevmajor.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_rdevminor.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_set_atime.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_set_birthtime.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_set_ctime.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_set_dev.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_set_devmajor.0	comp-c-catman		.cat
@@ -5133,11 +5161,14 @@
 ./usr/share/man/cat3/archive_entry_set_gid.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_set_gname.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_set_hardlink.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_set_ino.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_set_ino64.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_set_link.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_set_mode.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_set_mtime.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_set_nlink.0	comp-obsolete		obsolete
 ./usr/share/man/cat3/archive_entry_set_pathname.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_set_perm.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_set_rdev.0	comp-obsolete		obsolete
 ./usr/share/man/cat3/archive_entry_set_rdevmajor.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_set_rdevminor.0	comp-c-catman		.cat
@@ -5146,28 +5177,49 @@
 ./usr/share/man/cat3/archive_entry_set_uid.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_set_uname.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_size.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_size_is_set.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_sourcepath.0		comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_stat.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_strmode.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_symlink.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_symlink_w.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_time.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_uid.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_uname.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_uname_w.0	comp-obsolete		obsolete
+./usr/share/man/cat3/archive_entry_unset_atime.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_unset_birthtime.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_unset_ctime.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_unset_mtime.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_unset_size.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_update_gname_utf8.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_update_hardlink_utf8.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_update_link_utf8.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_update_pathname_utf8.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_update_symlink_utf8.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_update_uname_utf8.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_errno.0		comp-c-catman		.cat
 ./usr/share/man/cat3/archive_error_string.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_file_count.0		comp-c-catman		.cat
+./usr/share/man/cat3/archive_filter_code.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_filter_count.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_filter_name.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_format.0		comp-c-catman		.cat
 ./usr/share/man/cat3/archive_format_name.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_position.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read.0		comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_add_passphrase.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_close.0		comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_data.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_data_block.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_read_data_into_buffer.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_data_into_buffer.0	comp-obsolete	obsolete
 ./usr/share/man/cat3/archive_read_data_into_fd.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_data_skip.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_disk.0		comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_disk_entry_from_file.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_disk_gname.0		comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_disk_new.0		comp-c-catman		.cat
-./usr/share/man/cat3/archive_read_disk_set_entry_from_file.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_disk_set_entry_from_file.0	comp-obsolete	obsolete
 ./usr/share/man/cat3/archive_read_disk_set_gname_lookup.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_disk_set_standard_lookup.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_disk_set_symlink_hybrid.0	comp-c-catman		.cat
@@ -5179,41 +5231,84 @@
 ./usr/share/man/cat3/archive_read_extract2.0			comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_extract_set_progress_callback.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_extract_set_skip_file.0	comp-obsolete		obsolete
+./usr/share/man/cat3/archive_read_filter.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_finish.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_format.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_free.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_header.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_header2.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_new.0		comp-c-catman		.cat
-./usr/share/man/cat3/archive_read_next_header.0 comp-c-catman		.cat
-./usr/share/man/cat3/archive_read_next_header2.0		comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_next_header.0 comp-obsolete	obsolete
+./usr/share/man/cat3/archive_read_next_header2.0		comp-obsolete	obsolete
 ./usr/share/man/cat3/archive_read_open.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_open2.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_open_FILE.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_open_fd.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_read_open_file.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_open_file.0	comp-obsolete	obsolete
 ./usr/share/man/cat3/archive_read_open_filename.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_open_memory.0 comp-c-catman		.cat
-./usr/share/man/cat3/archive_read_set_filter_options.0		comp-c-catman		.cat
-./usr/share/man/cat3/archive_read_set_format_options.0		comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_set_filter_option.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_set_filter_options.0		comp-obsolete	obsolete
+./usr/share/man/cat3/archive_read_set_format_option.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_set_format_options.0		comp-obsolete	obsolete
+./usr/share/man/cat3/archive_read_set_option.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_set_options.0			comp-c-catman		.cat
-./usr/share/man/cat3/archive_read_support_compression_all.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_read_support_compression_bzip2.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_read_support_compression_compress.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_read_support_compression_gzip.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_read_support_compression_lzma.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_read_support_compression_none.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_read_support_compression_program.0 comp-c-catman		.cat
-./usr/share/man/cat3/archive_read_support_compression_program_signature.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_read_support_compression_xz.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_set_passphrase_callback.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_support_compression_all.0	comp-obsolete	obsolete
+./usr/share/man/cat3/archive_read_support_compression_bzip2.0	comp-obsolete	obsolete
+./usr/share/man/cat3/archive_read_support_compression_compress.0	comp-obsolete	obsolete
+./usr/share/man/cat3/archive_read_support_compression_gzip.0	comp-obsolete	obsolete
+./usr/share/man/cat3/archive_read_support_compression_lzma.0	comp-obsolete	obsolete
+./usr/share/man/cat3/archive_read_support_compression_none.0	comp-obsolete	obsolete
+./usr/share/man/cat3/archive_read_support_compression_program.0 comp-obsolete	obsolete
+./usr/share/man/cat3/archive_read_support_compression_program_signature.0	comp-obsolete	obsolete
+./usr/share/man/cat3/archive_read_support_compression_xz.0	comp-obsolete	obsolete
+./usr/share/man/cat3/archive_read_support_filter_all.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_support_filter_bzip2.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_support_filter_compress.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_support_filter_gzip.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_support_filter_lz4.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_support_filter_lzma.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_support_filter_none.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_support_filter_program.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_support_filter_program_signature.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_support_filter_rpm.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_support_filter_uu.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_support_filter_xz.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_support_format_7zip.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_support_format_all.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_support_format_ar.0		comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_support_format_by_code.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_support_format_cab.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_support_format_cpio.0 comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_support_format_empty.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_support_format_iso9660.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_support_format_lha.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_support_format_mtree.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_support_format_rar.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_support_format_raw.0		comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_support_format_tar.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_read_support_format_xar.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_read_support_format_zip.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_set_error.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_util.0		comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write.0		comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_add_filter_b64encode.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_add_filter_by_name.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_add_filter_bzip2.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_add_filter_compress.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_add_filter_grzip.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_add_filter_gzip.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_add_filter_lrzip.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_add_filter_lz4.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_add_filter_lzip.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_add_filter_lzma.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_add_filter_lzop.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_add_filter_none.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_add_filter_program.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_add_filter_uuencode.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_add_filter_xz.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_blocksize.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_close.0			comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_data.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_disk.0	comp-c-catman		.cat
@@ -5223,8 +5318,12 @@
 ./usr/share/man/cat3/archive_write_disk_set_skip_file.0 comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_disk_set_standard_lookup.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_disk_set_user_lookup.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_fail.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_filter.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_finish.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_finish_entry.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_format.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_free.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_get_bytes_in_last_block.0	comp-obsolete		obsolete
 ./usr/share/man/cat3/archive_write_get_bytes_per_block.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_header.0	comp-c-catman		.cat
@@ -5235,22 +5334,47 @@
 ./usr/share/man/cat3/archive_write_open_file.0	comp-obsolete		obsolete
 ./usr/share/man/cat3/archive_write_open_filename.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_open_memory.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_write_options.0			comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_options.0			comp-obsolete	obsolete
 ./usr/share/man/cat3/archive_write_set_bytes_in_last_block.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_set_bytes_per_block.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_write_set_callbacks.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_write_set_compression_bzip2.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_write_set_compression_compress.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_write_set_compression_gzip.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_write_set_compression_none.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_write_set_compression_program.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_write_set_compressor_options.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_callbacks.0	comp-obsolete	obsolete
+./usr/share/man/cat3/archive_write_set_compression_bzip2.0	comp-obsolete		obsolete
+./usr/share/man/cat3/archive_write_set_compression_compress.0	comp-obsolete		obsolete
+./usr/share/man/cat3/archive_write_set_compression_gzip.0	comp-obsolete		obsolete
+./usr/share/man/cat3/archive_write_set_compression_none.0	comp-obsolete		obsolete
+./usr/share/man/cat3/archive_write_set_compression_program.0	comp-obsolete		obsolete
+./usr/share/man/cat3/archive_write_set_compressor_options.0	comp-obsolete		obsolete
+./usr/share/man/cat3/archive_write_set_filter_option.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_7zip.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_ar.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_ar_bsd.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_ar_svr4.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_by_name.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_set_format_cpio.0		comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_cpio_newc.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_filter_by_ext.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_filter_by_ext_def.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_gnutar.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_iso9660.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_mtree.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_mtree_classic.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_mtree_default.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_option.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_set_format_pax.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_set_format_pax_restricted.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_raw.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_set_format_shar.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_write_set_format_shar_binary.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_shar_binary.0	comp-obsolete	obsolete
+./usr/share/man/cat3/archive_write_set_format_shar_dump.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_set_format_ustar.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_v7tar.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_warc.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_xar.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_format_zip.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_option.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_options.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_passphrase.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_write_set_passphrase_callback.0	comp-c-catman		.cat
 ./usr/share/man/cat3/asctime.0			comp-c-catman		.cat
 ./usr/share/man/cat3/asctime_r.0		comp-c-catman		.cat
 ./usr/share/man/cat3/asin.0			comp-c-catman		.cat
@@ -7708,6 +7832,7 @@
 ./usr/share/man/cat3/lh_stats.0			comp-c-catman		crypto,.cat
 ./usr/share/man/cat3/lhash.0			comp-obsolete		obsolete
 ./usr/share/man/cat3/libarchive.0		comp-c-catman		.cat
+./usr/share/man/cat3/libarchive_changes.0	comp-c-catman		.cat
 ./usr/share/man/cat3/libarchive_internals.0	comp-c-catman		.cat
 ./usr/share/man/cat3/libblacklist.0		comp-c-catman		.cat
 ./usr/share/man/cat3/libiscsi.0			comp-c-catman		iscsi,.cat
@@ -12569,16 +12694,26 @@
 ./usr/share/man/html3/archive_compression_name.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_copy_error.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_acl.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_acl_add_entry.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_acl_add_entry_w.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_acl_clear.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_acl_count.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_acl_from_text.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_acl_from_text_w.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_acl_next.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_acl_next_w.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_acl_reset.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_entry_acl_text_w.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_acl_text_w.html	comp-obsolete	obsolete
+./usr/share/man/html3/archive_entry_acl_to_text.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_acl_to_text_w.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_acl_types.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_atime.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_atime_is_set.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_atime_nsec.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_birthtime.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_birthtime_is_set.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_birthtime_nsec.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_clear.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_clone.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_copy_fflags_text.html	comp-c-htmlman		html
@@ -12589,6 +12724,7 @@
 ./usr/share/man/html3/archive_entry_copy_hardlink_w.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_copy_link.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_copy_link_w.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_copy_pathname.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_copy_pathname_w.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_copy_sourcepath.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_copy_stat.html	comp-c-htmlman		html
@@ -12596,7 +12732,11 @@
 ./usr/share/man/html3/archive_entry_copy_symlink_w.html comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_copy_uname.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_copy_uname_w.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_ctime.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_ctime_is_set.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_ctime_nsec.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_dev.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_dev_is_set.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_devmajor.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_devminor.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_fflags.html comp-c-htmlman		html
@@ -12607,18 +12747,31 @@
 ./usr/share/man/html3/archive_entry_gname.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_gname_w.html	comp-obsolete		obsolete
 ./usr/share/man/html3/archive_entry_hardlink.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_hardlink_w.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_ino.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_ino64.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_ino_is_set.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_linkify.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_linkresolver.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_linkresolver_free.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_linkresolver_new.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_linkresolver_set_strategy.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_mode.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_mtime.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_mtime_is_set.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_mtime_nsec.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_new.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_nlink.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_pathname.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_pathname_w.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_paths.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_perm.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_perms.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_rdev.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_rdevmajor.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_rdevminor.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_set_atime.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_set_birthtime.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_set_ctime.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_set_dev.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_set_devmajor.html	comp-c-htmlman		html
@@ -12628,11 +12781,14 @@
 ./usr/share/man/html3/archive_entry_set_gid.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_set_gname.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_set_hardlink.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_set_ino.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_set_ino64.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_set_link.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_set_mode.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_set_mtime.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_set_nlink.html	comp-obsolete		obsolete
 ./usr/share/man/html3/archive_entry_set_pathname.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_set_perm.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_set_rdev.html	comp-obsolete		obsolete
 ./usr/share/man/html3/archive_entry_set_rdevmajor.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_set_rdevminor.html	comp-c-htmlman		html
@@ -12641,28 +12797,49 @@
 ./usr/share/man/html3/archive_entry_set_uid.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_set_uname.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_size.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_size_is_set.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_sourcepath.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_stat.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_strmode.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_symlink.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_symlink_w.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_time.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_uid.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_uname.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_uname_w.html	comp-obsolete		obsolete
+./usr/share/man/html3/archive_entry_unset_atime.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_unset_birthtime.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_unset_ctime.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_unset_mtime.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_unset_size.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_update_gname_utf8.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_update_hardlink_utf8.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_update_link_utf8.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_update_pathname_utf8.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_update_symlink_utf8.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_entry_update_uname_utf8.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_errno.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_error_string.html comp-c-htmlman		html
 ./usr/share/man/html3/archive_file_count.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_filter_code.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_filter_count.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_filter_name.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_format.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_format_name.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_position.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read.html		comp-c-htmlman		html
+./usr/share/man/html3/archive_read_add_passphrase.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_close.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_data.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_data_block.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_read_data_into_buffer.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_data_into_buffer.html	comp-obsolete	obsolete
 ./usr/share/man/html3/archive_read_data_into_fd.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_data_skip.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_disk.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_disk_entry_from_file.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_disk_gname.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_disk_new.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_read_disk_set_entry_from_file.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_disk_set_entry_from_file.html	comp-obsolete	obsolete
 ./usr/share/man/html3/archive_read_disk_set_gname_lookup.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_disk_set_standard_lookup.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_disk_set_symlink_hybrid.html comp-c-htmlman		html
@@ -12674,41 +12851,84 @@
 ./usr/share/man/html3/archive_read_extract2.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_extract_set_progress_callback.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_extract_set_skip_file.html	comp-obsolete		obsolete
+./usr/share/man/html3/archive_read_filter.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_finish.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_format.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_free.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_header.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_header2.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_new.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_read_next_header.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_read_next_header2.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_next_header.html	comp-obsolete	obsolete
+./usr/share/man/html3/archive_read_next_header2.html	comp-obsolete	obsolete
 ./usr/share/man/html3/archive_read_open.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_open2.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_open_FILE.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_open_fd.html comp-c-htmlman		html
-./usr/share/man/html3/archive_read_open_file.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_open_file.html	comp-obsolete	obsolete
 ./usr/share/man/html3/archive_read_open_filename.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_open_memory.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_read_set_filter_options.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_read_set_format_options.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_set_filter_option.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_set_filter_options.html	comp-obsolete	obsolete
+./usr/share/man/html3/archive_read_set_format_option.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_set_format_options.html	comp-obsolete	obsolete
+./usr/share/man/html3/archive_read_set_option.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_set_options.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_read_support_compression_all.html comp-c-htmlman		html
-./usr/share/man/html3/archive_read_support_compression_bzip2.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_read_support_compression_compress.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_read_support_compression_gzip.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_read_support_compression_lzma.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_read_support_compression_none.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_read_support_compression_program.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_read_support_compression_program_signature.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_read_support_compression_xz.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_set_passphrase_callback.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_support_compression_all.html comp-obsolete	obsolete
+./usr/share/man/html3/archive_read_support_compression_bzip2.html	comp-obsolete	obsolete
+./usr/share/man/html3/archive_read_support_compression_compress.html	comp-obsolete	obsolete
+./usr/share/man/html3/archive_read_support_compression_gzip.html	comp-obsolete	obsolete
+./usr/share/man/html3/archive_read_support_compression_lzma.html	comp-obsolete	obsolete
+./usr/share/man/html3/archive_read_support_compression_none.html	comp-obsolete	obsolete
+./usr/share/man/html3/archive_read_support_compression_program.html	comp-obsolete	obsolete
+./usr/share/man/html3/archive_read_support_compression_program_signature.html	comp-obsolete	obsolete
+./usr/share/man/html3/archive_read_support_compression_xz.html	comp-obsolete	obsolete
+./usr/share/man/html3/archive_read_support_filter_all.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_support_filter_bzip2.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_support_filter_compress.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_support_filter_gzip.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_support_filter_lz4.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_support_filter_lzma.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_support_filter_none.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_support_filter_program.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_support_filter_program_signature.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_support_filter_rpm.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_support_filter_uu.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_support_filter_xz.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_support_format_7zip.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_support_format_all.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_support_format_ar.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_support_format_by_code.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_support_format_cab.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_support_format_cpio.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_support_format_empty.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_support_format_iso9660.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_support_format_lha.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_support_format_mtree.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_support_format_rar.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_support_format_raw.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_support_format_tar.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_read_support_format_xar.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_read_support_format_zip.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_set_error.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_util.html		comp-c-htmlman		html
 ./usr/share/man/html3/archive_write.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_add_filter_b64encode.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_add_filter_by_name.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_add_filter_bzip2.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_add_filter_compress.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_add_filter_grzip.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_add_filter_gzip.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_add_filter_lrzip.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_add_filter_lz4.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_add_filter_lzip.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_add_filter_lzma.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_add_filter_lzop.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_add_filter_none.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_add_filter_program.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_add_filter_uuencode.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_add_filter_xz.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_blocksize.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_write_close.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_write_data.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_write_disk.html	comp-c-htmlman		html
@@ -12718,8 +12938,12 @@
 ./usr/share/man/html3/archive_write_disk_set_skip_file.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_write_disk_set_standard_lookup.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_write_disk_set_user_lookup.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_fail.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_filter.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_write_finish.html comp-c-htmlman		html
 ./usr/share/man/html3/archive_write_finish_entry.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_format.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_free.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_write_get_bytes_in_last_block.html	comp-obsolete		obsolete
 ./usr/share/man/html3/archive_write_get_bytes_per_block.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_write_header.html comp-c-htmlman		html
@@ -12730,22 +12954,47 @@
 ./usr/share/man/html3/archive_write_open_file.html	comp-obsolete		obsolete
 ./usr/share/man/html3/archive_write_open_filename.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_write_open_memory.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_write_options.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_options.html	comp-obsolete	obsolete
 ./usr/share/man/html3/archive_write_set_bytes_in_last_block.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_write_set_bytes_per_block.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_write_set_callbacks.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_write_set_compression_bzip2.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_write_set_compression_compress.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_write_set_compression_gzip.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_write_set_compression_none.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_write_set_compression_program.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_write_set_compressor_options.html comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_callbacks.html	comp-obsolete	obsolete
+./usr/share/man/html3/archive_write_set_compression_bzip2.html	comp-obsolete		obsolete
+./usr/share/man/html3/archive_write_set_compression_compress.html	comp-obsolete		obsolete
+./usr/share/man/html3/archive_write_set_compression_gzip.html	comp-obsolete		obsolete
+./usr/share/man/html3/archive_write_set_compression_none.html	comp-obsolete		obsolete
+./usr/share/man/html3/archive_write_set_compression_program.html	comp-obsolete		obsolete
+./usr/share/man/html3/archive_write_set_compressor_options.html comp-obsolete		obsolete
+./usr/share/man/html3/archive_write_set_filter_option.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_7zip.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_ar.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_ar_bsd.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_ar_svr4.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_by_name.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_write_set_format_cpio.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_cpio_newc.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_filter_by_ext.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_filter_by_ext_def.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_gnutar.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_iso9660.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_mtree.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_mtree_classic.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_mtree_default.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_option.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_write_set_format_pax.html comp-c-htmlman		html
 ./usr/share/man/html3/archive_write_set_format_pax_restricted.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_raw.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_write_set_format_shar.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_write_set_format_shar_binary.html comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_shar_binary.html comp-obsolete	obsolete
+./usr/share/man/html3/archive_write_set_format_shar_dump.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_write_set_format_ustar.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_v7tar.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_warc.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_xar.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_format_zip.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_option.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_options.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_passphrase.html	comp-c-htmlman		html
+./usr/share/man/html3/archive_write_set_passphrase_callback.html	comp-c-htmlman		html
 ./usr/share/man/html3/asctime.html		comp-c-htmlman		html
 ./usr/share/man/html3/asctime_r.html		comp-c-htmlman		html
 ./usr/share/man/html3/asin.html			comp-c-htmlman		html
@@ -15125,6 +15374,7 @@
 ./usr/share/man/html3/lgammaf_r.html		comp-c-htmlman		html
 ./usr/share/man/html3/lh_stats.html		comp-c-htmlman		crypto,html
 ./usr/share/man/html3/libarchive.html		comp-c-htmlman		html
+./usr/share/man/html3/libarchive_changes.html	comp-c-htmlman		html
 ./usr/share/man/html3/libarchive_internals.html comp-c-htmlman		html
 ./usr/share/man/html3/libblacklist.html		comp-c-htmlman		html
 ./usr/share/man/html3/libiscsi.html		comp-c-htmlman		iscsi,html
@@ -19865,16 +20115,26 @@
 ./usr/share/man/man3/archive_compression_name.3 comp-c-man		.man
 ./usr/share/man/man3/archive_copy_error.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry.3		comp-c-man		.man
+./usr/share/man/man3/archive_entry_acl.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_acl_add_entry.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_acl_add_entry_w.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_acl_clear.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_acl_count.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_acl_from_text.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_acl_from_text_w.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_acl_next.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_acl_next_w.3 comp-c-man		.man
 ./usr/share/man/man3/archive_entry_acl_reset.3	comp-c-man		.man
-./usr/share/man/man3/archive_entry_acl_text_w.3 comp-c-man		.man
+./usr/share/man/man3/archive_entry_acl_text_w.3	comp-obsolete	obsolete
+./usr/share/man/man3/archive_entry_acl_to_text.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_acl_to_text_w.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_acl_types.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_atime.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_atime_is_set.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_atime_nsec.3 comp-c-man		.man
+./usr/share/man/man3/archive_entry_birthtime.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_birthtime_is_set.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_birthtime_nsec.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_clear.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_clone.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_copy_fflags_text.3	comp-c-man		.man
@@ -19885,6 +20145,7 @@
 ./usr/share/man/man3/archive_entry_copy_hardlink_w.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_copy_link.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_copy_link_w.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_copy_pathname.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_copy_pathname_w.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_copy_sourcepath.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_copy_stat.3	comp-c-man		.man
@@ -19892,7 +20153,11 @@
 ./usr/share/man/man3/archive_entry_copy_symlink_w.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_copy_uname.3 comp-c-man		.man
 ./usr/share/man/man3/archive_entry_copy_uname_w.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_ctime.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_ctime_is_set.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_ctime_nsec.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_dev.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_dev_is_set.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_devmajor.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_devminor.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_fflags.3	comp-c-man		.man
@@ -19903,18 +20168,31 @@
 ./usr/share/man/man3/archive_entry_gname.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_gname_w.3	comp-obsolete		obsolete
 ./usr/share/man/man3/archive_entry_hardlink.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_hardlink_w.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_ino.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_ino64.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_ino_is_set.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_linkify.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_linkresolver.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_linkresolver_free.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_linkresolver_new.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_linkresolver_set_strategy.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_mode.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_mtime.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_mtime_is_set.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_mtime_nsec.3 comp-c-man		.man
 ./usr/share/man/man3/archive_entry_new.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_nlink.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_pathname.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_pathname_w.3 comp-c-man		.man
+./usr/share/man/man3/archive_entry_paths.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_perm.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_perms.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_rdev.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_rdevmajor.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_rdevminor.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_set_atime.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_set_birthtime.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_set_ctime.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_set_dev.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_set_devmajor.3	comp-c-man		.man
@@ -19924,11 +20202,14 @@
 ./usr/share/man/man3/archive_entry_set_gid.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_set_gname.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_set_hardlink.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_set_ino.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_set_ino64.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_set_link.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_set_mode.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_set_mtime.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_set_nlink.3	comp-obsolete		obsolete
 ./usr/share/man/man3/archive_entry_set_pathname.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_set_perm.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_set_rdev.3	comp-obsolete		obsolete
 ./usr/share/man/man3/archive_entry_set_rdevmajor.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_set_rdevminor.3	comp-c-man		.man
@@ -19937,28 +20218,49 @@
 ./usr/share/man/man3/archive_entry_set_uid.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_set_uname.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_size.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_size_is_set.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_sourcepath.3 comp-c-man		.man
 ./usr/share/man/man3/archive_entry_stat.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_strmode.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_symlink.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_symlink_w.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_time.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_uid.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_uname.3	comp-c-man		.man
 ./usr/share/man/man3/archive_entry_uname_w.3	comp-obsolete		obsolete
+./usr/share/man/man3/archive_entry_unset_atime.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_unset_birthtime.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_unset_ctime.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_unset_mtime.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_unset_size.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_update_gname_utf8.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_update_hardlink_utf8.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_update_link_utf8.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_update_pathname_utf8.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_update_symlink_utf8.3	comp-c-man		.man
+./usr/share/man/man3/archive_entry_update_uname_utf8.3	comp-c-man		.man
 ./usr/share/man/man3/archive_errno.3		comp-c-man		.man
 ./usr/share/man/man3/archive_error_string.3	comp-c-man		.man
 ./usr/share/man/man3/archive_file_count.3	comp-c-man		.man
+./usr/share/man/man3/archive_filter_code.3	comp-c-man		.man
+./usr/share/man/man3/archive_filter_count.3	comp-c-man		.man
+./usr/share/man/man3/archive_filter_name.3	comp-c-man		.man
 ./usr/share/man/man3/archive_format.3		comp-c-man		.man
 ./usr/share/man/man3/archive_format_name.3	comp-c-man		.man
+./usr/share/man/man3/archive_position.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read.3		comp-c-man		.man
+./usr/share/man/man3/archive_read_add_passphrase.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_close.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_data.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_data_block.3	comp-c-man		.man
-./usr/share/man/man3/archive_read_data_into_buffer.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_data_into_buffer.3	comp-obsolete	obsolete
 ./usr/share/man/man3/archive_read_data_into_fd.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_data_skip.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_disk.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_disk_entry_from_file.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_disk_gname.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_disk_new.3	comp-c-man		.man
-./usr/share/man/man3/archive_read_disk_set_entry_from_file.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_disk_set_entry_from_file.3	comp-obsolete	obsolete
 ./usr/share/man/man3/archive_read_disk_set_gname_lookup.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_disk_set_standard_lookup.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_disk_set_symlink_hybrid.3	comp-c-man		.man
@@ -19970,41 +20272,84 @@
 ./usr/share/man/man3/archive_read_extract2.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_extract_set_progress_callback.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_extract_set_skip_file.3	comp-obsolete		obsolete
+./usr/share/man/man3/archive_read_filter.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_finish.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_format.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_free.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_header.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_header2.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_new.3		comp-c-man		.man
-./usr/share/man/man3/archive_read_next_header.3 comp-c-man		.man
-./usr/share/man/man3/archive_read_next_header2.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_next_header.3 comp-obsolete	obsolete
+./usr/share/man/man3/archive_read_next_header2.3	comp-obsolete	obsolete
 ./usr/share/man/man3/archive_read_open.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_open2.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_open_FILE.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_open_fd.3	comp-c-man		.man
-./usr/share/man/man3/archive_read_open_file.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_open_file.3	comp-obsolete	obsolete
 ./usr/share/man/man3/archive_read_open_filename.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_open_memory.3 comp-c-man		.man
-./usr/share/man/man3/archive_read_set_filter_options.3	comp-c-man		.man
-./usr/share/man/man3/archive_read_set_format_options.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_set_filter_option.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_set_filter_options.3	comp-obsolete	obsolete
+./usr/share/man/man3/archive_read_set_format_option.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_set_format_options.3	comp-obsolete	obsolete
+./usr/share/man/man3/archive_read_set_option.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_set_options.3 comp-c-man		.man
-./usr/share/man/man3/archive_read_support_compression_all.3	comp-c-man		.man
-./usr/share/man/man3/archive_read_support_compression_bzip2.3	comp-c-man		.man
-./usr/share/man/man3/archive_read_support_compression_compress.3	comp-c-man		.man
-./usr/share/man/man3/archive_read_support_compression_gzip.3	comp-c-man		.man
-./usr/share/man/man3/archive_read_support_compression_lzma.3	comp-c-man		.man
-./usr/share/man/man3/archive_read_support_compression_none.3	comp-c-man		.man
-./usr/share/man/man3/archive_read_support_compression_program.3 comp-c-man		.man
-./usr/share/man/man3/archive_read_support_compression_program_signature.3	comp-c-man		.man
-./usr/share/man/man3/archive_read_support_compression_xz.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_set_passphrase_callback.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_support_compression_all.3	comp-obsolete	obsolete
+./usr/share/man/man3/archive_read_support_compression_bzip2.3	comp-obsolete	obsolete
+./usr/share/man/man3/archive_read_support_compression_compress.3	comp-obsolete	obsolete
+./usr/share/man/man3/archive_read_support_compression_gzip.3	comp-obsolete	obsolete
+./usr/share/man/man3/archive_read_support_compression_lzma.3	comp-obsolete	obsolete
+./usr/share/man/man3/archive_read_support_compression_none.3	comp-obsolete	obsolete
+./usr/share/man/man3/archive_read_support_compression_program.3 comp-obsolete	obsolete
+./usr/share/man/man3/archive_read_support_compression_program_signature.3	comp-obsolete	obsolete
+./usr/share/man/man3/archive_read_support_compression_xz.3	comp-obsolete	obsolete
+./usr/share/man/man3/archive_read_support_filter_all.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_support_filter_bzip2.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_support_filter_compress.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_support_filter_gzip.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_support_filter_lz4.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_support_filter_lzma.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_support_filter_none.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_support_filter_program.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_support_filter_program_signature.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_support_filter_rpm.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_support_filter_uu.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_support_filter_xz.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_support_format_7zip.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_support_format_all.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_support_format_ar.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_support_format_by_code.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_support_format_cab.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_support_format_cpio.3 comp-c-man		.man
 ./usr/share/man/man3/archive_read_support_format_empty.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_support_format_iso9660.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_support_format_lha.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_support_format_mtree.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_support_format_rar.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_support_format_raw.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_support_format_tar.3	comp-c-man		.man
+./usr/share/man/man3/archive_read_support_format_xar.3	comp-c-man		.man
 ./usr/share/man/man3/archive_read_support_format_zip.3	comp-c-man		.man
 ./usr/share/man/man3/archive_set_error.3	comp-c-man		.man
 ./usr/share/man/man3/archive_util.3		comp-c-man		.man
 ./usr/share/man/man3/archive_write.3		comp-c-man		.man
+./usr/share/man/man3/archive_write_add_filter_b64encode.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_add_filter_by_name.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_add_filter_bzip2.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_add_filter_compress.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_add_filter_grzip.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_add_filter_gzip.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_add_filter_lrzip.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_add_filter_lz4.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_add_filter_lzip.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_add_filter_lzma.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_add_filter_lzop.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_add_filter_none.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_add_filter_program.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_add_filter_uuencode.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_add_filter_xz.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_blocksize.3	comp-c-man		.man
 ./usr/share/man/man3/archive_write_close.3	comp-c-man		.man
 ./usr/share/man/man3/archive_write_data.3	comp-c-man		.man
 ./usr/share/man/man3/archive_write_disk.3	comp-c-man		.man
@@ -20014,8 +20359,12 @@
 ./usr/share/man/man3/archive_write_disk_set_skip_file.3 comp-c-man		.man
 ./usr/share/man/man3/archive_write_disk_set_standard_lookup.3	comp-c-man		.man
 ./usr/share/man/man3/archive_write_disk_set_user_lookup.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_fail.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_filter.3	comp-c-man		.man
 ./usr/share/man/man3/archive_write_finish.3	comp-c-man		.man
 ./usr/share/man/man3/archive_write_finish_entry.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_format.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_free.3	comp-c-man		.man
 ./usr/share/man/man3/archive_write_get_bytes_in_last_block.3	comp-obsolete		obsolete
 ./usr/share/man/man3/archive_write_get_bytes_per_block.3	comp-c-man		.man
 ./usr/share/man/man3/archive_write_header.3	comp-c-man		.man
@@ -20026,22 +20375,47 @@
 ./usr/share/man/man3/archive_write_open_file.3	comp-obsolete		obsolete
 ./usr/share/man/man3/archive_write_open_filename.3	comp-c-man		.man
 ./usr/share/man/man3/archive_write_open_memory.3	comp-c-man		.man
-./usr/share/man/man3/archive_write_options.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_options.3	comp-obsolete	obsolete
 ./usr/share/man/man3/archive_write_set_bytes_in_last_block.3	comp-c-man		.man
 ./usr/share/man/man3/archive_write_set_bytes_per_block.3	comp-c-man		.man
-./usr/share/man/man3/archive_write_set_callbacks.3	comp-c-man		.man
-./usr/share/man/man3/archive_write_set_compression_bzip2.3	comp-c-man		.man
-./usr/share/man/man3/archive_write_set_compression_compress.3	comp-c-man		.man
-./usr/share/man/man3/archive_write_set_compression_gzip.3	comp-c-man		.man
-./usr/share/man/man3/archive_write_set_compression_none.3	comp-c-man		.man
-./usr/share/man/man3/archive_write_set_compression_program.3	comp-c-man		.man
-./usr/share/man/man3/archive_write_set_compressor_options.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_callbacks.3	comp-obsolete	obsolete
+./usr/share/man/man3/archive_write_set_compression_bzip2.3	comp-obsolete		obsolete
+./usr/share/man/man3/archive_write_set_compression_compress.3	comp-obsolete		obsolete
+./usr/share/man/man3/archive_write_set_compression_gzip.3	comp-obsolete		obsolete
+./usr/share/man/man3/archive_write_set_compression_none.3	comp-obsolete		obsolete
+./usr/share/man/man3/archive_write_set_compression_program.3	comp-obsolete		obsolete
+./usr/share/man/man3/archive_write_set_compressor_options.3	comp-obsolete		obsolete
+./usr/share/man/man3/archive_write_set_filter_option.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_7zip.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_ar.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_ar_bsd.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_ar_svr4.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_by_name.3	comp-c-man		.man
 ./usr/share/man/man3/archive_write_set_format_cpio.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_cpio_newc.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_filter_by_ext.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_filter_by_ext_def.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_gnutar.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_iso9660.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_mtree.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_mtree_classic.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_mtree_default.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_option.3	comp-c-man		.man
 ./usr/share/man/man3/archive_write_set_format_pax.3	comp-c-man		.man
 ./usr/share/man/man3/archive_write_set_format_pax_restricted.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_raw.3	comp-c-man		.man
 ./usr/share/man/man3/archive_write_set_format_shar.3	comp-c-man		.man
-./usr/share/man/man3/archive_write_set_format_shar_binary.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_shar_binary.3	comp-obsolete	obsolete
+./usr/share/man/man3/archive_write_set_format_shar_dump.3	comp-c-man		.man
 ./usr/share/man/man3/archive_write_set_format_ustar.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_v7tar.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_warc.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_xar.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_format_zip.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_option.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_options.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_passphrase.3	comp-c-man		.man
+./usr/share/man/man3/archive_write_set_passphrase_callback.3	comp-c-man		.man
 ./usr/share/man/man3/asctime.3			comp-c-man		.man
 ./usr/share/man/man3/asctime_r.3		comp-c-man		.man
 ./usr/share/man/man3/asin.3			comp-c-man		.man
@@ -22499,6 +22873,7 @@
 ./usr/share/man/man3/lh_stats.3			comp-c-man		crypto,.man
 ./usr/share/man/man3/lhash.3			comp-obsolete		obsolete
 ./usr/share/man/man3/libarchive.3		comp-c-man		.man
+./usr/share/man/man3/libarchive_changes.3	comp-c-man		.man
 ./usr/share/man/man3/libarchive_internals.3	comp-c-man		.man
 ./usr/share/man/man3/libblacklist.3		comp-c-man		.man
 ./usr/share/man/man3/libiscsi.3			comp-c-man		iscsi,.man

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.169 src/distrib/sets/lists/debug/shl.mi:1.170
--- src/distrib/sets/lists/debug/shl.mi:1.169	Tue Apr 18 18:43:11 2017
+++ src/distrib/sets/lists/debug/shl.mi	Thu Apr 20 13:11:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.169 2017/04/18 18:43:11 christos Exp $
+# $NetBSD: shl.mi,v 1.170 2017/04/20 13:11:04 joerg Exp $
 ./usr/lib/libbfd_g.a						comp-c-debuglib	debuglib,compatfile,binutils
 ./usr/libdata/debug/lib						base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libblacklist.so.0.0.debug		comp-sys-debug	debug,dynamicroot
@@ -54,7 +54,7 @@
 ./usr/libdata/debug/usr/lib/i18n/libmapper_std.so.5.0.debug	comp-i18n-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/i18n/libmapper_zone.so.5.0.debug	comp-i18n-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libamu.so.5.0.debug			comp-amd-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libarchive.so.3.1.debug		comp-sys-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libarchive.so.4.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libasan.so.0.0.debug		comp-sys-debug	debug,compatfile,gcc=48
 ./usr/libdata/debug/usr/lib/libasan.so.1.0.debug		comp-sys-debug	debug,compatfile,gcc=53
 ./usr/libdata/debug/usr/lib/libasn1.so.10.0.debug		comp-krb5-debug	debug,compatfile,kerberos

Index: src/external/bsd/libarchive/prepare-import.sh
diff -u src/external/bsd/libarchive/prepare-import.sh:1.2 src/external/bsd/libarchive/prepare-import.sh:1.3
--- src/external/bsd/libarchive/prepare-import.sh:1.2	Sat Feb 20 02:55:53 2010
+++ src/external/bsd/libarchive/prepare-import.sh	Thu Apr 20 13:11:04 2017
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.2 2010/02/20 02:55:53 joerg Exp $
+# $NetBSD: prepare-import.sh,v 1.3 2017/04/20 13:11:04 joerg Exp $
 #
 # Extract the new tarball and rename the libarchive-X.Y.Z directory
 # to dist.  Run this script and check for additional files and
@@ -16,7 +16,9 @@ rm -rf tmp
 
 cd dist
 
-rm -rf build contrib doc examples
-rm INSTALL Makefile.am Makefile.in aclocal.m4 config.h.in
-rm configure configure.ac CMakeLists.txt */CMakeLists.txt */config_freebsd.h
+rm -rf build contrib doc examples test_utils autom4te.cache
+rm -f INSTALL Makefile.am Makefile.in aclocal.m4 config.h.in
+rm -f configure configure.ac CMakeLists.txt */CMakeLists.txt */*/CMakeLists.txt
+rm -f */config_freebsd.h  CTestConfig.cmake .gitattributes .gitignore
+rm -f .travis.yml */*/.cvsignore
 

Index: src/external/bsd/libarchive/bin/Makefile.inc
diff -u src/external/bsd/libarchive/bin/Makefile.inc:1.3 src/external/bsd/libarchive/bin/Makefile.inc:1.4
--- src/external/bsd/libarchive/bin/Makefile.inc:1.3	Tue Nov  2 19:14:53 2010
+++ src/external/bsd/libarchive/bin/Makefile.inc	Thu Apr 20 13:11:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2010/11/02 19:14:53 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.4 2017/04/20 13:11:04 joerg Exp $
 
 .include "../Makefile.inc"
 
@@ -8,6 +8,6 @@ BINDIR=		/bin
 LDSTATIC?=	-static
 .endif
 
-DPADD=	${LIBARCHIVE_FE} ${LIBARCHIVE} ${LIBBZ2} ${LIBLZMA} ${LIBZ}
-LDADD=	-L${LIBARCHIVE_FE_DIR} -larchive_fe -larchive -lbz2 -llzma -lz
+DPADD=	${LIBARCHIVE_FE} ${LIBARCHIVE} ${LIBEXPAT} ${LIBBZ2} ${LIBLZMA} ${LIBZ} ${LIBCRYPTO}
+LDADD=	-L${LIBARCHIVE_FE_DIR} -larchive_fe -larchive -lexpat -lbz2 -llzma -lz -lcrypto
 CPPFLAGS+=	-I${LIBARCHIVEDIR}/libarchive_fe

Index: src/external/bsd/libarchive/bin/tar/Makefile
diff -u src/external/bsd/libarchive/bin/tar/Makefile:1.4 src/external/bsd/libarchive/bin/tar/Makefile:1.5
--- src/external/bsd/libarchive/bin/tar/Makefile:1.4	Fri Sep  9 12:43:14 2011
+++ src/external/bsd/libarchive/bin/tar/Makefile	Thu Apr 20 13:11:04 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2011/09/09 12:43:14 christos Exp $
+# $NetBSD: Makefile,v 1.5 2017/04/20 13:11:04 joerg Exp $
 
 PROG=	tar
-SRCS=	bsdtar.c cmdline.c getdate.c read.c subst.c tree.c util.c write.c
+SRCS=	bsdtar.c cmdline.c creation_set.c read.c subst.c util.c write.c
 
 .include <bsd.init.mk>
 

Index: src/external/bsd/libarchive/include/config_netbsd.h
diff -u src/external/bsd/libarchive/include/config_netbsd.h:1.6 src/external/bsd/libarchive/include/config_netbsd.h:1.7
--- src/external/bsd/libarchive/include/config_netbsd.h:1.6	Thu Jan 12 19:07:14 2017
+++ src/external/bsd/libarchive/include/config_netbsd.h	Thu Apr 20 13:11:04 2017
@@ -1,86 +1,221 @@
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* MD5 via ARCHIVE_HASH_MD5_LIBC supported. */
-#define ARCHIVE_HASH_MD5_LIBC 1
+/* Darwin ACL support */
+/* #undef ARCHIVE_ACL_DARWIN */
 
-/* MD5 via ARCHIVE_HASH_MD5_LIBSYSTEM supported. */
-/* #undef ARCHIVE_HASH_MD5_LIBSYSTEM */
+/* FreeBSD ACL support */
+/* #undef ARCHIVE_ACL_FREEBSD */
 
-/* MD5 via ARCHIVE_HASH_MD5_OPENSSL supported. */
-/* #undef ARCHIVE_HASH_MD5_OPENSSL */
+/* FreeBSD NFSv4 ACL support */
+/* #undef ARCHIVE_ACL_FREEBSD_NFS4 */
 
-/* RMD160 via ARCHIVE_HASH_RMD160_LIBC supported. */
-#define ARCHIVE_HASH_RMD160_LIBC 1
+/* Linux POSIX.1e ACL support via libacl */
+/* #undef ARCHIVE_ACL_LIBACL */
 
-/* RMD160 via ARCHIVE_HASH_RMD160_OPENSSL supported. */
-/* #undef ARCHIVE_HASH_RMD160_OPENSSL */
+/* Linux NFSv4 ACL support via librichacl */
+/* #undef ARCHIVE_ACL_LIBRICHACL */
 
-/* SHA1 via ARCHIVE_HASH_SHA1_LIBC supported. */
-#define ARCHIVE_HASH_SHA1_LIBC 1
+/* Solaris ACL support */
+/* #undef ARCHIVE_ACL_SUNOS */
 
-/* SHA1 via ARCHIVE_HASH_SHA1_LIBSYSTEM supported. */
-/* #undef ARCHIVE_HASH_SHA1_LIBSYSTEM */
+/* Solaris NFSv4 ACL support */
+/* #undef ARCHIVE_ACL_SUNOS_NFS4 */
 
-/* SHA1 via ARCHIVE_HASH_SHA1_OPENSSL supported. */
-/* #undef ARCHIVE_HASH_SHA1_OPENSSL */
+/* MD5 via ARCHIVE_CRYPTO_MD5_LIBC supported. */
+#define ARCHIVE_CRYPTO_MD5_LIBC 1
 
-/* SHA256 via ARCHIVE_HASH_SHA256_LIBC supported. */
-#define ARCHIVE_HASH_SHA256_LIBC 1
+/* MD5 via ARCHIVE_CRYPTO_MD5_LIBMD supported. */
+/* #undef ARCHIVE_CRYPTO_MD5_LIBMD */
 
-/* SHA256 via ARCHIVE_HASH_SHA256_LIBC2 supported. */
-/* #undef ARCHIVE_HASH_SHA256_LIBC2 */
+/* MD5 via ARCHIVE_CRYPTO_MD5_LIBSYSTEM supported. */
+/* #undef ARCHIVE_CRYPTO_MD5_LIBSYSTEM */
 
-/* SHA256 via ARCHIVE_HASH_SHA256_LIBC3 supported. */
-/* #undef ARCHIVE_HASH_SHA256_LIBC3 */
+/* MD5 via ARCHIVE_CRYPTO_MD5_NETTLE supported. */
+/* #undef ARCHIVE_CRYPTO_MD5_NETTLE */
 
-/* SHA256 via ARCHIVE_HASH_SHA256_LIBSYSTEM supported. */
-/* #undef ARCHIVE_HASH_SHA256_LIBSYSTEM */
+/* MD5 via ARCHIVE_CRYPTO_MD5_OPENSSL supported. */
+/* #undef ARCHIVE_CRYPTO_MD5_OPENSSL */
 
-/* SHA256 via ARCHIVE_HASH_SHA256_OPENSSL supported. */
-/* #undef ARCHIVE_HASH_SHA256_OPENSSL */
+/* MD5 via ARCHIVE_CRYPTO_MD5_WIN supported. */
+/* #undef ARCHIVE_CRYPTO_MD5_WIN */
 
-/* SHA384 via ARCHIVE_HASH_SHA384_LIBC supported. */
-#define ARCHIVE_HASH_SHA384_LIBC 1
+/* RMD160 via ARCHIVE_CRYPTO_RMD160_LIBC supported. */
+#define ARCHIVE_CRYPTO_RMD160_LIBC 1
 
-/* SHA384 via ARCHIVE_HASH_SHA384_LIBC2 supported. */
-/* #undef ARCHIVE_HASH_SHA384_LIBC2 */
+/* RMD160 via ARCHIVE_CRYPTO_RMD160_LIBMD supported. */
+/* #undef ARCHIVE_CRYPTO_RMD160_LIBMD */
 
-/* SHA384 via ARCHIVE_HASH_SHA384_LIBC3 supported. */
-/* #undef ARCHIVE_HASH_SHA384_LIBC3 */
+/* RMD160 via ARCHIVE_CRYPTO_RMD160_NETTLE supported. */
+/* #undef ARCHIVE_CRYPTO_RMD160_NETTLE */
 
-/* SHA384 via ARCHIVE_HASH_SHA384_LIBSYSTEM supported. */
-/* #undef ARCHIVE_HASH_SHA384_LIBSYSTEM */
+/* RMD160 via ARCHIVE_CRYPTO_RMD160_OPENSSL supported. */
+/* #undef ARCHIVE_CRYPTO_RMD160_OPENSSL */
 
-/* SHA384 via ARCHIVE_HASH_SHA384_OPENSSL supported. */
-/* #undef ARCHIVE_HASH_SHA384_OPENSSL */
+/* SHA1 via ARCHIVE_CRYPTO_SHA1_LIBC supported. */
+#define ARCHIVE_CRYPTO_SHA1_LIBC 1
 
-/* SHA512 via ARCHIVE_HASH_SHA512_LIBC supported. */
-#define ARCHIVE_HASH_SHA512_LIBC 1
+/* SHA1 via ARCHIVE_CRYPTO_SHA1_LIBMD supported. */
+/* #undef ARCHIVE_CRYPTO_SHA1_LIBMD */
 
-/* SHA512 via ARCHIVE_HASH_SHA512_LIBC2 supported. */
-/* #undef ARCHIVE_HASH_SHA512_LIBC2 */
+/* SHA1 via ARCHIVE_CRYPTO_SHA1_LIBSYSTEM supported. */
+/* #undef ARCHIVE_CRYPTO_SHA1_LIBSYSTEM */
 
-/* SHA512 via ARCHIVE_HASH_SHA512_LIBC3 supported. */
-/* #undef ARCHIVE_HASH_SHA512_LIBC3 */
+/* SHA1 via ARCHIVE_CRYPTO_SHA1_NETTLE supported. */
+/* #undef ARCHIVE_CRYPTO_SHA1_NETTLE */
 
-/* SHA512 via ARCHIVE_HASH_SHA512_LIBSYSTEM supported. */
-/* #undef ARCHIVE_HASH_SHA512_LIBSYSTEM */
+/* SHA1 via ARCHIVE_CRYPTO_SHA1_OPENSSL supported. */
+/* #undef ARCHIVE_CRYPTO_SHA1_OPENSSL */
 
-/* SHA512 via ARCHIVE_HASH_SHA512_OPENSSL supported. */
-/* #undef ARCHIVE_HASH_SHA512_OPENSSL */
+/* SHA1 via ARCHIVE_CRYPTO_SHA1_WIN supported. */
+/* #undef ARCHIVE_CRYPTO_SHA1_WIN */
+
+/* SHA256 via ARCHIVE_CRYPTO_SHA256_LIBC supported. */
+#define ARCHIVE_CRYPTO_SHA256_LIBC 1
+
+/* SHA256 via ARCHIVE_CRYPTO_SHA256_LIBC2 supported. */
+/* #undef ARCHIVE_CRYPTO_SHA256_LIBC2 */
+
+/* SHA256 via ARCHIVE_CRYPTO_SHA256_LIBC3 supported. */
+/* #undef ARCHIVE_CRYPTO_SHA256_LIBC3 */
+
+/* SHA256 via ARCHIVE_CRYPTO_SHA256_LIBMD supported. */
+/* #undef ARCHIVE_CRYPTO_SHA256_LIBMD */
+
+/* SHA256 via ARCHIVE_CRYPTO_SHA256_LIBSYSTEM supported. */
+/* #undef ARCHIVE_CRYPTO_SHA256_LIBSYSTEM */
+
+/* SHA256 via ARCHIVE_CRYPTO_SHA256_NETTLE supported. */
+/* #undef ARCHIVE_CRYPTO_SHA256_NETTLE */
+
+/* SHA256 via ARCHIVE_CRYPTO_SHA256_OPENSSL supported. */
+/* #undef ARCHIVE_CRYPTO_SHA256_OPENSSL */
+
+/* SHA256 via ARCHIVE_CRYPTO_SHA256_WIN supported. */
+/* #undef ARCHIVE_CRYPTO_SHA256_WIN */
+
+/* SHA384 via ARCHIVE_CRYPTO_SHA384_LIBC supported. */
+#define ARCHIVE_CRYPTO_SHA384_LIBC 1
+
+/* SHA384 via ARCHIVE_CRYPTO_SHA384_LIBC2 supported. */
+/* #undef ARCHIVE_CRYPTO_SHA384_LIBC2 */
+
+/* SHA384 via ARCHIVE_CRYPTO_SHA384_LIBC3 supported. */
+/* #undef ARCHIVE_CRYPTO_SHA384_LIBC3 */
+
+/* SHA384 via ARCHIVE_CRYPTO_SHA384_LIBSYSTEM supported. */
+/* #undef ARCHIVE_CRYPTO_SHA384_LIBSYSTEM */
+
+/* SHA384 via ARCHIVE_CRYPTO_SHA384_NETTLE supported. */
+/* #undef ARCHIVE_CRYPTO_SHA384_NETTLE */
+
+/* SHA384 via ARCHIVE_CRYPTO_SHA384_OPENSSL supported. */
+/* #undef ARCHIVE_CRYPTO_SHA384_OPENSSL */
+
+/* SHA384 via ARCHIVE_CRYPTO_SHA384_WIN supported. */
+/* #undef ARCHIVE_CRYPTO_SHA384_WIN */
+
+/* SHA512 via ARCHIVE_CRYPTO_SHA512_LIBC supported. */
+#define ARCHIVE_CRYPTO_SHA512_LIBC 1
+
+/* SHA512 via ARCHIVE_CRYPTO_SHA512_LIBC2 supported. */
+/* #undef ARCHIVE_CRYPTO_SHA512_LIBC2 */
+
+/* SHA512 via ARCHIVE_CRYPTO_SHA512_LIBC3 supported. */
+/* #undef ARCHIVE_CRYPTO_SHA512_LIBC3 */
+
+/* SHA512 via ARCHIVE_CRYPTO_SHA512_LIBMD supported. */
+/* #undef ARCHIVE_CRYPTO_SHA512_LIBMD */
+
+/* SHA512 via ARCHIVE_CRYPTO_SHA512_LIBSYSTEM supported. */
+/* #undef ARCHIVE_CRYPTO_SHA512_LIBSYSTEM */
+
+/* SHA512 via ARCHIVE_CRYPTO_SHA512_NETTLE supported. */
+/* #undef ARCHIVE_CRYPTO_SHA512_NETTLE */
+
+/* SHA512 via ARCHIVE_CRYPTO_SHA512_OPENSSL supported. */
+/* #undef ARCHIVE_CRYPTO_SHA512_OPENSSL */
+
+/* SHA512 via ARCHIVE_CRYPTO_SHA512_WIN supported. */
+/* #undef ARCHIVE_CRYPTO_SHA512_WIN */
+
+/* AIX xattr support */
+/* #undef ARCHIVE_XATTR_AIX */
+
+/* Darwin xattr support */
+/* #undef ARCHIVE_XATTR_DARWIN */
+
+/* FreeBSD xattr support */
+#define ARCHIVE_XATTR_FREEBSD 1
+
+/* Linux xattr support */
+/* #undef ARCHIVE_XATTR_LINUX */
+
+/* Version number of bsdcat */
+#define BSDCAT_VERSION_STRING "3.3.2dev"
 
 /* Version number of bsdcpio */
-#define BSDCPIO_VERSION_STRING "2.8.4"
+#define BSDCPIO_VERSION_STRING "3.3.2dev"
 
 /* Version number of bsdtar */
-#define BSDTAR_VERSION_STRING "2.8.4"
+#define BSDTAR_VERSION_STRING "3.3.2dev"
+
+/* Define to 1 if the system has the type `ace_t'. */
+/* #undef HAVE_ACE_T */
+
+/* Define to 1 if you have the `acl' function. */
+/* #undef HAVE_ACL */
+
+/* Define to 1 if the system has the type `aclent_t'. */
+/* #undef HAVE_ACLENT_T */
+
+/* Define to 1 if you have the `acl_add_flag_np' function. */
+/* #undef HAVE_ACL_ADD_FLAG_NP */
+
+/* Define to 1 if you have the `acl_add_perm' function. */
+/* #undef HAVE_ACL_ADD_PERM */
+
+/* Define to 1 if you have the `acl_clear_flags_np' function. */
+/* #undef HAVE_ACL_CLEAR_FLAGS_NP */
+
+/* Define to 1 if you have the `acl_clear_perms' function. */
+/* #undef HAVE_ACL_CLEAR_PERMS */
 
 /* Define to 1 if you have the `acl_create_entry' function. */
 /* #undef HAVE_ACL_CREATE_ENTRY */
 
-/* Define to 1 if you have the `acl_get_link' function. */
-/* #undef HAVE_ACL_GET_LINK */
+/* Define to 1 if you have the `acl_delete_def_file' function. */
+/* #undef HAVE_ACL_DELETE_DEF_FILE */
+
+/* Define to 1 if the system has the type `acl_entry_t'. */
+/* #undef HAVE_ACL_ENTRY_T */
+
+/* Define to 1 if you have the `acl_free' function. */
+/* #undef HAVE_ACL_FREE */
+
+/* Define to 1 if you have the `acl_get_brand_np' function. */
+/* #undef HAVE_ACL_GET_BRAND_NP */
+
+/* Define to 1 if you have the `acl_get_entry' function. */
+/* #undef HAVE_ACL_GET_ENTRY */
+
+/* Define to 1 if you have the `acl_get_entry_type_np' function. */
+/* #undef HAVE_ACL_GET_ENTRY_TYPE_NP */
+
+/* Define to 1 if you have the `acl_get_fd' function. */
+/* #undef HAVE_ACL_GET_FD */
+
+/* Define to 1 if you have the `acl_get_fd_np' function. */
+/* #undef HAVE_ACL_GET_FD_NP */
+
+/* Define to 1 if you have the `acl_get_file' function. */
+/* #undef HAVE_ACL_GET_FILE */
+
+/* Define to 1 if you have the `acl_get_flagset_np' function. */
+/* #undef HAVE_ACL_GET_FLAGSET_NP */
+
+/* Define to 1 if you have the `acl_get_flag_np' function. */
+/* #undef HAVE_ACL_GET_FLAG_NP */
 
 /* Define to 1 if you have the `acl_get_link_np' function. */
 /* #undef HAVE_ACL_GET_LINK_NP */
@@ -88,18 +223,33 @@
 /* Define to 1 if you have the `acl_get_perm' function. */
 /* #undef HAVE_ACL_GET_PERM */
 
+/* Define to 1 if you have the `acl_get_permset' function. */
+/* #undef HAVE_ACL_GET_PERMSET */
+
 /* Define to 1 if you have the `acl_get_perm_np' function. */
 /* #undef HAVE_ACL_GET_PERM_NP */
 
+/* Define to 1 if you have the `acl_get_qualifier' function. */
+/* #undef HAVE_ACL_GET_QUALIFIER */
+
+/* Define to 1 if you have the `acl_get_tag_type' function. */
+/* #undef HAVE_ACL_GET_TAG_TYPE */
+
 /* Define to 1 if you have the `acl_init' function. */
 /* #undef HAVE_ACL_INIT */
 
+/* Define to 1 if you have the `acl_is_trivial_np' function. */
+/* #undef HAVE_ACL_IS_TRIVIAL_NP */
+
 /* Define to 1 if you have the <acl/libacl.h> header file. */
 /* #undef HAVE_ACL_LIBACL_H */
 
 /* Define to 1 if the system has the type `acl_permset_t'. */
 /* #undef HAVE_ACL_PERMSET_T */
 
+/* Define to 1 if you have the `acl_set_entry_type_np' function. */
+/* #undef HAVE_ACL_SET_ENTRY_TYPE_NP */
+
 /* Define to 1 if you have the `acl_set_fd' function. */
 /* #undef HAVE_ACL_SET_FD */
 
@@ -109,12 +259,30 @@
 /* Define to 1 if you have the `acl_set_file' function. */
 /* #undef HAVE_ACL_SET_FILE */
 
-/* True for systems with POSIX ACL support */
-/* #undef HAVE_ACL_USER */
+/* Define to 1 if you have the `acl_set_link_np' function. */
+/* #undef HAVE_ACL_SET_LINK_NP */
+
+/* Define to 1 if you have the `acl_set_qualifier' function. */
+/* #undef HAVE_ACL_SET_QUALIFIER */
+
+/* Define to 1 if you have the `acl_set_tag_type' function. */
+/* #undef HAVE_ACL_SET_TAG_TYPE */
+
+/* Define to 1 if the system has the type `acl_t'. */
+/* #undef HAVE_ACL_T */
+
+/* Define to 1 if the system has the type `acl_tag_t'. */
+/* #undef HAVE_ACL_TAG_T */
+
+/* Define to 1 if you have the `arc4random_buf' function. */
+#define HAVE_ARC4RANDOM_BUF 1
 
 /* Define to 1 if you have the <attr/xattr.h> header file. */
 /* #undef HAVE_ATTR_XATTR_H */
 
+/* Define to 1 if you have the <bcrypt.h> header file. */
+/* #undef HAVE_BCRYPT_H */
+
 /* Define to 1 if you have the <bzlib.h> header file. */
 #define HAVE_BZLIB_H 1
 
@@ -127,16 +295,66 @@
 /* Define to 1 if you have the `chroot' function. */
 #define HAVE_CHROOT 1
 
+/* Define to 1 if you have the <copyfile.h> header file. */
+/* #undef HAVE_COPYFILE_H */
+
+/* Define to 1 if you have the `ctime_r' function. */
+#define HAVE_CTIME_R 1
+
 /* Define to 1 if you have the <ctype.h> header file. */
 #define HAVE_CTYPE_H 1
 
 /* Define to 1 if you have the `cygwin_conv_path' function. */
 /* #undef HAVE_CYGWIN_CONV_PATH */
 
+/* Define to 1 if you have the declaration of `ACE_GETACL', and to 0 if you
+   don't. */
+/* #undef HAVE_DECL_ACE_GETACL */
+
+/* Define to 1 if you have the declaration of `ACE_GETACLCNT', and to 0 if you
+   don't. */
+/* #undef HAVE_DECL_ACE_GETACLCNT */
+
+/* Define to 1 if you have the declaration of `ACE_SETACL', and to 0 if you
+   don't. */
+/* #undef HAVE_DECL_ACE_SETACL */
+
+/* Define to 1 if you have the declaration of `ACL_SYNCHRONIZE', and to 0 if
+   you don't. */
+/* #undef HAVE_DECL_ACL_SYNCHRONIZE */
+
+/* Define to 1 if you have the declaration of `ACL_TYPE_EXTENDED', and to 0 if
+   you don't. */
+/* #undef HAVE_DECL_ACL_TYPE_EXTENDED */
+
+/* Define to 1 if you have the declaration of `ACL_TYPE_NFS4', and to 0 if you
+   don't. */
+/* #undef HAVE_DECL_ACL_TYPE_NFS4 */
+
+/* Define to 1 if you have the declaration of `ACL_USER', and to 0 if you
+   don't. */
+/* #undef HAVE_DECL_ACL_USER */
+
 /* Define to 1 if you have the declaration of `EXTATTR_NAMESPACE_USER', and to
    0 if you don't. */
 #define HAVE_DECL_EXTATTR_NAMESPACE_USER 1
 
+/* Define to 1 if you have the declaration of `GETACL', and to 0 if you don't.
+   */
+/* #undef HAVE_DECL_GETACL */
+
+/* Define to 1 if you have the declaration of `GETACLCNT', and to 0 if you
+   don't. */
+/* #undef HAVE_DECL_GETACLCNT */
+
+/* Define to 1 if you have the declaration of `INT32_MAX', and to 0 if you
+   don't. */
+#define HAVE_DECL_INT32_MAX 1
+
+/* Define to 1 if you have the declaration of `INT32_MIN', and to 0 if you
+   don't. */
+#define HAVE_DECL_INT32_MIN 1
+
 /* Define to 1 if you have the declaration of `INT64_MAX', and to 0 if you
    don't. */
 #define HAVE_DECL_INT64_MAX 1
@@ -145,6 +363,18 @@
    don't. */
 #define HAVE_DECL_INT64_MIN 1
 
+/* Define to 1 if you have the declaration of `INTMAX_MAX', and to 0 if you
+   don't. */
+#define HAVE_DECL_INTMAX_MAX 1
+
+/* Define to 1 if you have the declaration of `INTMAX_MIN', and to 0 if you
+   don't. */
+#define HAVE_DECL_INTMAX_MIN 1
+
+/* Define to 1 if you have the declaration of `SETACL', and to 0 if you don't.
+   */
+/* #undef HAVE_DECL_SETACL */
+
 /* Define to 1 if you have the declaration of `SIZE_MAX', and to 0 if you
    don't. */
 #define HAVE_DECL_SIZE_MAX 1
@@ -165,10 +395,21 @@
    don't. */
 #define HAVE_DECL_UINT64_MAX 1
 
+/* Define to 1 if you have the declaration of `UINTMAX_MAX', and to 0 if you
+   don't. */
+#define HAVE_DECL_UINTMAX_MAX 1
+
+/* Define to 1 if you have the declaration of `XATTR_NOFOLLOW', and to 0 if
+   you don't. */
+#define HAVE_DECL_XATTR_NOFOLLOW 0
+
 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
    */
 #define HAVE_DIRENT_H 1
 
+/* Define to 1 if you have a dirfd function or macro */
+#define HAVE_DIRFD 1
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
 
@@ -188,22 +429,37 @@
 #define HAVE_ERRNO_H 1
 
 /* Define to 1 if you have the <expat.h> header file. */
-/* #undef HAVE_EXPAT_H */
+#define HAVE_EXPAT_H 1
 
 /* Define to 1 if you have the <ext2fs/ext2_fs.h> header file. */
 /* #undef HAVE_EXT2FS_EXT2_FS_H */
 
+/* Define to 1 if you have the `extattr_get_fd' function. */
+#define HAVE_EXTATTR_GET_FD 1
+
 /* Define to 1 if you have the `extattr_get_file' function. */
 #define HAVE_EXTATTR_GET_FILE 1
 
+/* Define to 1 if you have the `extattr_get_link' function. */
+#define HAVE_EXTATTR_GET_LINK 1
+
+/* Define to 1 if you have the `extattr_list_fd' function. */
+#define HAVE_EXTATTR_LIST_FD 1
+
 /* Define to 1 if you have the `extattr_list_file' function. */
 #define HAVE_EXTATTR_LIST_FILE 1
 
+/* Define to 1 if you have the `extattr_list_link' function. */
+#define HAVE_EXTATTR_LIST_LINK 1
+
 /* Define to 1 if you have the `extattr_set_fd' function. */
 #define HAVE_EXTATTR_SET_FD 1
 
-/* Define to 1 if you have the `extattr_set_file' function. */
-#define HAVE_EXTATTR_SET_FILE 1
+/* Define to 1 if you have the `extattr_set_link' function. */
+#define HAVE_EXTATTR_SET_LINK 1
+
+/* Define to 1 if you have the `facl' function. */
+/* #undef HAVE_FACL */
 
 /* Define to 1 if you have the `fchdir' function. */
 #define HAVE_FCHDIR 1
@@ -223,27 +479,60 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
+/* Define to 1 if you have the `fdopendir' function. */
+#define HAVE_FDOPENDIR 1
+
+/* Define to 1 if you have the `fgetea' function. */
+/* #undef HAVE_FGETEA */
+
+/* Define to 1 if you have the `fgetxattr' function. */
+/* #undef HAVE_FGETXATTR */
+
+/* Define to 1 if you have the `flistea' function. */
+/* #undef HAVE_FLISTEA */
+
+/* Define to 1 if you have the `flistxattr' function. */
+/* #undef HAVE_FLISTXATTR */
+
 /* Define to 1 if you have the `fork' function. */
 #define HAVE_FORK 1
 
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #define HAVE_FSEEKO 1
 
+/* Define to 1 if you have the `fsetea' function. */
+/* #undef HAVE_FSETEA */
+
 /* Define to 1 if you have the `fsetxattr' function. */
 /* #undef HAVE_FSETXATTR */
 
 /* Define to 1 if you have the `fstat' function. */
 #define HAVE_FSTAT 1
 
+/* Define to 1 if you have the `fstatat' function. */
+#define HAVE_FSTATAT 1
+
+/* Define to 1 if you have the `fstatfs' function. */
+#define HAVE_FSTATFS 1
+
+/* Define to 1 if you have the `fstatvfs' function. */
+#define HAVE_FSTATVFS 1
+
 /* Define to 1 if you have the `ftruncate' function. */
 #define HAVE_FTRUNCATE 1
 
 /* Define to 1 if you have the `futimens' function. */
-/* #undef HAVE_FUTIMENS */
+#define HAVE_FUTIMENS 1
 
 /* Define to 1 if you have the `futimes' function. */
 #define HAVE_FUTIMES 1
 
+/* Define to 1 if you have the `futimesat' function. */
+/* #undef HAVE_FUTIMESAT */
+
+/* Define to 1 if you have the `getea' function. */
+/* #undef HAVE_GETEA */
+
 /* Define to 1 if you have the `geteuid' function. */
 #define HAVE_GETEUID 1
 
@@ -262,12 +551,24 @@
 /* Define to 1 if you have the `getpwuid_r' function. */
 #define HAVE_GETPWUID_R 1
 
+/* Define to 1 if you have the `getvfsbyname' function. */
+/* #undef HAVE_GETVFSBYNAME */
+
 /* Define to 1 if you have the `getxattr' function. */
 /* #undef HAVE_GETXATTR */
 
+/* Define to 1 if you have the `gmtime_r' function. */
+#define HAVE_GMTIME_R 1
+
 /* Define to 1 if you have the <grp.h> header file. */
 #define HAVE_GRP_H 1
 
+/* Define if you have the iconv() function and it works. */
+#define HAVE_ICONV 1
+
+/* Define to 1 if you have the <iconv.h> header file. */
+#define HAVE_ICONV_H 1
+
 /* Define to 1 if the system has the type `intmax_t'. */
 #define HAVE_INTMAX_T 1
 
@@ -289,26 +590,59 @@
 /* Define to 1 if you have the `lchown' function. */
 #define HAVE_LCHOWN 1
 
+/* Define to 1 if you have the `lgetea' function. */
+/* #undef HAVE_LGETEA */
+
 /* Define to 1 if you have the `lgetxattr' function. */
 /* #undef HAVE_LGETXATTR */
 
 /* Define to 1 if you have the `acl' library (-lacl). */
 /* #undef HAVE_LIBACL */
 
-/* Define to 1 if you have the `attr' library (-lattr). */
-/* #undef HAVE_LIBATTR */
-
 /* Define to 1 if you have the `bz2' library (-lbz2). */
 #define HAVE_LIBBZ2 1
 
+/* Define to 1 if you have the `charset' library (-lcharset). */
+/* #undef HAVE_LIBCHARSET */
+
+/* Define to 1 if you have the `crypto' library (-lcrypto). */
+#define HAVE_LIBCRYPTO 1
+
+/* Define to 1 if you have the `eay32' library (-leay32). */
+/* #undef HAVE_LIBEAY32 */
+
+/* Define to 1 if you have the `eay64' library (-leay64). */
+/* #undef HAVE_LIBEAY64 */
+
 /* Define to 1 if you have the `expat' library (-lexpat). */
-/* #undef HAVE_LIBEXPAT */
+#define HAVE_LIBEXPAT 1
+
+/* Define to 1 if you have the `lz4' library (-llz4). */
+/* #undef HAVE_LIBLZ4 */
 
 /* Define to 1 if you have the `lzma' library (-llzma). */
 #define HAVE_LIBLZMA 1
 
-/* Define to 1 if you have the `lzmadec' library (-llzmadec). */
-/* #undef HAVE_LIBLZMADEC */
+/* Define to 1 if you have the `lzo2' library (-llzo2). */
+/* #undef HAVE_LIBLZO2 */
+
+/* Define to 1 if you have the `md' library (-lmd). */
+/* #undef HAVE_LIBMD */
+
+/* Define to 1 if you have the `nettle' library (-lnettle). */
+/* #undef HAVE_LIBNETTLE */
+
+/* Define to 1 if you have the `pcre' library (-lpcre). */
+/* #undef HAVE_LIBPCRE */
+
+/* Define to 1 if you have the `pcreposix' library (-lpcreposix). */
+/* #undef HAVE_LIBPCREPOSIX */
+
+/* Define to 1 if you have the `regex' library (-lregex). */
+/* #undef HAVE_LIBREGEX */
+
+/* Define to 1 if you have the `richacl' library (-lrichacl). */
+/* #undef HAVE_LIBRICHACL */
 
 /* Define to 1 if you have the `xml2' library (-lxml2). */
 /* #undef HAVE_LIBXML2 */
@@ -316,6 +650,9 @@
 /* Define to 1 if you have the <libxml/xmlreader.h> header file. */
 /* #undef HAVE_LIBXML_XMLREADER_H */
 
+/* Define to 1 if you have the <libxml/xmlwriter.h> header file. */
+/* #undef HAVE_LIBXML_XMLWRITER_H */
+
 /* Define to 1 if you have the `z' library (-lz). */
 #define HAVE_LIBZ 1
 
@@ -325,21 +662,48 @@
 /* Define to 1 if you have the `link' function. */
 #define HAVE_LINK 1
 
+/* Define to 1 if you have the <linux/fiemap.h> header file. */
+/* #undef HAVE_LINUX_FIEMAP_H */
+
 /* Define to 1 if you have the <linux/fs.h> header file. */
 /* #undef HAVE_LINUX_FS_H */
 
+/* Define to 1 if you have the <linux/magic.h> header file. */
+/* #undef HAVE_LINUX_MAGIC_H */
+
+/* Define to 1 if you have the <linux/types.h> header file. */
+/* #undef HAVE_LINUX_TYPES_H */
+
+/* Define to 1 if you have the `listea' function. */
+/* #undef HAVE_LISTEA */
+
 /* Define to 1 if you have the `listxattr' function. */
 /* #undef HAVE_LISTXATTR */
 
+/* Define to 1 if you have the `llistea' function. */
+/* #undef HAVE_LLISTEA */
+
 /* Define to 1 if you have the `llistxattr' function. */
 /* #undef HAVE_LLISTXATTR */
 
+/* Define to 1 if you have the <localcharset.h> header file. */
+/* #undef HAVE_LOCALCHARSET_H */
+
+/* Define to 1 if you have the `locale_charset' function. */
+/* #undef HAVE_LOCALE_CHARSET */
+
 /* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
 
+/* Define to 1 if you have the `localtime_r' function. */
+#define HAVE_LOCALTIME_R 1
+
 /* Define to 1 if the system has the type `long long int'. */
 #define HAVE_LONG_LONG_INT 1
 
+/* Define to 1 if you have the `lsetea' function. */
+/* #undef HAVE_LSETEA */
+
 /* Define to 1 if you have the `lsetxattr' function. */
 /* #undef HAVE_LSETXATTR */
 
@@ -353,12 +717,42 @@
 /* Define to 1 if you have the `lutimes' function. */
 #define HAVE_LUTIMES 1
 
-/* Define to 1 if you have the <lzmadec.h> header file. */
-/* #undef HAVE_LZMADEC_H */
+/* Define to 1 if you have the <lz4hc.h> header file. */
+/* #undef HAVE_LZ4HC_H */
+
+/* Define to 1 if you have the <lz4.h> header file. */
+/* #undef HAVE_LZ4_H */
 
 /* Define to 1 if you have the <lzma.h> header file. */
 #define HAVE_LZMA_H 1
 
+/* Define to 1 if you have the `lzma_stream_encoder_mt' function. */
+#define HAVE_LZMA_STREAM_ENCODER_MT 1
+
+/* Define to 1 if you have the <lzo/lzo1x.h> header file. */
+/* #undef HAVE_LZO_LZO1X_H */
+
+/* Define to 1 if you have the <lzo/lzoconf.h> header file. */
+/* #undef HAVE_LZO_LZOCONF_H */
+
+/* Define to 1 if you have the `mbrtowc' function. */
+#define HAVE_MBRTOWC 1
+
+/* Define to 1 if you have the `mbr_gid_to_uuid' function. */
+/* #undef HAVE_MBR_GID_TO_UUID */
+
+/* Define to 1 if you have the `mbr_uid_to_uuid' function. */
+/* #undef HAVE_MBR_UID_TO_UUID */
+
+/* Define to 1 if you have the `mbr_uuid_to_id' function. */
+/* #undef HAVE_MBR_UUID_TO_ID */
+
+/* Define to 1 if you have the <md5.h> header file. */
+#define HAVE_MD5_H 1
+
+/* Define to 1 if you have the <membership.h> header file. */
+/* #undef HAVE_MEMBERSHIP_H */
+
 /* Define to 1 if you have the `memmove' function. */
 #define HAVE_MEMMOVE 1
 
@@ -377,33 +771,108 @@
 /* Define to 1 if you have the `mknod' function. */
 #define HAVE_MKNOD 1
 
+/* Define to 1 if you have the `mkstemp' function. */
+#define HAVE_MKSTEMP 1
+
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 /* #undef HAVE_NDIR_H */
 
+/* Define to 1 if you have the <nettle/aes.h> header file. */
+/* #undef HAVE_NETTLE_AES_H */
+
+/* Define to 1 if you have the <nettle/hmac.h> header file. */
+/* #undef HAVE_NETTLE_HMAC_H */
+
+/* Define to 1 if you have the <nettle/md5.h> header file. */
+/* #undef HAVE_NETTLE_MD5_H */
+
+/* Define to 1 if you have the <nettle/pbkdf2.h> header file. */
+/* #undef HAVE_NETTLE_PBKDF2_H */
+
+/* Define to 1 if you have the <nettle/ripemd160.h> header file. */
+/* #undef HAVE_NETTLE_RIPEMD160_H */
+
+/* Define to 1 if you have the <nettle/sha.h> header file. */
+/* #undef HAVE_NETTLE_SHA_H */
+
 /* Define to 1 if you have the `nl_langinfo' function. */
 #define HAVE_NL_LANGINFO 1
 
+/* Define to 1 if you have the `openat' function. */
+#define HAVE_OPENAT 1
+
+/* Define to 1 if you have the <openssl/evp.h> header file. */
+#define HAVE_OPENSSL_EVP_H 1
+
 /* Define to 1 if you have the <paths.h> header file. */
 #define HAVE_PATHS_H 1
 
+/* Define to 1 if you have the <pcreposix.h> header file. */
+/* #undef HAVE_PCREPOSIX_H */
+
 /* Define to 1 if you have the `pipe' function. */
 #define HAVE_PIPE 1
 
+/* Define to 1 if you have the `PKCS5_PBKDF2_HMAC_SHA1' function. */
+/* #undef HAVE_PKCS5_PBKDF2_HMAC_SHA1 */
+
 /* Define to 1 if you have the `poll' function. */
 #define HAVE_POLL 1
 
 /* Define to 1 if you have the <poll.h> header file. */
 #define HAVE_POLL_H 1
 
+/* Define to 1 if you have the `posix_spawnp' function. */
+#define HAVE_POSIX_SPAWNP 1
+
+/* Define to 1 if you have the <pthread.h> header file. */
+#define HAVE_PTHREAD_H 1
+
 /* Define to 1 if you have the <pwd.h> header file. */
 #define HAVE_PWD_H 1
 
+/* Define to 1 if you have a POSIX compatible readdir_r */
+#define HAVE_READDIR_R 1
+
 /* Define to 1 if you have the `readlink' function. */
 #define HAVE_READLINK 1
 
+/* Define to 1 if you have the `readlinkat' function. */
+#define HAVE_READLINKAT 1
+
+/* Define to 1 if you have the `readpassphrase' function. */
+/* #undef HAVE_READPASSPHRASE */
+
+/* Define to 1 if you have the <readpassphrase.h> header file. */
+/* #undef HAVE_READPASSPHRASE_H */
+
 /* Define to 1 if you have the <regex.h> header file. */
 #define HAVE_REGEX_H 1
 
+/* Define to 1 if you have the `richacl_alloc' function. */
+/* #undef HAVE_RICHACL_ALLOC */
+
+/* Define to 1 if you have the `richacl_equiv_mode' function. */
+/* #undef HAVE_RICHACL_EQUIV_MODE */
+
+/* Define to 1 if you have the `richacl_free' function. */
+/* #undef HAVE_RICHACL_FREE */
+
+/* Define to 1 if you have the `richacl_get_fd' function. */
+/* #undef HAVE_RICHACL_GET_FD */
+
+/* Define to 1 if you have the `richacl_get_file' function. */
+/* #undef HAVE_RICHACL_GET_FILE */
+
+/* Define to 1 if you have the `richacl_set_fd' function. */
+/* #undef HAVE_RICHACL_SET_FD */
+
+/* Define to 1 if you have the `richacl_set_file' function. */
+/* #undef HAVE_RICHACL_SET_FILE */
+
+/* Define to 1 if you have the <ripemd.h> header file. */
+/* #undef HAVE_RIPEMD_H */
+
 /* Define to 1 if you have the `select' function. */
 #define HAVE_SELECT 1
 
@@ -413,12 +882,33 @@
 /* Define to 1 if you have the `setlocale' function. */
 #define HAVE_SETLOCALE 1
 
+/* Define to 1 if you have the `setxattr' function. */
+/* #undef HAVE_SETXATTR */
+
+/* Define to 1 if you have the <sha256.h> header file. */
+/* #undef HAVE_SHA256_H */
+
+/* Define to 1 if you have the <sha512.h> header file. */
+/* #undef HAVE_SHA512_H */
+
+/* Define to 1 if you have the <sha.h> header file. */
+/* #undef HAVE_SHA_H */
+
 /* Define to 1 if you have the `sigaction' function. */
 #define HAVE_SIGACTION 1
 
 /* Define to 1 if you have the <signal.h> header file. */
 #define HAVE_SIGNAL_H 1
 
+/* Define to 1 if you have the <spawn.h> header file. */
+#define HAVE_SPAWN_H 1
+
+/* Define to 1 if you have the `statfs' function. */
+#define HAVE_STATFS 1
+
+/* Define to 1 if you have the `statvfs' function. */
+#define HAVE_STATVFS 1
+
 /* Define to 1 if `stat' has the bug that it succeeds when given the
    zero-length file name argument. */
 /* #undef HAVE_STAT_EMPTY_STRING_BUG */
@@ -459,6 +949,18 @@
 /* Define to 1 if you have the `strrchr' function. */
 #define HAVE_STRRCHR 1
 
+/* Define to 1 if the system has the type `struct richace'. */
+/* #undef HAVE_STRUCT_RICHACE */
+
+/* Define to 1 if the system has the type `struct richacl'. */
+/* #undef HAVE_STRUCT_RICHACL */
+
+/* Define to 1 if `f_namemax' is a member of `struct statfs'. */
+/* #undef HAVE_STRUCT_STATFS_F_NAMEMAX */
+
+/* Define to 1 if `f_iosize' is a member of `struct statvfs'. */
+#define HAVE_STRUCT_STATVFS_F_IOSIZE 1
+
 /* Define to 1 if `st_birthtime' is a member of `struct stat'. */
 #define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
 
@@ -481,11 +983,23 @@
 /* #undef HAVE_STRUCT_STAT_ST_MTIME_USEC */
 
 /* Define to 1 if `st_mtim.tv_nsec' is a member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC */
+#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
 
 /* Define to 1 if `st_umtime' is a member of `struct stat'. */
 /* #undef HAVE_STRUCT_STAT_ST_UMTIME */
 
+/* Define to 1 if `tm_gmtoff' is a member of `struct tm'. */
+#define HAVE_STRUCT_TM_TM_GMTOFF 1
+
+/* Define to 1 if `__tm_gmtoff' is a member of `struct tm'. */
+/* #undef HAVE_STRUCT_TM___TM_GMTOFF */
+
+/* Define to 1 if the system has the type `struct vfsconf'. */
+/* #undef HAVE_STRUCT_VFSCONF */
+
+/* Define to 1 if the system has the type `struct xvfsconf'. */
+/* #undef HAVE_STRUCT_XVFSCONF */
+
 /* Define to 1 if you have the `symlink' function. */
 #define HAVE_SYMLINK 1
 
@@ -499,6 +1013,9 @@
    */
 /* #undef HAVE_SYS_DIR_H */
 
+/* Define to 1 if you have the <sys/ea.h> header file. */
+/* #undef HAVE_SYS_EA_H */
+
 /* Define to 1 if you have the <sys/extattr.h> header file. */
 #define HAVE_SYS_EXTATTR_H 1
 
@@ -508,6 +1025,9 @@
 /* Define to 1 if you have the <sys/mkdev.h> header file. */
 /* #undef HAVE_SYS_MKDEV_H */
 
+/* Define to 1 if you have the <sys/mount.h> header file. */
+#define HAVE_SYS_MOUNT_H 1
+
 /* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
    */
 /* #undef HAVE_SYS_NDIR_H */
@@ -518,9 +1038,18 @@
 /* Define to 1 if you have the <sys/poll.h> header file. */
 #define HAVE_SYS_POLL_H 1
 
+/* Define to 1 if you have the <sys/richacl.h> header file. */
+/* #undef HAVE_SYS_RICHACL_H */
+
 /* Define to 1 if you have the <sys/select.h> header file. */
 #define HAVE_SYS_SELECT_H 1
 
+/* Define to 1 if you have the <sys/statfs.h> header file. */
+/* #undef HAVE_SYS_STATFS_H */
+
+/* Define to 1 if you have the <sys/statvfs.h> header file. */
+#define HAVE_SYS_STATVFS_H 1
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
@@ -533,11 +1062,17 @@
 /* Define to 1 if you have the <sys/utime.h> header file. */
 /* #undef HAVE_SYS_UTIME_H */
 
+/* Define to 1 if you have the <sys/utsname.h> header file. */
+#define HAVE_SYS_UTSNAME_H 1
+
+/* Define to 1 if you have the <sys/vfs.h> header file. */
+/* #undef HAVE_SYS_VFS_H */
+
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #define HAVE_SYS_WAIT_H 1
 
 /* Define to 1 if you have the <sys/xattr.h> header file. */
-/* #undef HAVE_SYS_XATTR_H */
+#define HAVE_SYS_XATTR_H 1
 
 /* Define to 1 if you have the `timegm' function. */
 #define HAVE_TIMEGM 1
@@ -567,7 +1102,7 @@
 #define HAVE_UTIME 1
 
 /* Define to 1 if you have the `utimensat' function. */
-/* #undef HAVE_UTIMENSAT */
+#define HAVE_UTIMENSAT 1
 
 /* Define to 1 if you have the `utimes' function. */
 #define HAVE_UTIMES 1
@@ -605,23 +1140,56 @@
 /* Define to 1 if you have the <wctype.h> header file. */
 #define HAVE_WCTYPE_H 1
 
+/* Define to 1 if you have the <wincrypt.h> header file. */
+/* #undef HAVE_WINCRYPT_H */
+
 /* Define to 1 if you have the <windows.h> header file. */
 /* #undef HAVE_WINDOWS_H */
 
+/* Define to 1 if you have the <winioctl.h> header file. */
+/* #undef HAVE_WINIOCTL_H */
+
 /* Define to 1 if you have the `wmemcmp' function. */
 #define HAVE_WMEMCMP 1
 
 /* Define to 1 if you have the `wmemcpy' function. */
 #define HAVE_WMEMCPY 1
 
+/* Define to 1 if you have the `wmemmove' function. */
+#define HAVE_WMEMMOVE 1
+
+/* Define to 1 if you have a working EXT2_IOC_GETFLAGS */
+/* #undef HAVE_WORKING_EXT2_IOC_GETFLAGS */
+
+/* Define to 1 if you have a working FS_IOC_GETFLAGS */
+/* #undef HAVE_WORKING_FS_IOC_GETFLAGS */
+
 /* Define to 1 if you have the <zlib.h> header file. */
 #define HAVE_ZLIB_H 1
 
+/* Define to 1 if you have the `_ctime64_s' function. */
+/* #undef HAVE__CTIME64_S */
+
+/* Define to 1 if you have the `_fseeki64' function. */
+/* #undef HAVE__FSEEKI64 */
+
+/* Define to 1 if you have the `_get_timezone' function. */
+/* #undef HAVE__GET_TIMEZONE */
+
+/* Define to 1 if you have the `_localtime64_s' function. */
+/* #undef HAVE__LOCALTIME64_S */
+
+/* Define to 1 if you have the `_mkgmtime64' function. */
+/* #undef HAVE__MKGMTIME64 */
+
+/* Define as const if the declaration of iconv() needs const. */
+#define ICONV_CONST const
+
 /* Version number of libarchive as a single integer */
-#define LIBARCHIVE_VERSION_NUMBER "2008004"
+#define LIBARCHIVE_VERSION_NUMBER "3003002"
 
 /* Version number of libarchive */
-#define LIBARCHIVE_VERSION_STRING "2.8.4"
+#define LIBARCHIVE_VERSION_STRING "3.3.2dev"
 
 /* Define to 1 if `lstat' dereferences a symlink specified with a trailing
    slash. */
@@ -639,20 +1207,20 @@
    <sysmacros.h>. */
 /* #undef MAJOR_IN_SYSMACROS */
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O */
+/* Define to '0x05020000' for Windows Server 2003 APIs. */
+/* #undef NTDDI_VERSION */
 
 /* Name of package */
 #define PACKAGE "libarchive"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "kient...@freebsd.org"
+#define PACKAGE_BUGREPORT "libarchive-disc...@googlegroups.com"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "libarchive"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libarchive 2.8.4"
+#define PACKAGE_STRING "libarchive 3.3.2dev"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libarchive"
@@ -661,7 +1229,10 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.8.4"
+#define PACKAGE_VERSION "3.3.2dev"
+
+/* Define to 1 if PCRE_STATIC needs to be defined. */
+/* #undef PCRE_STATIC */
 
 /* The size of `wchar_t', as computed by sizeof. */
 #define SIZEOF_WCHAR_T 4
@@ -698,11 +1269,16 @@
 
 
 /* Version number of package */
-#define VERSION "2.8.4"
+#define VERSION "3.3.2dev"
 
-/* Define to '0x0500' for Windows 2000 APIs. */
+/* Define to '0x0502' for Windows Server 2003 APIs. */
 /* #undef WINVER */
 
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */
 
@@ -722,12 +1298,22 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 /* #undef _POSIX_SOURCE */
 
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+/* #undef _UINT32_T */
+
 /* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
    <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
    #define below would cause a syntax error. */
 /* #undef _UINT64_T */
 
-/* Define to '0x0500' for Windows 2000 APIs. */
+/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+/* #undef _UINT8_T */
+
+/* Define to '0x0502' for Windows Server 2003 APIs. */
 /* #undef _WIN32_WINNT */
 
 /* Define to empty if `const' does not conform to ANSI C. */
@@ -740,6 +1326,14 @@
 /* Define to `unsigned long' if <sys/types.h> does not define. */
 /* #undef id_t */
 
+/* Define to the type of a signed integer type of width exactly 16 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef int16_t */
+
+/* Define to the type of a signed integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef int32_t */
+
 /* Define to the type of a signed integer type of width exactly 64 bits if
    such a type exists and the standard includes do not define it. */
 /* #undef int64_t */
@@ -761,10 +1355,22 @@
    define. */
 /* #undef uid_t */
 
+/* Define to the type of an unsigned integer type of width exactly 16 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef uint16_t */
+
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef uint32_t */
+
 /* Define to the type of an unsigned integer type of width exactly 64 bits if
    such a type exists and the standard includes do not define it. */
 /* #undef uint64_t */
 
+/* Define to the type of an unsigned integer type of width exactly 8 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef uint8_t */
+
 /* Define to the widest unsigned integer type if <stdint.h> and <inttypes.h>
    do not define. */
 /* #undef uintmax_t */

Index: src/external/bsd/libarchive/lib/libarchive/Makefile
diff -u src/external/bsd/libarchive/lib/libarchive/Makefile:1.3 src/external/bsd/libarchive/lib/libarchive/Makefile:1.4
--- src/external/bsd/libarchive/lib/libarchive/Makefile:1.3	Tue Nov  2 19:14:54 2010
+++ src/external/bsd/libarchive/lib/libarchive/Makefile	Thu Apr 20 13:11:04 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2010/11/02 19:14:54 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2017/04/20 13:11:04 joerg Exp $
 
 .include <bsd.init.mk>
 
@@ -7,215 +7,356 @@
 LIB=		archive
 
 LIBDPLIBS+=	bz2	${NETBSDSRCDIR}/lib/libbz2 \
+		crypto	${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto \
+		expat	${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
 		lzma	${NETBSDSRCDIR}/external/public-domain/xz/lib \
 		z	${NETBSDSRCDIR}/lib/libz
 
-SRCS=		archive_check_magic.c \
+SRCS=		archive_acl.c \
+		archive_check_magic.c \
+		archive_cmdline.c \
+		archive_cryptor.c \
+		archive_digest.c \
 		archive_entry.c \
 		archive_entry_copy_stat.c \
 		archive_entry_link_resolver.c \
+		archive_entry_sparse.c \
 		archive_entry_stat.c \
 		archive_entry_strmode.c \
 		archive_entry_xattr.c \
+		archive_getdate.c \
+		archive_hmac.c \
+		archive_match.c \
+		archive_options.c \
+		archive_pack_dev.c \
+		archive_pathmatch.c \
+		archive_ppmd7.c \
+		archive_random.c \
+		archive_rb.c \
 		archive_read.c \
+		archive_read_add_passphrase.c \
+		archive_read_append_filter.c \
 		archive_read_data_into_fd.c \
-		archive_read_disk.c \
 		archive_read_disk_entry_from_file.c \
+		archive_read_disk_posix.c \
 		archive_read_disk_set_standard_lookup.c \
 		archive_read_extract.c \
+		archive_read_extract2.c \
 		archive_read_open_fd.c \
 		archive_read_open_file.c \
 		archive_read_open_filename.c \
 		archive_read_open_memory.c \
-		archive_read_support_compression_all.c \
-		archive_read_support_compression_bzip2.c \
-		archive_read_support_compression_compress.c \
-		archive_read_support_compression_gzip.c \
-		archive_read_support_compression_none.c \
-		archive_read_support_compression_program.c \
-		archive_read_support_compression_rpm.c \
-		archive_read_support_compression_uu.c \
-		archive_read_support_compression_xz.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_grzip.c \
+		archive_read_support_filter_gzip.c \
+		archive_read_support_filter_lrzip.c \
+		archive_read_support_filter_lz4.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 \
+		archive_read_support_filter_uu.c \
+		archive_read_support_filter_xz.c \
+		archive_read_support_format_7zip.c \
 		archive_read_support_format_all.c \
 		archive_read_support_format_ar.c \
+		archive_read_support_format_by_code.c \
+		archive_read_support_format_cab.c \
 		archive_read_support_format_cpio.c \
 		archive_read_support_format_empty.c \
 		archive_read_support_format_iso9660.c \
+		archive_read_support_format_lha.c \
 		archive_read_support_format_mtree.c \
+		archive_read_support_format_rar.c \
 		archive_read_support_format_raw.c \
 		archive_read_support_format_tar.c \
+		archive_read_support_format_warc.c \
 		archive_read_support_format_xar.c \
 		archive_read_support_format_zip.c \
 		archive_string.c \
 		archive_string_sprintf.c \
 		archive_util.c \
+		archive_version_details.c \
 		archive_virtual.c \
 		archive_write.c \
-		archive_write_disk.c \
+		archive_write_add_filter.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_lz4.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_disk_posix.c \
 		archive_write_disk_set_standard_lookup.c \
 		archive_write_open_fd.c \
 		archive_write_open_file.c \
 		archive_write_open_filename.c \
 		archive_write_open_memory.c \
-		archive_write_set_compression_bzip2.c \
-		archive_write_set_compression_compress.c \
-		archive_write_set_compression_gzip.c \
-		archive_write_set_compression_none.c \
-		archive_write_set_compression_program.c \
-		archive_write_set_compression_xz.c \
 		archive_write_set_format.c \
+		archive_write_set_format_7zip.c \
 		archive_write_set_format_ar.c \
 		archive_write_set_format_by_name.c \
 		archive_write_set_format_cpio.c \
 		archive_write_set_format_cpio_newc.c \
+		archive_write_set_format_filter_by_ext.c \
+		archive_write_set_format_gnutar.c \
+		archive_write_set_format_iso9660.c \
 		archive_write_set_format_mtree.c \
 		archive_write_set_format_pax.c \
+		archive_write_set_format_raw.c \
 		archive_write_set_format_shar.c \
 		archive_write_set_format_ustar.c \
+		archive_write_set_format_v7tar.c \
+		archive_write_set_format_warc.c \
+		archive_write_set_format_xar.c \
 		archive_write_set_format_zip.c \
-		filter_fork.c
+		archive_write_set_options.c \
+		archive_write_set_passphrase.c \
+		filter_fork_posix.c \
+		xxhash.c
 
 INCS=		archive.h archive_entry.h
 INCSDIR=	/usr/include
 
 MAN=		archive_entry.3 \
+		archive_entry_acl.3 \
+		archive_entry_linkify.3 \
+		archive_entry_paths.3 \
+		archive_entry_perms.3 \
+		archive_entry_stat.3 \
+		archive_entry_time.3 \
 		archive_read.3 \
+		archive_read_add_passphrase.3 \
+		archive_read_data.3 \
 		archive_read_disk.3 \
+		archive_read_extract.3 \
+		archive_read_filter.3 \
+		archive_read_format.3 \
+		archive_read_free.3 \
+		archive_read_header.3 \
+		archive_read_new.3 \
+		archive_read_open.3 \
+		archive_read_set_options.3 \
 		archive_util.3 \
 		archive_write.3 \
+		archive_write_blocksize.3 \
+		archive_write_data.3 \
 		archive_write_disk.3 \
-		cpio.5 \
+		archive_write_filter.3 \
+		archive_write_finish_entry.3 \
+		archive_write_format.3 \
+		archive_write_free.3 \
+		archive_write_header.3 \
+		archive_write_new.3 \
+		archive_write_open.3 \
+		archive_write_set_options.3 \
+		archive_write_set_passphrase.3 \
 		libarchive.3 \
+		libarchive_changes.3 \
 		libarchive_internals.3 \
+		cpio.5 \
 		libarchive-formats.5 \
 		mtree.5 \
 		tar.5
 
-MLINKS+=	archive_entry.3 archive_entry_acl_add_entry.3
-MLINKS+=	archive_entry.3 archive_entry_acl_add_entry_w.3
-MLINKS+=	archive_entry.3 archive_entry_acl_clear.3
-MLINKS+=	archive_entry.3 archive_entry_acl_count.3
-MLINKS+=	archive_entry.3 archive_entry_acl_next.3
-MLINKS+=	archive_entry.3 archive_entry_acl_next_w.3
-MLINKS+=	archive_entry.3 archive_entry_acl_reset.3
-MLINKS+=	archive_entry.3 archive_entry_acl_text_w.3
-MLINKS+=	archive_entry.3 archive_entry_atime.3
-MLINKS+=	archive_entry.3 archive_entry_atime_nsec.3
 MLINKS+=	archive_entry.3 archive_entry_clear.3
 MLINKS+=	archive_entry.3 archive_entry_clone.3
-MLINKS+=	archive_entry.3 archive_entry_copy_fflags_text.3
-MLINKS+=	archive_entry.3 archive_entry_copy_fflags_text_w.3
-MLINKS+=	archive_entry.3 archive_entry_copy_gname.3
-MLINKS+=	archive_entry.3 archive_entry_copy_gname_w.3
-MLINKS+=	archive_entry.3 archive_entry_copy_hardlink.3
-MLINKS+=	archive_entry.3 archive_entry_copy_hardlink_w.3
-MLINKS+=	archive_entry.3 archive_entry_copy_link.3
-MLINKS+=	archive_entry.3 archive_entry_copy_link_w.3
-MLINKS+=	archive_entry.3 archive_entry_copy_pathname_w.3
-MLINKS+=	archive_entry.3 archive_entry_copy_sourcepath.3
-MLINKS+=	archive_entry.3 archive_entry_copy_stat.3
-MLINKS+=	archive_entry.3 archive_entry_copy_symlink.3
-MLINKS+=	archive_entry.3 archive_entry_copy_symlink_w.3
-MLINKS+=	archive_entry.3 archive_entry_copy_uname.3
-MLINKS+=	archive_entry.3 archive_entry_copy_uname_w.3
-MLINKS+=	archive_entry.3 archive_entry_dev.3
-MLINKS+=	archive_entry.3 archive_entry_devmajor.3
-MLINKS+=	archive_entry.3 archive_entry_devminor.3
-MLINKS+=	archive_entry.3 archive_entry_filetype.3
-MLINKS+=	archive_entry.3 archive_entry_fflags.3
-MLINKS+=	archive_entry.3 archive_entry_fflags_text.3
 MLINKS+=	archive_entry.3 archive_entry_free.3
-MLINKS+=	archive_entry.3 archive_entry_gid.3
-MLINKS+=	archive_entry.3 archive_entry_gname.3
-MLINKS+=	archive_entry.3 archive_entry_hardlink.3
-MLINKS+=	archive_entry.3 archive_entry_ino.3
-MLINKS+=	archive_entry.3 archive_entry_mode.3
-MLINKS+=	archive_entry.3 archive_entry_mtime.3
-MLINKS+=	archive_entry.3 archive_entry_mtime_nsec.3
-MLINKS+=	archive_entry.3 archive_entry_nlink.3
 MLINKS+=	archive_entry.3 archive_entry_new.3
-MLINKS+=	archive_entry.3 archive_entry_pathname.3
-MLINKS+=	archive_entry.3 archive_entry_pathname_w.3
-MLINKS+=	archive_entry.3 archive_entry_rdev.3
-MLINKS+=	archive_entry.3 archive_entry_rdevmajor.3
-MLINKS+=	archive_entry.3 archive_entry_rdevminor.3
-MLINKS+=	archive_entry.3 archive_entry_set_atime.3
-MLINKS+=	archive_entry.3 archive_entry_set_ctime.3
-MLINKS+=	archive_entry.3 archive_entry_set_dev.3
-MLINKS+=	archive_entry.3 archive_entry_set_devmajor.3
-MLINKS+=	archive_entry.3 archive_entry_set_devminor.3
-MLINKS+=	archive_entry.3 archive_entry_set_filetype.3
-MLINKS+=	archive_entry.3 archive_entry_set_fflags.3
-MLINKS+=	archive_entry.3 archive_entry_set_gid.3
-MLINKS+=	archive_entry.3 archive_entry_set_gname.3
-MLINKS+=	archive_entry.3 archive_entry_set_hardlink.3
-MLINKS+=	archive_entry.3 archive_entry_set_link.3
-MLINKS+=	archive_entry.3 archive_entry_set_mode.3
-MLINKS+=	archive_entry.3 archive_entry_set_mtime.3
-MLINKS+=	archive_entry.3 archive_entry_set_pathname.3
-MLINKS+=	archive_entry.3 archive_entry_set_rdevmajor.3
-MLINKS+=	archive_entry.3 archive_entry_set_rdevminor.3
-MLINKS+=	archive_entry.3 archive_entry_set_size.3
-MLINKS+=	archive_entry.3 archive_entry_set_symlink.3
-MLINKS+=	archive_entry.3 archive_entry_set_uid.3
-MLINKS+=	archive_entry.3 archive_entry_set_uname.3
-MLINKS+=	archive_entry.3 archive_entry_size.3
-MLINKS+=	archive_entry.3 archive_entry_sourcepath.3
-MLINKS+=	archive_entry.3 archive_entry_stat.3
-MLINKS+=	archive_entry.3 archive_entry_symlink.3
-MLINKS+=	archive_entry.3 archive_entry_uid.3
-MLINKS+=	archive_entry.3 archive_entry_uname.3
-MLINKS+=	archive_read.3 archive_read_close.3
-MLINKS+=	archive_read.3 archive_read_data.3
-MLINKS+=	archive_read.3 archive_read_data_block.3
-MLINKS+=	archive_read.3 archive_read_data_into_buffer.3
-MLINKS+=	archive_read.3 archive_read_data_into_fd.3
-MLINKS+=	archive_read.3 archive_read_data_skip.3
-MLINKS+=	archive_read.3 archive_read_extract.3
-MLINKS+=	archive_read.3 archive_read_extract2.3
-MLINKS+=	archive_read.3 archive_read_extract_set_progress_callback.3
-MLINKS+=	archive_read.3 archive_read_finish.3
-MLINKS+=	archive_read.3 archive_read_new.3
-MLINKS+=	archive_read.3 archive_read_next_header.3
-MLINKS+=	archive_read.3 archive_read_next_header2.3
-MLINKS+=	archive_read.3 archive_read_open.3
-MLINKS+=	archive_read.3 archive_read_open2.3
-MLINKS+=	archive_read.3 archive_read_open_FILE.3
-MLINKS+=	archive_read.3 archive_read_open_fd.3
-MLINKS+=	archive_read.3 archive_read_open_file.3
-MLINKS+=	archive_read.3 archive_read_open_filename.3
-MLINKS+=	archive_read.3 archive_read_open_memory.3
-MLINKS+=	archive_read.3 archive_read_set_filter_options.3
-MLINKS+=	archive_read.3 archive_read_set_format_options.3
-MLINKS+=	archive_read.3 archive_read_set_options.3
-MLINKS+=	archive_read.3 archive_read_support_compression_all.3
-MLINKS+=	archive_read.3 archive_read_support_compression_bzip2.3
-MLINKS+=	archive_read.3 archive_read_support_compression_compress.3
-MLINKS+=	archive_read.3 archive_read_support_compression_gzip.3
-MLINKS+=	archive_read.3 archive_read_support_compression_lzma.3
-MLINKS+=	archive_read.3 archive_read_support_compression_none.3
-MLINKS+=	archive_read.3 archive_read_support_compression_program.3
-MLINKS+=	archive_read.3 archive_read_support_compression_program_signature.3
-MLINKS+=	archive_read.3 archive_read_support_compression_xz.3
-MLINKS+=	archive_read.3 archive_read_support_format_all.3
-MLINKS+=	archive_read.3 archive_read_support_format_ar.3
-MLINKS+=	archive_read.3 archive_read_support_format_empty.3
-MLINKS+=	archive_read.3 archive_read_support_format_cpio.3
-MLINKS+=	archive_read.3 archive_read_support_format_iso9660.3
-MLINKS+=	archive_read.3 archive_read_support_format_mtree.3
-MLINKS+=	archive_read.3 archive_read_support_format_raw.3
-MLINKS+=	archive_read.3 archive_read_support_format_tar.3
-MLINKS+=	archive_read.3 archive_read_support_format_zip.3
+
+MLINKS+=	archive_entry_acl.3 archive_entry_acl_add_entry.3
+MLINKS+=	archive_entry_acl.3 archive_entry_acl_add_entry_w.3
+MLINKS+=	archive_entry_acl.3 archive_entry_acl_clear.3
+MLINKS+=	archive_entry_acl.3 archive_entry_acl_count.3
+MLINKS+=	archive_entry_acl.3 archive_entry_acl_from_text.3
+MLINKS+=	archive_entry_acl.3 archive_entry_acl_from_text_w.3
+MLINKS+=	archive_entry_acl.3 archive_entry_acl_next.3
+MLINKS+=	archive_entry_acl.3 archive_entry_acl_next_w.3
+MLINKS+=	archive_entry_acl.3 archive_entry_acl_reset.3
+MLINKS+=	archive_entry_acl.3 archive_entry_acl_to_text.3
+MLINKS+=	archive_entry_acl.3 archive_entry_acl_to_text_w.3
+MLINKS+=	archive_entry_acl.3 archive_entry_acl_types.3
+
+MLINKS+=	archive_entry_linkify.3 archive_entry_linkresolver.3
+MLINKS+=	archive_entry_linkify.3 archive_entry_linkresolver_new.3
+MLINKS+=	archive_entry_linkify.3 archive_entry_linkresolver_set_strategy.3
+MLINKS+=	archive_entry_linkify.3 archive_entry_linkresolver_free.3
+
+MLINKS+=	archive_entry_paths.3 archive_entry_hardlink.3
+MLINKS+=	archive_entry_paths.3 archive_entry_hardlink_w.3
+MLINKS+=	archive_entry_paths.3 archive_entry_set_hardlink.3
+MLINKS+=	archive_entry_paths.3 archive_entry_copy_hardlink.3
+MLINKS+=	archive_entry_paths.3 archive_entry_copy_hardlink_w.3
+MLINKS+=	archive_entry_paths.3 archive_entry_update_hardlink_utf8.3
+MLINKS+=	archive_entry_paths.3 archive_entry_set_link.3
+MLINKS+=	archive_entry_paths.3 archive_entry_copy_link.3
+MLINKS+=	archive_entry_paths.3 archive_entry_copy_link_w.3
+MLINKS+=	archive_entry_paths.3 archive_entry_update_link_utf8.3
+MLINKS+=	archive_entry_paths.3 archive_entry_pathname.3
+MLINKS+=	archive_entry_paths.3 archive_entry_pathname_w.3
+MLINKS+=	archive_entry_paths.3 archive_entry_set_pathname.3
+MLINKS+=	archive_entry_paths.3 archive_entry_copy_pathname.3
+MLINKS+=	archive_entry_paths.3 archive_entry_copy_pathname_w.3
+MLINKS+=	archive_entry_paths.3 archive_entry_update_pathname_utf8.3
+MLINKS+=	archive_entry_paths.3 archive_entry_sourcepath.3
+MLINKS+=	archive_entry_paths.3 archive_entry_copy_sourcepath.3
+MLINKS+=	archive_entry_paths.3 archive_entry_symlink.3
+MLINKS+=	archive_entry_paths.3 archive_entry_symlink_w.3
+MLINKS+=	archive_entry_paths.3 archive_entry_set_symlink.3
+MLINKS+=	archive_entry_paths.3 archive_entry_copy_symlink.3
+MLINKS+=	archive_entry_paths.3 archive_entry_copy_symlink_w.3
+MLINKS+=	archive_entry_paths.3 archive_entry_update_symlink_utf8.3
+
+MLINKS+=	archive_entry_perms.3 archive_entry_gid.3
+MLINKS+=	archive_entry_perms.3 archive_entry_set_gid.3
+MLINKS+=	archive_entry_perms.3 archive_entry_uid.3
+MLINKS+=	archive_entry_perms.3 archive_entry_set_uid.3
+MLINKS+=	archive_entry_perms.3 archive_entry_perm.3
+MLINKS+=	archive_entry_perms.3 archive_entry_set_perm.3
+MLINKS+=	archive_entry_perms.3 archive_entry_strmode.3
+MLINKS+=	archive_entry_perms.3 archive_entry_uname.3
+MLINKS+=	archive_entry_perms.3 archive_entry_uname_w.3
+MLINKS+=	archive_entry_perms.3 archive_entry_set_uname.3
+MLINKS+=	archive_entry_perms.3 archive_entry_copy_uname.3
+MLINKS+=	archive_entry_perms.3 archive_entry_copy_uname_w.3
+MLINKS+=	archive_entry_perms.3 archive_entry_update_uname_utf8.3
+MLINKS+=	archive_entry_perms.3 archive_entry_gname.3
+MLINKS+=	archive_entry_perms.3 archive_entry_gname_w.3
+MLINKS+=	archive_entry_perms.3 archive_entry_set_gname.3
+MLINKS+=	archive_entry_perms.3 archive_entry_copy_gname.3
+MLINKS+=	archive_entry_perms.3 archive_entry_copy_gname_w.3
+MLINKS+=	archive_entry_perms.3 archive_entry_update_gname_utf8.3
+MLINKS+=	archive_entry_perms.3 archive_entry_fflags.3
+MLINKS+=	archive_entry_perms.3 archive_entry_fflags_text.3
+MLINKS+=	archive_entry_perms.3 archive_entry_set_fflags.3
+MLINKS+=	archive_entry_perms.3 archive_entry_copy_fflags_text.3
+MLINKS+=	archive_entry_perms.3 archive_entry_copy_fflags_text_w.3
+
+MLINKS+=	archive_entry_stat.3 archive_entry_copy_stat.3
+MLINKS+=	archive_entry_stat.3 archive_entry_filetype.3
+MLINKS+=	archive_entry_stat.3 archive_entry_set_filetype.3
+MLINKS+=	archive_entry_stat.3 archive_entry_mode.3
+MLINKS+=	archive_entry_stat.3 archive_entry_set_mode.3
+MLINKS+=	archive_entry_stat.3 archive_entry_size.3
+MLINKS+=	archive_entry_stat.3 archive_entry_size_is_set.3
+MLINKS+=	archive_entry_stat.3 archive_entry_set_size.3
+MLINKS+=	archive_entry_stat.3 archive_entry_unset_size.3
+MLINKS+=	archive_entry_stat.3 archive_entry_dev.3
+MLINKS+=	archive_entry_stat.3 archive_entry_set_dev.3
+MLINKS+=	archive_entry_stat.3 archive_entry_dev_is_set.3
+MLINKS+=	archive_entry_stat.3 archive_entry_devmajor.3
+MLINKS+=	archive_entry_stat.3 archive_entry_set_devmajor.3
+MLINKS+=	archive_entry_stat.3 archive_entry_devminor.3
+MLINKS+=	archive_entry_stat.3 archive_entry_set_devminor.3
+MLINKS+=	archive_entry_stat.3 archive_entry_ino.3
+MLINKS+=	archive_entry_stat.3 archive_entry_set_ino.3
+MLINKS+=	archive_entry_stat.3 archive_entry_ino_is_set.3
+MLINKS+=	archive_entry_stat.3 archive_entry_ino64.3
+MLINKS+=	archive_entry_stat.3 archive_entry_set_ino64.3
+MLINKS+=	archive_entry_stat.3 archive_entry_nlink.3
+MLINKS+=	archive_entry_stat.3 archive_entry_rdev.3
+MLINKS+=	archive_entry_stat.3 archive_entry_set_rdev.3
+MLINKS+=	archive_entry_stat.3 archive_entry_rdevmajor.3
+MLINKS+=	archive_entry_stat.3 archive_entry_set_rdevmajor.3
+MLINKS+=	archive_entry_stat.3 archive_entry_rdevminor.3
+MLINKS+=	archive_entry_stat.3 archive_entry_set_rdevminor.3
+
+MLINKS+=	archive_entry_time.3 archive_entry_atime.3
+MLINKS+=	archive_entry_time.3 archive_entry_atime_nsec.3
+MLINKS+=	archive_entry_time.3 archive_entry_atime_is_set.3
+MLINKS+=	archive_entry_time.3 archive_entry_set_atime.3
+MLINKS+=	archive_entry_time.3 archive_entry_unset_atime.3
+MLINKS+=	archive_entry_time.3 archive_entry_birthtime.3
+MLINKS+=	archive_entry_time.3 archive_entry_birthtime_nsec.3
+MLINKS+=	archive_entry_time.3 archive_entry_birthtime_is_set.3
+MLINKS+=	archive_entry_time.3 archive_entry_set_birthtime.3
+MLINKS+=	archive_entry_time.3 archive_entry_unset_birthtime.3
+MLINKS+=	archive_entry_time.3 archive_entry_ctime.3
+MLINKS+=	archive_entry_time.3 archive_entry_ctime_nsec.3
+MLINKS+=	archive_entry_time.3 archive_entry_ctime_is_set.3
+MLINKS+=	archive_entry_time.3 archive_entry_set_ctime.3
+MLINKS+=	archive_entry_time.3 archive_entry_unset_ctime.3
+MLINKS+=	archive_entry_time.3 archive_entry_mtime.3
+MLINKS+=	archive_entry_time.3 archive_entry_mtime_nsec.3
+MLINKS+=	archive_entry_time.3 archive_entry_mtime_is_set.3
+MLINKS+=	archive_entry_time.3 archive_entry_set_mtime.3
+MLINKS+=	archive_entry_time.3 archive_entry_unset_mtime.3
+
+MLINKS+=	archive_read_add_passphrase.3 archive_read_set_passphrase_callback.3
+
+MLINKS+=	archive_read_data.3 archive_read_data_block.3
+MLINKS+=	archive_read_data.3 archive_read_data_skip.3
+MLINKS+=	archive_read_data.3 archive_read_data_into_fd.3
+
 MLINKS+=	archive_read_disk.3 archive_read_disk_new.3
 MLINKS+=	archive_read_disk.3 archive_read_disk_set_symlink_logical.3
 MLINKS+=	archive_read_disk.3 archive_read_disk_set_symlink_physical.3
 MLINKS+=	archive_read_disk.3 archive_read_disk_set_symlink_hybrid.3
-MLINKS+=	archive_read_disk.3 archive_read_disk_set_entry_from_file.3
+MLINKS+=	archive_read_disk.3 archive_read_disk_entry_from_file.3
 MLINKS+=	archive_read_disk.3 archive_read_disk_gname.3
 MLINKS+=	archive_read_disk.3 archive_read_disk_uname.3
 MLINKS+=	archive_read_disk.3 archive_read_disk_set_uname_lookup.3
 MLINKS+=	archive_read_disk.3 archive_read_disk_set_gname_lookup.3
 MLINKS+=	archive_read_disk.3 archive_read_disk_set_standard_lookup.3
+
+MLINKS+=	archive_read_extract.3 archive_read_extract2.3
+MLINKS+=	archive_read_extract.3 archive_read_extract_set_progress_callback.3
+
+MLINKS+=	archive_read_filter.3 archive_read_support_filter_all.3
+MLINKS+=	archive_read_filter.3 archive_read_support_filter_bzip2.3
+MLINKS+=	archive_read_filter.3 archive_read_support_filter_compress.3
+MLINKS+=	archive_read_filter.3 archive_read_support_filter_gzip.3
+MLINKS+=	archive_read_filter.3 archive_read_support_filter_lz4.3
+MLINKS+=	archive_read_filter.3 archive_read_support_filter_lzma.3
+MLINKS+=	archive_read_filter.3 archive_read_support_filter_none.3
+MLINKS+=	archive_read_filter.3 archive_read_support_filter_rpm.3
+MLINKS+=	archive_read_filter.3 archive_read_support_filter_uu.3
+MLINKS+=	archive_read_filter.3 archive_read_support_filter_xz.3
+MLINKS+=	archive_read_filter.3 archive_read_support_filter_program.3
+MLINKS+=	archive_read_filter.3 archive_read_support_filter_program_signature.3
+
+MLINKS+=	archive_read_format.3 archive_read_support_format_7zip.3
+MLINKS+=	archive_read_format.3 archive_read_support_format_all.3
+MLINKS+=	archive_read_format.3 archive_read_support_format_ar.3
+MLINKS+=	archive_read_format.3 archive_read_support_format_by_code.3
+MLINKS+=	archive_read_format.3 archive_read_support_format_cab.3
+MLINKS+=	archive_read_format.3 archive_read_support_format_cpio.3
+MLINKS+=	archive_read_format.3 archive_read_support_format_empty.3
+MLINKS+=	archive_read_format.3 archive_read_support_format_iso9660.3
+MLINKS+=	archive_read_format.3 archive_read_support_format_lha.3
+MLINKS+=	archive_read_format.3 archive_read_support_format_mtree.3
+MLINKS+=	archive_read_format.3 archive_read_support_format_rar.3
+MLINKS+=	archive_read_format.3 archive_read_support_format_raw.3
+MLINKS+=	archive_read_format.3 archive_read_support_format_tar.3
+MLINKS+=	archive_read_format.3 archive_read_support_format_xar.3
+MLINKS+=	archive_read_format.3 archive_read_support_format_zip.3
+
+MLINKS+=	archive_read_free.3 archive_read_close.3
+MLINKS+=	archive_read_free.3 archive_read_finish.3
+
+MLINKS+=	archive_read_header.3 archive_read_header2.3
+
+MLINKS+=	archive_read_open.3 archive_read_open2.3
+MLINKS+=	archive_read_open.3 archive_read_open_fd.3
+MLINKS+=	archive_read_open.3 archive_read_open_FILE.3
+MLINKS+=	archive_read_open.3 archive_read_open_filename.3
+MLINKS+=	archive_read_open.3 archive_read_open_memory.3
+
+MLINKS+=	archive_read_set_options.3 archive_read_set_filter_option.3
+MLINKS+=	archive_read_set_options.3 archive_read_set_format_option.3
+MLINKS+=	archive_read_set_options.3 archive_read_set_option.3
+
 MLINKS+=	archive_util.3 archive_clear_error.3
 MLINKS+=	archive_util.3 archive_compression.3
 MLINKS+=	archive_util.3 archive_compression_name.3
@@ -223,43 +364,80 @@ MLINKS+=	archive_util.3 archive_copy_err
 MLINKS+=	archive_util.3 archive_errno.3
 MLINKS+=	archive_util.3 archive_error_string.3
 MLINKS+=	archive_util.3 archive_file_count.3
+MLINKS+=	archive_util.3 archive_filter_code.3
+MLINKS+=	archive_util.3 archive_filter_count.3
+MLINKS+=	archive_util.3 archive_filter_name.3
 MLINKS+=	archive_util.3 archive_format.3
 MLINKS+=	archive_util.3 archive_format_name.3
+MLINKS+=	archive_util.3 archive_position.3
 MLINKS+=	archive_util.3 archive_set_error.3
-MLINKS+=	archive_write.3 archive_write_new.3
-MLINKS+=	archive_write.3 archive_write_set_format_cpio.3
-MLINKS+=	archive_write.3 archive_write_set_format_pax.3
-MLINKS+=	archive_write.3 archive_write_set_format_pax_restricted.3
-MLINKS+=	archive_write.3 archive_write_set_format_shar.3
-MLINKS+=	archive_write.3 archive_write_set_format_shar_binary.3
-MLINKS+=	archive_write.3 archive_write_set_format_ustar.3
-MLINKS+=	archive_write.3 archive_write_get_bytes_per_block.3
-MLINKS+=	archive_write.3 archive_write_set_bytes_per_block.3
-MLINKS+=	archive_write.3 archive_write_set_bytes_in_last_block.3
-MLINKS+=	archive_write.3 archive_write_set_compression_bzip2.3
-MLINKS+=	archive_write.3 archive_write_set_compression_compress.3
-MLINKS+=	archive_write.3 archive_write_set_compression_gzip.3
-MLINKS+=	archive_write.3 archive_write_set_compression_none.3
-MLINKS+=	archive_write.3 archive_write_set_compression_program.3
-MLINKS+=	archive_write.3 archive_write_set_compressor_options.3
-MLINKS+=	archive_write.3 archive_write_options.3
-MLINKS+=	archive_write.3 archive_write_open.3
-MLINKS+=	archive_write.3 archive_write_open_fd.3
-MLINKS+=	archive_write.3 archive_write_open_FILE.3
-MLINKS+=	archive_write.3 archive_write_open_filename.3
-MLINKS+=	archive_write.3 archive_write_open_memory.3
-MLINKS+=	archive_write.3 archive_write_header.3
-MLINKS+=	archive_write.3 archive_write_data.3
-MLINKS+=	archive_write.3 archive_write_finish_entry.3
-MLINKS+=	archive_write.3 archive_write_close.3
-MLINKS+=	archive_write.3 archive_write_finish.3
-MLINKS+=	archive_write.3 archive_write_set_callbacks.3
+
+MLINKS+=	archive_write_blocksize.3 archive_write_get_bytes_per_block.3
+MLINKS+=	archive_write_blocksize.3 archive_write_set_bytes_per_block.3
+MLINKS+=	archive_write_blocksize.3 archive_write_get_bytes_in_last_block.3
+MLINKS+=	archive_write_blocksize.3 archive_write_set_bytes_in_last_block.3
+
 MLINKS+=	archive_write_disk.3 archive_write_disk_new.3
 MLINKS+=	archive_write_disk.3 archive_write_disk_set_options.3
 MLINKS+=	archive_write_disk.3 archive_write_disk_set_skip_file.3
 MLINKS+=	archive_write_disk.3 archive_write_disk_set_group_lookup.3
 MLINKS+=	archive_write_disk.3 archive_write_disk_set_standard_lookup.3
 MLINKS+=	archive_write_disk.3 archive_write_disk_set_user_lookup.3
+
+MLINKS+=	archive_write_filter.3 archive_write_add_filter_b64encode.3
+MLINKS+=	archive_write_filter.3 archive_write_add_filter_by_name.3
+MLINKS+=	archive_write_filter.3 archive_write_add_filter_bzip2.3
+MLINKS+=	archive_write_filter.3 archive_write_add_filter_compress.3
+MLINKS+=	archive_write_filter.3 archive_write_add_filter_grzip.3
+MLINKS+=	archive_write_filter.3 archive_write_add_filter_gzip.3
+MLINKS+=	archive_write_filter.3 archive_write_add_filter_lrzip.3
+MLINKS+=	archive_write_filter.3 archive_write_add_filter_lz4.3
+MLINKS+=	archive_write_filter.3 archive_write_add_filter_lzip.3
+MLINKS+=	archive_write_filter.3 archive_write_add_filter_lzma.3
+MLINKS+=	archive_write_filter.3 archive_write_add_filter_lzop.3
+MLINKS+=	archive_write_filter.3 archive_write_add_filter_none.3
+MLINKS+=	archive_write_filter.3 archive_write_add_filter_program.3
+MLINKS+=	archive_write_filter.3 archive_write_add_filter_uuencode.3
+MLINKS+=	archive_write_filter.3 archive_write_add_filter_xz.3
+
+MLINKS+=	archive_write_format.3 archive_write_set_format_7zip.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_ar.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_ar_bsd.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_ar_svr4.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_by_name.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_cpio.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_cpio_newc.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_filter_by_ext.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_filter_by_ext_def.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_gnutar.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_iso9660.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_mtree.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_mtree_classic.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_mtree_default.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_pax.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_pax_restricted.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_raw.3
+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_format.3 archive_write_set_format_v7tar.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_warc.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_xar.3
+MLINKS+=	archive_write_format.3 archive_write_set_format_zip.3
+
+MLINKS+=	archive_write_free.3 archive_write_fail.3
+MLINKS+=	archive_write_free.3 archive_write_close.3
+MLINKS+=	archive_write_free.3 archive_write_finish.3
+
+MLINKS+=	archive_write_open.3 archive_write_open_fd.3
+MLINKS+=	archive_write_open.3 archive_write_open_FILE.3
+MLINKS+=	archive_write_open.3 archive_write_open_filename.3
+MLINKS+=	archive_write_open.3 archive_write_open_memory.3
+
+MLINKS+=	archive_write_set_options.3 archive_write_set_filter_option.3
+MLINKS+=	archive_write_set_options.3 archive_write_set_format_option.3
+MLINKS+=	archive_write_set_options.3 archive_write_set_option.3
+MLINKS+=	archive_write_set_passphrase.3 archive_write_set_passphrase_callback.3
 MLINKS+=	libarchive.3 archive.3
 
 .include <bsd.lib.mk>

Index: src/external/bsd/libarchive/lib/libarchive/shlib_version
diff -u src/external/bsd/libarchive/lib/libarchive/shlib_version:1.1 src/external/bsd/libarchive/lib/libarchive/shlib_version:1.2
--- src/external/bsd/libarchive/lib/libarchive/shlib_version:1.1	Sat Feb 20 02:55:53 2010
+++ src/external/bsd/libarchive/lib/libarchive/shlib_version	Thu Apr 20 13:11:04 2017
@@ -1,6 +1,6 @@
-#	$NetBSD: shlib_version,v 1.1 2010/02/20 02:55:53 joerg Exp $
+#	$NetBSD: shlib_version,v 1.2 2017/04/20 13:11:04 joerg Exp $
 #	Remember to update distrib/sets/lists/base/shl.* when changing
 #
 
-major=3
-minor=1
+major=4
+minor=0

Index: src/external/bsd/libarchive/lib/libarchive_fe/Makefile
diff -u src/external/bsd/libarchive/lib/libarchive_fe/Makefile:1.1 src/external/bsd/libarchive/lib/libarchive_fe/Makefile:1.2
--- src/external/bsd/libarchive/lib/libarchive_fe/Makefile:1.1	Sat Feb 20 02:55:53 2010
+++ src/external/bsd/libarchive/lib/libarchive_fe/Makefile	Thu Apr 20 13:11:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/02/20 02:55:53 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2017/04/20 13:11:04 joerg Exp $
 
 .include <bsd.init.mk>
 
@@ -7,7 +7,7 @@
 LIBISPRIVATE=	yes
 
 LIB=		archive_fe
-SRCS=		err.c line_reader.c matching.c pathmatch.c
+SRCS=		err.c line_reader.c passphrase.c
 NOMAN=		yes
 
 .include <bsd.lib.mk>

Reply via email to