Merge for libarchive-3.3.2.

13 files changed, 197 insertions, 220 deletions

diff --git a/archivers/libarchive/files/doc/man/Makefile b/archivers/libarchive/files/doc/man/Makefile
index 5f05971b71c..0c43b1d0071 100644
--- a/archivers/libarchive/files/doc/man/Makefile
+++ b/archivers/libarchive/files/doc/man/Makefile
@@ -104,15 +104,15 @@ archive_write_set_passphrase.3: ../mdoc2man.awk ../../libarchive/archive_write_s
 cpio.5: ../mdoc2man.awk ../../libarchive/cpio.5
 	awk -f ../mdoc2man.awk < ../../libarchive/cpio.5 > cpio.5
 
-libarchive-formats.5: ../mdoc2man.awk ../../libarchive/libarchive-formats.5
-	awk -f ../mdoc2man.awk < ../../libarchive/libarchive-formats.5 > libarchive-formats.5
-
 libarchive.3: ../mdoc2man.awk ../../libarchive/libarchive.3
 	awk -f ../mdoc2man.awk < ../../libarchive/libarchive.3 > libarchive.3
 
 libarchive_changes.3: ../mdoc2man.awk ../../libarchive/libarchive_changes.3
 	awk -f ../mdoc2man.awk < ../../libarchive/libarchive_changes.3 > libarchive_changes.3
 
+libarchive-formats.5: ../mdoc2man.awk ../../libarchive/libarchive-formats.5
+	awk -f ../mdoc2man.awk < ../../libarchive/libarchive-formats.5 > libarchive-formats.5
+
 libarchive_internals.3: ../mdoc2man.awk ../../libarchive/libarchive_internals.3
 	awk -f ../mdoc2man.awk < ../../libarchive/libarchive_internals.3 > libarchive_internals.3
 
@@ -127,4 +127,4 @@ bsdtar.1: ../mdoc2man.awk ../../tar/bsdtar.1
 
 bsdcpio.1: ../mdoc2man.awk ../../cpio/bsdcpio.1
 	awk -f ../mdoc2man.awk < ../../cpio/bsdcpio.1 > bsdcpio.1
-all: 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 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 cpio.5 libarchive-formats.5 libarchive.3 libarchive_changes.3 libarchive_internals.3 mtree.5 tar.5 bsdtar.1 bsdcpio.1
+all: 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 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 cpio.5 libarchive.3 libarchive_changes.3 libarchive-formats.5 libarchive_internals.3 mtree.5 tar.5 bsdtar.1 bsdcpio.1
diff --git a/archivers/libarchive/files/doc/man/archive_entry.3 b/archivers/libarchive/files/doc/man/archive_entry.3
index f0031d42dfa..35f2d741edd 100644
--- a/archivers/libarchive/files/doc/man/archive_entry.3
+++ b/archivers/libarchive/files/doc/man/archive_entry.3
@@ -1,4 +1,4 @@
-.TH ARCHIVE_ENTRY 3 "Feburary 2, 2012" ""
+.TH ARCHIVE_ENTRY 3 "February 2, 2012" ""
 .SH NAME
 .ad l
 \fB\%archive_entry_clear\fP,
diff --git a/archivers/libarchive/files/doc/man/archive_entry_acl.3 b/archivers/libarchive/files/doc/man/archive_entry_acl.3
index 8dd2008d420..52c9b1c5751 100644
--- a/archivers/libarchive/files/doc/man/archive_entry_acl.3
+++ b/archivers/libarchive/files/doc/man/archive_entry_acl.3
@@ -6,7 +6,7 @@
 \fB\%archive_entry_acl_clear\fP,
 \fB\%archive_entry_acl_count\fP,
 \fB\%archive_entry_acl_from_text\fP,
-\fB\%archive_entry_acl_from_text_w,\fP
+\fB\%archive_entry_acl_from_text_w\fP,
 \fB\%archive_entry_acl_next\fP,
 \fB\%archive_entry_acl_next_w\fP,
 \fB\%archive_entry_acl_reset\fP,
@@ -240,7 +240,7 @@ Only inherit, do not apply the permission on the directory itself.
 Do not propagate inherit flags. Only first-level entries inherit ACLs.
 .TP
 .BR ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS (.B S )
-Trigger alarm or audit on succesful access.
+Trigger alarm or audit on successful access.
 .TP
 .BR ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS (.B F )
 Trigger alarm or audit on failed access.
@@ -254,7 +254,7 @@ and
 \fB\%archive_entry_acl_add_entry_w\fP()
 add a single ACL entry.
 For the access ACL and non-extended principals, the classic Unix permissions
-are updated. An archive enry cannot contain both POSIX.1e and NFSv4 ACL
+are updated. An archive entry cannot contain both POSIX.1e and NFSv4 ACL
 entries.
 .PP
 \fB\%archive_entry_acl_clear\fP()
@@ -283,7 +283,7 @@ for POSIX.1e ACLs and
 for NFSv4 ACLs. For POSIX.1e ACLs if
 .BR ARCHIVE_ENTRY_ACL_TYPE_ACCESS
 is included and at least one extended ACL entry is found,
-the three non-extened ACLs are added.
+the three non-extended ACLs are added.
 .PP
 \fB\%archive_entry_acl_from_text\fP()
 and
@@ -348,7 +348,7 @@ and
 \fB\%archive_entry_acl_to_text_w\fP()
 convert the ACL entries for the given type into a
 (wide)
-string of ACL entries separated by newline. If the the pointer
+string of ACL entries separated by newline. If the pointer
 is not NULL, then the function shall return the length of the string
 (not including the NULL terminator)
 in the location pointed to by
diff --git a/archivers/libarchive/files/doc/man/archive_entry_paths.3 b/archivers/libarchive/files/doc/man/archive_entry_paths.3
index 471632e0600..2468825ee56 100644
--- a/archivers/libarchive/files/doc/man/archive_entry_paths.3
+++ b/archivers/libarchive/files/doc/man/archive_entry_paths.3
@@ -6,25 +6,25 @@
 \fB\%archive_entry_set_hardlink\fP,
 \fB\%archive_entry_copy_hardlink\fP,
 \fB\%archive_entry_copy_hardlink_w\fP,
-\fB\%archve_entry_update_hardlink_utf8\fP,
+\fB\%archive_entry_update_hardlink_utf8\fP,
 \fB\%archive_entry_set_link\fP,
 \fB\%archive_entry_copy_link\fP,
 \fB\%archive_entry_copy_link_w\fP,
-\fB\%archve_entry_update_link_utf8\fP,
+\fB\%archive_entry_update_link_utf8\fP,
 \fB\%archive_entry_pathname\fP,
 \fB\%archive_entry_pathname_w\fP,
 \fB\%archive_entry_set_pathname\fP,
 \fB\%archive_entry_copy_pathname\fP,
 \fB\%archive_entry_copy_pathname_w\fP,
-\fB\%archve_entry_update_pathname_utf8\fP,
+\fB\%archive_entry_update_pathname_utf8\fP,
 \fB\%archive_entry_sourcepath\fP,
 \fB\%archive_entry_copy_sourcepath\fP,
-\fB\%archive_entry_symlink,\fP
-\fB\%archive_entry_symlink_w,\fP
+\fB\%archive_entry_symlink\fP,
+\fB\%archive_entry_symlink_w\fP,
 \fB\%archive_entry_set_symlink\fP,
 \fB\%archive_entry_copy_symlink\fP,
 \fB\%archive_entry_copy_symlink_w\fP,
-\fB\%archve_entry_update_symlink_utf8\fP
+\fB\%archive_entry_update_symlink_utf8\fP
 \- functions for manipulating path names in archive entry descriptions
 .SH LIBRARY
 .ad l
diff --git a/archivers/libarchive/files/doc/man/archive_entry_perms.3 b/archivers/libarchive/files/doc/man/archive_entry_perms.3
index 294f6989c77..94be16b9a1b 100644
--- a/archivers/libarchive/files/doc/man/archive_entry_perms.3
+++ b/archivers/libarchive/files/doc/man/archive_entry_perms.3
@@ -8,8 +8,8 @@
 \fB\%archive_entry_perm\fP,
 \fB\%archive_entry_set_perm\fP,
 \fB\%archive_entry_strmode\fP,
-\fB\%archive_entry_uname\fP
-\fB\%archive_entry_uname_w\fP
+\fB\%archive_entry_uname\fP,
+\fB\%archive_entry_uname_w\fP,
 \fB\%archive_entry_set_uname\fP,
 \fB\%archive_entry_copy_uname\fP,
 \fB\%archive_entry_copy_uname_w\fP,
diff --git a/archivers/libarchive/files/doc/man/archive_read_disk.3 b/archivers/libarchive/files/doc/man/archive_read_disk.3
index 58f31996595..130db8a5331 100644
--- a/archivers/libarchive/files/doc/man/archive_read_disk.3
+++ b/archivers/libarchive/files/doc/man/archive_read_disk.3
@@ -1,7 +1,8 @@
-.TH ARCHIVE_READ_DISK 3 "December 30, 2016" ""
+.TH ARCHIVE_READ_DISK 3 "April 3, 2017" ""
 .SH NAME
 .ad l
 \fB\%archive_read_disk_new\fP,
+\fB\%archive_read_disk_set_behavior\fP,
 \fB\%archive_read_disk_set_symlink_logical\fP,
 \fB\%archive_read_disk_set_symlink_physical\fP,
 \fB\%archive_read_disk_set_symlink_hybrid\fP,
@@ -10,10 +11,7 @@
 \fB\%archive_read_disk_uname\fP,
 \fB\%archive_read_disk_set_uname_lookup\fP,
 \fB\%archive_read_disk_set_gname_lookup\fP,
-\fB\%archive_read_disk_set_standard_lookup\fP,
-\fB\%archive_read_close\fP,
-\fB\%archive_read_finish\fP,
-\fB\%archive_read_free\fP
+\fB\%archive_read_disk_set_standard_lookup\fP
 \- functions for reading objects from disk
 .SH LIBRARY
 .ad l
@@ -28,6 +26,10 @@ Streaming Archive Library (libarchive, -larchive)
 .br
 \fIint\fP
 .br
+\fB\%archive_read_disk_set_behavior\fP(\fI\%struct\ archive\ *\fP, \fI\%int\fP);
+.br
+\fIint\fP
+.br
 \fB\%archive_read_disk_set_symlink_logical\fP(\fI\%struct\ archive\ *\fP);
 .br
 \fIint\fP
@@ -61,18 +63,6 @@ Streaming Archive Library (libarchive, -larchive)
 \fIint\fP
 .br
 \fB\%archive_read_disk_entry_from_file\fP(\fI\%struct\ archive\ *\fP, \fI\%struct\ archive_entry\ *\fP, \fI\%int\ fd\fP, \fI\%const\ struct\ stat\ *\fP);
-.br
-\fIint\fP
-.br
-\fB\%archive_read_close\fP(\fI\%struct\ archive\ *\fP);
-.br
-\fIint\fP
-.br
-\fB\%archive_read_finish\fP(\fI\%struct\ archive\ *\fP);
-.br
-\fIint\fP
-.br
-\fB\%archive_read_free\fP(\fI\%struct\ archive\ *\fP);
 .SH DESCRIPTION
 .ad l
 These functions provide an API for reading information about
@@ -87,6 +77,59 @@ Allocates and initializes a
 Tn struct archive
 object suitable for reading object information from disk.
 .TP
+\fB\%archive_read_disk_set_behavior\fP()
+Configures various behavior options when reading entries from disk.
+The flags field consists of a bitwise OR of one or more of the
+following values:
+.RS 5
+.TP
+\fBARCHIVE_READDISK_HONOR_NODUMP\fP
+Skip files and directories with the nodump file attribute (file flag) set.
+By default, the nodump file atrribute is ignored.
+.TP
+\fBARCHIVE_READDISK_MAC_COPYFILE\fP
+Mac OS X specific. Read metadata (ACLs and extended attributes) with
+\fBcopyfile\fP(3).
+By default, metadata is read using
+\fBcopyfile\fP(3).
+.TP
+\fBARCHIVE_READDISK_NO_ACL\fP
+Do not read Access Control Lists.
+By default, ACLs are read from disk.
+.TP
+\fBARCHIVE_READDISK_NO_FFLAGS\fP
+Do not read file attributes (file flags).
+By default, file attributes are read from disk.
+See
+\fBchattr\fP(1)
+(Linux)
+or
+\fBchflags\fP(1)
+(FreeBSD, Mac OS X)
+for more information on file attributes.
+.TP
+\fBARCHIVE_READDISK_NO_TRAVERSE_MOUNTS\fP
+Do not traverse mount points.
+By defaut, moint points are traversed.
+.TP
+\fBARCHIVE_READDISK_NO_XATTR\fP
+Do not read extended file attributes (xattrs).
+By default, extended file attributes are read from disk.
+See
+\fBxattr\fP(7)
+(Linux,)
+\fBxattr\fP(2)
+(Mac OS X,)
+or
+\fBgetextattr\fP(8)
+(FreeBSD)
+for more information on extended file attributes.
+.TP
+\fBARCHIVE_READDISK_RESTORE_ATIME\fP
+Restore access time of traversed files.
+By default, access time of traversed files is not restored.
+.RE
+.TP
 \fB\%archive_read_disk_set_symlink_logical\fP(),
 \fB\%archive_read_disk_set_symlink_physical\fP(),
 \fB\%archive_read_disk_set_symlink_hybrid\fP()
@@ -168,20 +211,6 @@ using the currently registered lookup functions above.
 This affects the file ownership fields and ACL values in the
 Tn struct archive_entry
 object.
-.TP
-\fB\%archive_read_close\fP()
-Does nothing for
-Tn archive_read_disk
-handles.
-.TP
-\fB\%archive_read_finish\fP()
-This is a deprecated synonym for
-\fB\%archive_read_free\fP().
-.TP
-\fB\%archive_read_free\fP()
-Invokes
-\fB\%archive_read_close\fP()
-if it was not invoked manually, then releases all resources.
 .RE
 More information about the
 \fIstruct\fP archive
diff --git a/archivers/libarchive/files/doc/man/archive_read_open.3 b/archivers/libarchive/files/doc/man/archive_read_open.3
index eaa344bb368..c22c17434cd 100644
--- a/archivers/libarchive/files/doc/man/archive_read_open.3
+++ b/archivers/libarchive/files/doc/man/archive_read_open.3
@@ -6,7 +6,7 @@
 \fB\%archive_read_open_fd\fP,
 \fB\%archive_read_open_FILE\fP,
 \fB\%archive_read_open_filename\fP,
-\fB\%archive_read_open_memory\fP,
+\fB\%archive_read_open_memory\fP
 \- functions for reading streaming archives
 .SH LIBRARY
 .ad l
@@ -37,7 +37,7 @@ Streaming Archive Library (libarchive, -larchive)
 .br
 \fIint\fP
 .br
-\fB\%archive_read_open_memory\fP(\fI\%struct\ archive\ *\fP, \fI\%void\ *buff\fP, \fI\%size_t\ size\fP);
+\fB\%archive_read_open_memory\fP(\fI\%struct\ archive\ *\fP, \fI\%const\ void\ *buff\fP, \fI\%size_t\ size\fP);
 .SH DESCRIPTION
 .ad l
 .RS 5
diff --git a/archivers/libarchive/files/doc/man/archive_write_data.3 b/archivers/libarchive/files/doc/man/archive_write_data.3
index aa1992d3de4..9ea9be413dd 100644
--- a/archivers/libarchive/files/doc/man/archive_write_data.3
+++ b/archivers/libarchive/files/doc/man/archive_write_data.3
@@ -1,7 +1,8 @@
-.TH ARCHIVE_WRITE_DATA 3 "February 2, 2012" ""
+.TH ARCHIVE_WRITE_DATA 3 "February 28, 2017" ""
 .SH NAME
 .ad l
-\fB\%archive_write_data\fP
+\fB\%archive_write_data\fP,
+\fB\%archive_write_data_block\fP
 \- functions for creating archives
 .SH LIBRARY
 .ad l
@@ -13,9 +14,32 @@ Streaming Archive Library (libarchive, -larchive)
 \fIla_ssize_t\fP
 .br
 \fB\%archive_write_data\fP(\fI\%struct\ archive\ *\fP, \fI\%const\ void\ *\fP, \fI\%size_t\fP);
+.br
+\fIla_ssize_t\fP
+.br
+\fB\%archive_write_data_block\fP(\fI\%struct\ archive\ *\fP, \fI\%const\ void\ *\fP, \fI\%size_t\ size\fP, \fI\%int64_t\ offset\fP);
 .SH DESCRIPTION
 .ad l
+.RS 5
+.TP
+\fB\%archive_write_data\fP()
+Write data corresponding to the header just written.
+.TP
+\fB\%archive_write_data_block\fP()
 Write data corresponding to the header just written.
+This is like
+\fB\%archive_write_data\fP()
+except that it performs a seek on the file being
+written to the specified offset before writing the data.
+This is useful when restoring sparse files from archive
+formats that support sparse files.
+Returns number of bytes written or -1 on error.
+(Note: This is currently not supported for
+Tn archive_write
+handles, only for
+Tn archive_write_disk
+handles.
+.RE
 .SH RETURN VALUES
 .ad l
 This function returns the number of bytes actually written, or
diff --git a/archivers/libarchive/files/doc/man/archive_write_disk.3 b/archivers/libarchive/files/doc/man/archive_write_disk.3
index 5ed4c3bafd1..ffc14930bbc 100644
--- a/archivers/libarchive/files/doc/man/archive_write_disk.3
+++ b/archivers/libarchive/files/doc/man/archive_write_disk.3
@@ -1,4 +1,4 @@
-.TH ARCHIVE_WRITE_DISK 3 "February 2, 2012" ""
+.TH ARCHIVE_WRITE_DISK 3 "April 3, 2017" ""
 .SH NAME
 .ad l
 \fB\%archive_write_disk_new\fP,
@@ -6,14 +6,7 @@
 \fB\%archive_write_disk_set_skip_file\fP,
 \fB\%archive_write_disk_set_group_lookup\fP,
 \fB\%archive_write_disk_set_standard_lookup\fP,
-\fB\%archive_write_disk_set_user_lookup\fP,
-\fB\%archive_write_header\fP,
-\fB\%archive_write_data\fP,
-\fB\%archive_write_data_block\fP,
-\fB\%archive_write_finish_entry\fP,
-\fB\%archive_write_close\fP,
-\fB\%archive_write_finish\fP
-\fB\%archive_write_free\fP
+\fB\%archive_write_disk_set_user_lookup\fP
 \- functions for creating objects on disk
 .SH LIBRARY
 .ad l
@@ -45,34 +38,6 @@ Streaming Archive Library (libarchive, -larchive)
 \fIint\fP
 .br
 \fB\%archive_write_disk_set_user_lookup\fP(\fI\%struct\ archive\ *\fP, \fI\%void\ *\fP, \fI\%uid_t\ (*)(void\ *,\ const\ char\ *uname,\ uid_t\ uid)\fP, \fI\%void\ (*cleanup)(void\ *)\fP);
-.br
-\fIint\fP
-.br
-\fB\%archive_write_header\fP(\fI\%struct\ archive\ *\fP, \fI\%struct\ archive_entry\ *\fP);
-.br
-\fIla_ssize_t\fP
-.br
-\fB\%archive_write_data\fP(\fI\%struct\ archive\ *\fP, \fI\%const\ void\ *\fP, \fI\%size_t\fP);
-.br
-\fIla_ssize_t\fP
-.br
-\fB\%archive_write_data_block\fP(\fI\%struct\ archive\ *\fP, \fI\%const\ void\ *\fP, \fI\%size_t\ size\fP, \fI\%int64_t\ offset\fP);
-.br
-\fIint\fP
-.br
-\fB\%archive_write_finish_entry\fP(\fI\%struct\ archive\ *\fP);
-.br
-\fIint\fP
-.br
-\fB\%archive_write_close\fP(\fI\%struct\ archive\ *\fP);
-.br
-\fIint\fP
-.br
-\fB\%archive_write_finish\fP(\fI\%struct\ archive\ *\fP);
-.br
-\fIint\fP
-.br
-\fB\%archive_write_free\fP(\fI\%struct\ archive\ *\fP);
 .SH DESCRIPTION
 .ad l
 These functions provide a complete API for creating objects on
@@ -113,6 +78,38 @@ The options field consists of a bitwise OR of one or more of the
 following values:
 .RS 5
 .TP
+\fBARCHIVE_EXTRACT_ACL\fP
+Attempt to restore Access Control Lists.
+By default, extended ACLs are ignored.
+.TP
+\fBARCHIVE_EXTRACT_CLEAR_NOCHANGE_FFLAGS\fP
+Before removing a file system object prior to replacing it, clear
+platform-specific file flags which might prevent its removal.
+.TP
+\fBARCHIVE_EXTRACT_FFLAGS\fP
+Attempt to restore file attributes (file flags).
+By default, file attributes are ignored.
+See
+\fBchattr\fP(1)
+(Linux)
+or
+\fBchflags\fP(1)
+(FreeBSD, Mac OS X)
+for more information on file attributes.
+.TP
+\fBARCHIVE_EXTRACT_MAC_METADATA\fP
+Mac OS X specific. Restore metadata using
+\fBcopyfile\fP(3).
+By default,
+\fBcopyfile\fP(3)
+metadata is ignored.
+.TP
+\fBARCHIVE_EXTRACT_NO_OVERWRITE\fP
+Existing files on disk will not be overwritten.
+By default, existing regular files are truncated and overwritten;
+existing directories will have their permissions updated;
+other pre-existing objects are unlinked and recreated from scratch.
+.TP
 \fBARCHIVE_EXTRACT_OWNER\fP
 The user and group IDs should be set on the restored file.
 By default, the user and group IDs are not restored.
@@ -130,36 +127,18 @@ if the default user and group IDs of newly-created objects on disk
 happen to match those specified in the archive entry.
 By default, only basic permissions are restored, and umask is obeyed.
 .TP
-\fBARCHIVE_EXTRACT_TIME\fP
-The timestamps (mtime, ctime, and atime) should be restored.
-By default, they are ignored.
-Note that restoring of atime is not currently supported.
-.TP
-\fBARCHIVE_EXTRACT_NO_OVERWRITE\fP
-Existing files on disk will not be overwritten.
-By default, existing regular files are truncated and overwritten;
-existing directories will have their permissions updated;
-other pre-existing objects are unlinked and recreated from scratch.
-.TP
-\fBARCHIVE_EXTRACT_UNLINK\fP
-Existing files on disk will be unlinked before any attempt to
-create them.
-In some cases, this can prove to be a significant performance improvement.
-By default, existing files are truncated and rewritten, but
-the file is not recreated.
-In particular, the default behavior does not break existing hard links.
-.TP
-\fBARCHIVE_EXTRACT_ACL\fP
-Attempt to restore ACLs.
-By default, extended ACLs are ignored.
-.TP
-\fBARCHIVE_EXTRACT_FFLAGS\fP
-Attempt to restore extended file flags.
-By default, file flags are ignored.
+\fBARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS\fP
+Refuse to extract an absolute path.
+The default is to not refuse such paths.
 .TP
-\fBARCHIVE_EXTRACT_XATTR\fP
-Attempt to restore POSIX.1e extended attributes.
-By default, they are ignored.
+\fBARCHIVE_EXTRACT_SECURE_NODOTDOT\fP
+Refuse to extract a path that contains a
+\fI\& ..\fP
+element anywhere within it.
+The default is to not refuse such paths.
+Note that paths ending in
+\fI\& ..\fP
+always cause an error, regardless of this flag.
 .TP
 \fBARCHIVE_EXTRACT_SECURE_SYMLINKS\fP
 Refuse to extract any object whose final location would be altered
@@ -169,32 +148,41 @@ caused by archives that (deliberately or otherwise) extract
 files outside of the current directory.
 The default is not to perform this check.
 If
+.TP
+\fBARCHIVE_EXTRACT_SPARSE\fP
+Scan data for blocks of NUL bytes and try to recreate them with holes.
+This results in sparse files, independent of whether the archive format
+supports or uses them.
 \fBARCHIVE_EXTRACT_UNLINK\fP
 is specified together with this option, the library will
 remove any intermediate symlinks it finds and return an
 error only if such symlink could not be removed.
 .TP
-\fBARCHIVE_EXTRACT_SECURE_NODOTDOT\fP
-Refuse to extract a path that contains a
-\fI\& ..\fP
-element anywhere within it.
-The default is to not refuse such paths.
-Note that paths ending in
-\fI\& ..\fP
-always cause an error, regardless of this flag.
-.TP
-\fBARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS\fP
-Refuse to extract an absolute path.
-The default is to not refuse such paths.
+\fBARCHIVE_EXTRACT_TIME\fP
+The timestamps (mtime, ctime, and atime) should be restored.
+By default, they are ignored.
+Note that restoring of atime is not currently supported.
 .TP
-\fBARCHIVE_EXTRACT_SPARSE\fP
-Scan data for blocks of NUL bytes and try to recreate them with holes.
-This results in sparse files, independent of whether the archive format
-supports or uses them.
+\fBARCHIVE_EXTRACT_UNLINK\fP
+Existing files on disk will be unlinked before any attempt to
+create them.
+In some cases, this can prove to be a significant performance improvement.
+By default, existing files are truncated and rewritten, but
+the file is not recreated.
+In particular, the default behavior does not break existing hard links.
 .TP
-\fBARCHIVE_EXTRACT_CLEAR_NOCHANGE_FFLAGS\fP
-Before removing a file system object prior to replacing it, clear
-platform-specific file flags which might prevent its removal.
+\fBARCHIVE_EXTRACT_XATTR\fP
+Attempt to restore extended file attributes.
+By default, they are ignored.
+See
+\fBxattr\fP(7)
+(Linux,)
+\fBxattr\fP(2)
+(Mac OS X,)
+or
+\fBgetextattr\fP(8)
+(FreeBSD)
+for more information on extended file attributes.
 .RE
 .TP
 \fB\%archive_write_disk_set_group_lookup\fP(),
@@ -231,67 +219,6 @@ the number of calls to
 \fBgetpwnam\fP(3)
 and
 \fBgetgrnam\fP(3).
-.TP
-\fB\%archive_write_header\fP()
-Build and write a header using the data in the provided
-Tn struct archive_entry
-structure.
-See
-\fBarchive_entry\fP(3)
-for information on creating and populating
-Tn struct archive_entry
-objects.
-.TP
-\fB\%archive_write_data\fP()
-Write data corresponding to the header just written.
-Returns number of bytes written or -1 on error.
-.TP
-\fB\%archive_write_data_block\fP()
-Write data corresponding to the header just written.
-This is like
-\fB\%archive_write_data\fP()
-except that it performs a seek on the file being
-written to the specified offset before writing the data.
-This is useful when restoring sparse files from archive
-formats that support sparse files.
-Returns number of bytes written or -1 on error.
-(Note: This is currently not supported for
-Tn archive_write
-handles, only for
-Tn archive_write_disk
-handles.)
-.TP
-\fB\%archive_write_finish_entry\fP()
-Close out the entry just written.
-Ordinarily, clients never need to call this, as it
-is called automatically by
-\fB\%archive_write_next_header\fP()
-and
-\fB\%archive_write_close\fP()
-as needed.
-However, some file attributes are written to disk only
-after the file is closed, so this can be necessary
-if you need to work with the file on disk right away.
-.TP
-\fB\%archive_write_close\fP()
-Set any attributes that could not be set during the initial restore.
-For example, directory timestamps are not restored initially because
-restoring a subsequent file would alter that timestamp.
-Similarly, non-writable directories are initially created with
-write permissions (so that their contents can be restored).
-The
-\fB\%archive_write_disk_new\fP
-library maintains a list of all such deferred attributes and
-sets them when this function is invoked.
-.TP
-\fB\%archive_write_finish\fP()
-This is a deprecated synonym for
-\fB\%archive_write_free\fP().
-.TP
-\fB\%archive_write_free\fP()
-Invokes
-\fB\%archive_write_close\fP()
-if it was not invoked manually, then releases all resources.
 .RE
 More information about the
 \fIstruct\fP archive
diff --git a/archivers/libarchive/files/doc/man/archive_write_finish_entry.3 b/archivers/libarchive/files/doc/man/archive_write_finish_entry.3
index b76ac62d9fa..4523f232448 100644
--- a/archivers/libarchive/files/doc/man/archive_write_finish_entry.3
+++ b/archivers/libarchive/files/doc/man/archive_write_finish_entry.3
@@ -1,4 +1,4 @@
-.TH ARCHIVE_WRITE_FINISH_ENTRY 3 "February 2, 2012" ""
+.TH ARCHIVE_WRITE_FINISH_ENTRY 3 "February 28, 2017" ""
 .SH NAME
 .ad l
 \fB\%archive_write_finish_entry\fP
@@ -23,6 +23,9 @@ is called automatically by
 and
 \fB\%archive_write_close\fP()
 as needed.
+For
+Tn archive_write_disk
+handles, this flushes pending file attribute changes like modification time.
 .SH RETURN VALUES
 .ad l
 This function returns
diff --git a/archivers/libarchive/files/doc/man/bsdtar.1 b/archivers/libarchive/files/doc/man/bsdtar.1
index 3b49475a93a..46ebe42e2a6 100644
--- a/archivers/libarchive/files/doc/man/bsdtar.1
+++ b/archivers/libarchive/files/doc/man/bsdtar.1
@@ -1,4 +1,4 @@
-.TH TAR 1 "February 24, 2017" ""
+.TH TAR 1 "February 25, 2017" ""
 .SH NAME
 .ad l
 \fB\%tar\fP
@@ -172,7 +172,7 @@ restricted pax format and bzip2 compression.
 (c, r, u, x modes only)
 Archive or extract POSIX.1e or NFSv4 ACLs. This is the reverse of
 \fB\-Fl\fP no-acls
-and the default behavior in c, r, and u modes (except Mac OS X) or if
+and the default behavior in c, r, and u modes (except on Mac OS X) or if
 \fB\%tar\fP
 is run in x mode as root. On Mac OS X this option translates extended ACLs
 to NFSv4 ACLs. To store extended ACLs the
@@ -438,7 +438,7 @@ Honor the nodump file flag by skipping this file.
 .TP
 \fB\-Fl\fP nopreserveHFSCompression
 (x mode only)
-Mac OS X specific(v10.6 or later). Do not compress extracted regular files
+Mac OS X specific (v10.6 or later). Do not compress extracted regular files
 which were compressed with HFS+ compression before archived.
 By default, compress the regular files again with HFS+ compression.
 .TP
@@ -460,7 +460,7 @@ Do not archive or extract POSIX.1e or NFSv4 ACLs. This is the reverse of
 \fB\-Fl\fP acls
 and the default behavior if
 \fB\%tar\fP
-is run as non-root in x mode (on Mac OS X also in c, r and u modes).
+is run as non-root in x mode (on Mac OS X as any user in c, r, u and x modes).
 .TP
 \fB\-Fl\fP no-fflags
 (c, r, u, x modes only)
@@ -499,14 +499,7 @@ This is the reverse of
 \fB\-p\fP
 and the default behavior if
 \fB\%tar\fP
-is run as non-root and can be overridden by also specifying
-\fB\-Fl\fP acls,
-\fB\-Fl\fP fflags,
-\fB\-Fl\fP mac-metadata,
-\fB\-Fl\fP same-owner,
-\fB\-Fl\fP same-permissions
-and
-\fB\-Fl\fP xattrs.
+is run as non-root.
 .TP
 \fB\-Fl\fP no-xattrs
 (c, r, u, x modes only)
@@ -734,16 +727,16 @@ This option suppresses these behaviors.
 (x mode only)
 Preserve file permissions.
 Attempt to restore the full permissions, including owner, file modes, ACLs,
-extended atributes and extended file flags, if available, for each item
-extracted from the archive. This is the default, if
+extended attributes and extended file flags, if available, for each item
+extracted from the archive. This is te reverse of
+\fB\-Fl\fP no-same-permissions
+and the default if
 \fB\%tar\fP
-is being run by root and can be overridden by also specifying
+is being run by root and can be partially overridden by also specifying
 \fB\-Fl\fP no-acls,
 \fB\-Fl\fP no-fflags,
-\fB\-Fl\fP no-mac-metadata,
-\fB\-Fl\fP no-same-owner,
-\fB\-Fl\fP no-same-permissions
-and
+\fB\-Fl\fP no-mac-metadata
+or
 \fB\-Fl\fP no-xattrs.
 .TP
 \fB\-Fl\fP passphrase \fIpassphrase\fP
diff --git a/archivers/libarchive/files/doc/man/libarchive_changes.3 b/archivers/libarchive/files/doc/man/libarchive_changes.3
index e3ecb318d04..15e14d1596f 100644
--- a/archivers/libarchive/files/doc/man/libarchive_changes.3
+++ b/archivers/libarchive/files/doc/man/libarchive_changes.3
@@ -1,6 +1,7 @@
 .TH LIBARCHIVE_CHANGES 3 "December 23, 2011" ""
 .SH NAME
 .ad l
+\fB\%libarchive_changes\fP
 \- changes in libarchive interface
 .SH CHANGES IN LIBARCHIVE 3
 .ad l
diff --git a/archivers/libarchive/files/doc/man/mtree.5 b/archivers/libarchive/files/doc/man/mtree.5
index 79f05a4c558..e53f97c3f1d 100644
--- a/archivers/libarchive/files/doc/man/mtree.5
+++ b/archivers/libarchive/files/doc/man/mtree.5
@@ -18,7 +18,7 @@ Leading whitespace is always ignored.
 .PP
 When encoding file or pathnames, any backslash character or
 character outside of the 95 printable ASCII characters must be
-encoded as a a backslash followed by three
+encoded as a backslash followed by three
 octal digits.
 When reading mtree files, any appearance of a backslash
 followed by three octal digits should be converted into the