svn commit: r352731 - in vendor/libarchive/dist: . .github .github/workflows cat contrib/shar cpio libarchive libarchive/test tar tar/test test_utils
Martin Matuska
mm at FreeBSD.org
Thu Sep 26 01:42:16 UTC 2019
Author: mm
Date: Thu Sep 26 01:42:09 2019
New Revision: 352731
URL: https://svnweb.freebsd.org/changeset/base/352731
Log:
Update vendor/libarchive/dist to git 2f3033ca23f8c21160506c3c7ac8a0df0d3fde42
Relevant vendor changes:
Issue #1237: Fix integer overflow in archive_read_support_filter_lz4.c
PR #1249: Correct some typographical and grammatical errors.
PR #1250: Minor corrections to the formatting of manual pages
Added:
vendor/libarchive/dist/.github/
vendor/libarchive/dist/.github/workflows/
vendor/libarchive/dist/.github/workflows/ci.yml
Modified:
vendor/libarchive/dist/.cirrus.yml
vendor/libarchive/dist/cat/bsdcat.1
vendor/libarchive/dist/contrib/shar/shar.1
vendor/libarchive/dist/cpio/bsdcpio.1
vendor/libarchive/dist/libarchive/archive.h
vendor/libarchive/dist/libarchive/archive_entry.3
vendor/libarchive/dist/libarchive/archive_entry_acl.3
vendor/libarchive/dist/libarchive/archive_entry_misc.3
vendor/libarchive/dist/libarchive/archive_entry_paths.3
vendor/libarchive/dist/libarchive/archive_entry_perms.3
vendor/libarchive/dist/libarchive/archive_entry_stat.3
vendor/libarchive/dist/libarchive/archive_entry_time.3
vendor/libarchive/dist/libarchive/archive_read.3
vendor/libarchive/dist/libarchive/archive_read_add_passphrase.3
vendor/libarchive/dist/libarchive/archive_read_data.3
vendor/libarchive/dist/libarchive/archive_read_disk.3
vendor/libarchive/dist/libarchive/archive_read_extract.3
vendor/libarchive/dist/libarchive/archive_read_filter.3
vendor/libarchive/dist/libarchive/archive_read_format.3
vendor/libarchive/dist/libarchive/archive_read_free.3
vendor/libarchive/dist/libarchive/archive_read_header.3
vendor/libarchive/dist/libarchive/archive_read_new.3
vendor/libarchive/dist/libarchive/archive_read_open.3
vendor/libarchive/dist/libarchive/archive_read_set_options.3
vendor/libarchive/dist/libarchive/archive_read_support_filter_gzip.c
vendor/libarchive/dist/libarchive/archive_read_support_filter_lz4.c
vendor/libarchive/dist/libarchive/archive_read_support_format_zip.c
vendor/libarchive/dist/libarchive/archive_string.c
vendor/libarchive/dist/libarchive/archive_util.3
vendor/libarchive/dist/libarchive/archive_write.3
vendor/libarchive/dist/libarchive/archive_write_blocksize.3
vendor/libarchive/dist/libarchive/archive_write_data.3
vendor/libarchive/dist/libarchive/archive_write_disk.3
vendor/libarchive/dist/libarchive/archive_write_disk_posix.c
vendor/libarchive/dist/libarchive/archive_write_filter.3
vendor/libarchive/dist/libarchive/archive_write_finish_entry.3
vendor/libarchive/dist/libarchive/archive_write_format.3
vendor/libarchive/dist/libarchive/archive_write_free.3
vendor/libarchive/dist/libarchive/archive_write_header.3
vendor/libarchive/dist/libarchive/archive_write_new.3
vendor/libarchive/dist/libarchive/archive_write_open.3
vendor/libarchive/dist/libarchive/archive_write_set_format_iso9660.c
vendor/libarchive/dist/libarchive/archive_write_set_format_mtree.c
vendor/libarchive/dist/libarchive/archive_write_set_options.3
vendor/libarchive/dist/libarchive/archive_write_set_passphrase.3
vendor/libarchive/dist/libarchive/libarchive_changes.3
vendor/libarchive/dist/libarchive/libarchive_internals.3
vendor/libarchive/dist/libarchive/mtree.5
vendor/libarchive/dist/libarchive/tar.5
vendor/libarchive/dist/libarchive/test/test_archive_write_add_filter_by_name.c
vendor/libarchive/dist/libarchive/test/test_archive_write_set_format_filter_by_ext.c
vendor/libarchive/dist/libarchive/test/test_read_format_raw.c
vendor/libarchive/dist/libarchive/test/test_read_format_zip.c
vendor/libarchive/dist/libarchive/test/test_read_format_zip_traditional_encryption_data.c
vendor/libarchive/dist/libarchive/test/test_write_filter_zstd.c
vendor/libarchive/dist/tar/bsdtar.1
vendor/libarchive/dist/tar/test/test_option_n.c
vendor/libarchive/dist/tar/test/test_option_xattrs.c
vendor/libarchive/dist/test_utils/test_main.c
Modified: vendor/libarchive/dist/.cirrus.yml
==============================================================================
--- vendor/libarchive/dist/.cirrus.yml Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/.cirrus.yml Thu Sep 26 01:42:09 2019 (r352731)
@@ -16,8 +16,8 @@ FreeBSD_task:
prepare_script:
- ./build/ci/cirrus_ci/ci.sh prepare
configure_script:
- - ./build/ci/build.sh -a autogen
- - ./build/ci/build.sh -a configure
+ - env CFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./build/ci/build.sh -a autogen
+ - env CFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./build/ci/build.sh -a configure
build_script:
- ./build/ci/build.sh -a build
test_script:
Added: vendor/libarchive/dist/.github/workflows/ci.yml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ vendor/libarchive/dist/.github/workflows/ci.yml Thu Sep 26 01:42:09 2019 (r352731)
@@ -0,0 +1,37 @@
+name: Ubuntu
+
+on: [push, pull_request]
+
+jobs:
+ Build-and-test:
+
+ runs-on: ubuntu-latest
+
+ strategy:
+ matrix:
+ bs: [autotools, cmake]
+
+ steps:
+ - uses: actions/checkout at master
+ - name: Install dependencies
+ run: sudo apt-get install -y build-essential cmake libssl-dev libacl1-dev libbz2-dev liblzma-dev libzip-dev liblz4-dev libzstd-dev lzop
+ - name: Autogen
+ run: ./build/ci/build.sh -a autogen
+ env:
+ BS: ${{ matrix.bs }}
+ - name: Configure
+ run: ./build/ci/build.sh -a configure
+ env:
+ BS: ${{ matrix.bs }}
+ - name: Build
+ run: ./build/ci/build.sh -a build
+ env:
+ BS: ${{ matrix.bs }}
+ - name: Test
+ run: ./build/ci/build.sh -a test
+ env:
+ BS: ${{ matrix.bs }}
+ - name: Install
+ run: ./build/ci/build.sh -a install
+ env:
+ BS: ${{ matrix.bs }}
Modified: vendor/libarchive/dist/cat/bsdcat.1
==============================================================================
--- vendor/libarchive/dist/cat/bsdcat.1 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/cat/bsdcat.1 Thu Sep 26 01:42:09 2019 (r352731)
@@ -34,16 +34,15 @@
.Nm
.Op options
.Op files
-.Pp
.Sh DESCRIPTION
.Nm
expands files to standard output.
.Sh OPTIONS
.Nm
typically takes a filename as an argument or reads standard input when used in a
-pipe. In both cases decompressed data it written to standard output.
+pipe.
+In both cases decompressed data it written to standard output.
.Sh EXAMPLES
-.Pp
To decompress a file:
.Pp
.Dl bsdcat example.txt.gz > example.txt
@@ -55,8 +54,8 @@ To decompress standard input in a pipe:
Both examples achieve the same results - a decompressed file by redirecting
output.
.Sh SEE ALSO
-.Xr uncompress 1 ,
-.Xr zcat 1 ,
.Xr bzcat 1 ,
+.Xr uncompress 1 ,
.Xr xzcat 1 ,
-.Xr libarchive-formats 5 ,
+.Xr zcat 1 ,
+.Xr libarchive-formats 5
Modified: vendor/libarchive/dist/contrib/shar/shar.1
==============================================================================
--- vendor/libarchive/dist/contrib/shar/shar.1 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/contrib/shar/shar.1 Thu Sep 26 01:42:09 2019 (r352731)
@@ -61,7 +61,8 @@ or
The following options are available:
.Bl -tag -width indent
.It Fl b
-Use an alternative binary format. Content of files will be uuencoded.
+Use an alternative binary format.
+Content of files will be uuencoded.
This option should be used to archive binary files correctly.
In this mode also file permissions will be stored to the archive.
uudecode(1) is needed to extract archives created with this option.
@@ -72,8 +73,8 @@ Redirect output to
If
.Ar file
given on command line is a directory the entire subtree will be archived.
-Symbolic links given on command line are followed. Other symbolic links will
-be archived as such.
+Symbolic links given on command line are followed.
+Other symbolic links will be archived as such.
.El
.Sh EXAMPLES
To create a shell archive of the program
@@ -111,7 +112,9 @@ The
command makes no provisions for hard links.
.Pp
Files containing magic characters or files without a newline ('\\n') as the
-last character are not handled correctly with the default format. Use the -b
+last character are not handled correctly with the default format.
+Use the
+.Fl b
option for binary files.
.Pp
It is easy to insert trojan horses into
Modified: vendor/libarchive/dist/cpio/bsdcpio.1
==============================================================================
--- vendor/libarchive/dist/cpio/bsdcpio.1 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/cpio/bsdcpio.1 Thu Sep 26 01:42:09 2019 (r352731)
@@ -75,7 +75,6 @@ Pass-through.
Read a list of filenames from standard input and copy the files to the
specified directory.
.El
-.Pp
.Sh OPTIONS
Unless specifically stated otherwise, options are applicable in
all operating modes.
@@ -385,10 +384,10 @@ For best compatibility, scripts should limit themselve
standard syntax.
.Sh SEE ALSO
.Xr bzip2 1 ,
-.Xr tar 1 ,
.Xr gzip 1 ,
.Xr mt 1 ,
.Xr pax 1 ,
+.Xr tar 1 ,
.Xr libarchive 3 ,
.Xr cpio 5 ,
.Xr libarchive-formats 5 ,
Modified: vendor/libarchive/dist/libarchive/archive.h
==============================================================================
--- vendor/libarchive/dist/libarchive/archive.h Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive.h Thu Sep 26 01:42:09 2019 (r352731)
@@ -52,7 +52,7 @@
*/
#if defined(__BORLANDC__) && __BORLANDC__ >= 0x560
# include <stdint.h>
-#elif !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__INTERIX) && !defined(__BORLANDC__) && !defined(_SCO_DS) && !defined(__osf__)
+#elif !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__INTERIX) && !defined(__BORLANDC__) && !defined(_SCO_DS) && !defined(__osf__) && !defined(__CLANG_INTTYPES_H)
# include <inttypes.h>
#endif
Modified: vendor/libarchive/dist/libarchive/archive_entry.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_entry.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_entry.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -32,7 +32,7 @@
.Nm archive_entry_clear ,
.Nm archive_entry_clone ,
.Nm archive_entry_free ,
-.Nm archive_entry_new ,
+.Nm archive_entry_new
.Nd functions for managing archive entry descriptions
.Sh LIBRARY
Streaming Archive Library (libarchive, -larchive)
@@ -126,7 +126,6 @@ using the current locale.
Similarly, if you store a wide string and then store a
narrow string for the same data, the previously-set wide string will
be discarded in favor of the new data.
-.Pp
.\" .Sh EXAMPLE
.\" .Sh RETURN VALUES
.\" .Sh ERRORS
@@ -134,8 +133,8 @@ be discarded in favor of the new data.
.Xr archive_entry_acl 3 ,
.Xr archive_entry_paths 3 ,
.Xr archive_entry_perms 3 ,
-.Xr archive_entry_time 3
-.Xr libarchive 3 ,
+.Xr archive_entry_time 3 ,
+.Xr libarchive 3
.Sh HISTORY
The
.Nm libarchive
Modified: vendor/libarchive/dist/libarchive/archive_entry_acl.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_entry_acl.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_entry_acl.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -118,15 +118,16 @@ Streaming Archive Library (libarchive, -larchive)
.Sh DESCRIPTION
The
.Dq Access Control Lists (ACLs)
-extend the standard Unix perssion model.
+extend the standard Unix permission model.
The ACL interface of
.Nm libarchive
-supports both POSIX.1e and NFSv4 style ACLs. Use of ACLs is restricted by
+supports both POSIX.1e and NFSv4 style ACLs.
+Use of ACLs is restricted by
various levels of ACL support in operating systems, file systems and archive
formats.
.Ss POSIX.1e Access Control Lists
A POSIX.1e ACL consists of a number of independent entries.
-Each entry specifies the permission set as bitmask of basic permissions.
+Each entry specifies the permission set as a bitmask of basic permissions.
Valid permissions in the
.Fa permset
are:
@@ -147,13 +148,13 @@ The user specified by the name field.
.It Dv ARCHIVE_ENTRY_ACL_USER_OBJ
The owner of the file.
.It Dv ARCHIVE_ENTRY_ACL_GROUP
-The group specied by the name field.
+The group specified by the name field.
.It Dv ARCHIVE_ENTRY_ACL_GROUP_OBJ
-The group who owns the file.
+The group which owns the file.
.It Dv ARCHIVE_ENTRY_ACL_MASK
The maximum permissions to be obtained via group permissions.
.It Dv ARCHIVE_ENTRY_ACL_OTHER
-Any principal who is not file owner or a member of the owning group.
+Any principal who is not the file owner or a member of the owning group.
.El
.Pp
The principals
@@ -164,12 +165,12 @@ and
are equivalent to user, group and other in the classic Unix permission
model and specify non-extended ACL entries.
.Pp
-All files with have an access ACL
+All files have an access ACL
.Pq Dv ARCHIVE_ENTRY_ACL_TYPE_ACCESS .
This specifies the permissions required for access to the file itself.
Directories have an additional ACL
.Pq Dv ARCHIVE_ENTRY_ACL_TYPE_DEFAULT ,
-which controls the initial access ACL for newly created directory entries.
+which controls the initial access ACL for newly-created directory entries.
.Ss NFSv4 Access Control Lists
A NFSv4 ACL consists of multiple individual entries called Access Control
Entries (ACEs).
@@ -197,11 +198,11 @@ The user specified by the name field.
.It Dv ARCHIVE_ENTRY_ACL_USER_OBJ
The owner of the file.
.It Dv ARCHIVE_ENTRY_ACL_GROUP
-The group specied by the name field.
+The group specified by the name field.
.It Dv ARCHIVE_ENTRY_ACL_GROUP_OBJ
-The group who owns the file.
+The group which owns the file.
.It Dv ARCHIVE_ENTRY_ACL_EVERYONE
-Any principal who is not file owner or a member of the owning group.
+Any principal who is not the file owner or a member of the owning group.
.El
.Pp
Entries with the
@@ -216,9 +217,10 @@ integer.
.Pp
NFSv4 ACE permissions and flags are stored in the same
.Fa permset
-bitfield. Some permissions share the same constant and permission character but
-have different effect on directories than on files. The following ACE
-permissions are supported:
+bitfield.
+Some permissions share the same constant and permission character
+but have different effect on directories than on files.
+The following ACE permissions are supported:
.Bl -tag -offset indent -compact -width ARCHIV
.It Dv ARCHIVE_ENTRY_ACL_READ_DATA ( Sy r )
Read data (file).
@@ -265,7 +267,8 @@ Inherit parent directory ACE to subdirectories.
.It Dv ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY ( Sy i )
Only inherit, do not apply the permission on the directory itself.
.It Dv ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT ( Sy n )
-Do not propagate inherit flags. Only first-level entries inherit ACLs.
+Do not propagate inherit flags.
+Only first-level entries inherit ACLs.
.It Dv ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS ( Sy S )
Trigger alarm or audit on successful access.
.It Dv ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS ( Sy F )
@@ -279,8 +282,8 @@ and
.Fn archive_entry_acl_add_entry_w
add a single ACL entry.
For the access ACL and non-extended principals, the classic Unix permissions
-are updated. An archive entry cannot contain both POSIX.1e and NFSv4 ACL
-entries.
+are updated.
+An archive entry cannot contain both POSIX.1e and NFSv4 ACL entries.
.Pp
.Fn archive_entry_acl_clear
removes all ACL entries and resets the enumeration pointer.
@@ -300,7 +303,8 @@ for POSIX.1e ACLs and
.It Dv ARCHIVE_ENTRY_ACL_TYPE_AUDIT
.It Dv ARCHIVE_ENTRY_ACL_TYPE_ALARM
.El
-for NFSv4 ACLs. For POSIX.1e ACLs if
+for NFSv4 ACLs.
+For POSIX.1e ACLs if
.Dv ARCHIVE_ENTRY_ACL_TYPE_ACCESS
is included and at least one extended ACL entry is found,
the three non-extended ACLs are added.
@@ -312,7 +316,8 @@ add new
.Pq or merge with existing
ACL entries from
.Pq wide
-text. The argument
+text.
+The argument
.Fa type
may take one of the following values:
.Bl -tag -offset indent -compact -width "ARCHIVE_ENTRY_ACL_TYPE_DEFAULT"
@@ -322,11 +327,13 @@ may take one of the following values:
.El
Supports all formats that can be created with
.Fn archive_entry_acl_to_text
-or respective
+or respectively
.Fn archive_entry_acl_to_text_w .
-Existing ACL entries are preserved. To get a clean new ACL from text
+Existing ACL entries are preserved.
+To get a clean new ACL from text
.Fn archive_entry_acl_clear
-must be called first. Entries prefixed with
+must be called first.
+Entries prefixed with
.Dq default:
are treated as
.Dv ARCHIVE_ENTRY_ACL_TYPE_DEFAULT
@@ -354,7 +361,7 @@ prepare reading the list of ACL entries with
.Fn archive_entry_acl_next
or
.Fn archive_entry_acl_next_w .
-The function returns either 0, if no non-extended ACLs are found.
+The function returns 0 if no non-extended ACLs are found.
In this case, the access permissions should be obtained by
.Xr archive_entry_mode 3
or set using
@@ -367,7 +374,8 @@ and
.Fn archive_entry_acl_to_text_w
convert the ACL entries for the given type into a
.Pq wide
-string of ACL entries separated by newline. If the pointer
+string of ACL entries separated by newline.
+If the pointer
.Fa len_p
is not NULL, then the function shall return the length of the string
.Pq not including the NULL terminator
@@ -415,7 +423,8 @@ are prefixed with
.Dq default: .
.Pp
.Fn archive_entry_acl_types
-get ACL entry types contained in an archive entry's ACL. As POSIX.1e and NFSv4
+get ACL entry types contained in an archive entry's ACL.
+As POSIX.1e and NFSv4
ACL entries cannot be mixed, this function is a very efficient way to detect if
an ACL already contains POSIX.1e or NFSv4 ACL entries.
.Sh RETURN VALUES
Modified: vendor/libarchive/dist/libarchive/archive_entry_misc.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_entry_misc.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_entry_misc.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -28,7 +28,7 @@
.Sh NAME
.Nm archive_entry_symlink_type ,
.Nm archive_entry_set_symlink_type
-.Nd miscellaneous functions for manipulating properties of archive_entry.
+.Nd miscellaneous functions for manipulating properties of archive_entry
.Sh LIBRARY
Streaming Archive Library (libarchive, -larchive)
.Sh SYNOPSIS
@@ -42,7 +42,8 @@ The function
.Fn archive_entry_symlink_type
returns and the function
.Fn archive_entry_set_symlink_type
-sets the type of the symbolic link stored in an archive entry. These functions
+sets the type of the symbolic link stored in an archive entry.
+These functions
have special meaning on operating systems that support multiple symbolic link
types (e.g. Microsoft Windows).
.Pp
Modified: vendor/libarchive/dist/libarchive/archive_entry_paths.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_entry_paths.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_entry_paths.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -133,7 +133,7 @@ The accessor functions are named
.Fn XXX_w .
.It UTF-8
Unicode strings encoded as UTF-8.
-This are convience functions to update both the multibyte and wide
+These are convenience functions to update both the multibyte and wide
character strings at the same time.
.El
.Pp
@@ -141,13 +141,13 @@ The sourcepath is a pure filesystem concept and never
archive directly.
.Pp
For that reason, it is only available as multibyte string.
-The link path is a convience function for conditionally setting
+The link path is a convenience function for conditionally setting
hardlink or symlink destination.
It doesn't have a corresponding get accessor function.
.Pp
.Fn archive_entry_set_XXX
-is an alias for
+is an alias for
.Fn archive_entry_copy_XXX .
.Sh SEE ALSO
-.Xr archive_entry 3
-.Xr libarchive 3 ,
+.Xr archive_entry 3 ,
+.Xr libarchive 3
Modified: vendor/libarchive/dist/libarchive/archive_entry_perms.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_entry_perms.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_entry_perms.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -126,7 +126,7 @@ The corresponding functions
and
.Fn archive_entry_set_perm
store the given user id, group id and permission in the entry.
-The permission is also set as side effect of calling
+The permission is also set as a side effect of calling
.Fn archive_entry_set_mode .
.Pp
.Fn archive_entry_strmode
@@ -143,12 +143,12 @@ The accessor functions are named
.Fn XXX_w .
.It UTF-8
Unicode strings encoded as UTF-8.
-This are convience functions to update both the multibyte and wide
+These are convenience functions to update both the multibyte and wide
character strings at the same time.
.El
.Pp
.Fn archive_entry_set_XXX
-is an alias for
+is an alias for
.Fn archive_entry_copy_XXX .
.Ss File Flags
File flags are transparently converted between a bitmap
@@ -182,7 +182,7 @@ The
.Fn archive_entry_copy_fflags_text
and
.Fn archive_entry_copy_fflags_text_w
-functions parse the provided text and sets the internal bitmap values.
+functions parse the provided text and set the internal bitmap values.
This is a platform-specific operation; names that are not meaningful
on the current platform will be ignored.
The function returns a pointer to the start of the first name that was not
@@ -197,8 +197,8 @@ which stops parsing at the first unrecognized name.)
.Xr archive_entry 3 ,
.Xr archive_entry_acl 3 ,
.Xr archive_read_disk 3 ,
-.Xr archive_write_disk 3
-.Xr libarchive 3 ,
+.Xr archive_write_disk 3 ,
+.Xr libarchive 3
.Sh BUGS
The platform types
.Vt uid_t
Modified: vendor/libarchive/dist/libarchive/archive_entry_stat.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_entry_stat.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_entry_stat.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -54,7 +54,7 @@
.Nm archive_entry_rdevmajor ,
.Nm archive_entry_set_rdevmajor ,
.Nm archive_entry_rdevminor ,
-.Nm archive_entry_set_rdevminor ,
+.Nm archive_entry_set_rdevminor
.Nd accessor functions for manipulating archive entry descriptions
.Sh LIBRARY
Streaming Archive Library (libarchive, -larchive)
@@ -267,8 +267,8 @@ platforms.
Some archive formats use the combined form, while other formats use
the split form.
.Sh SEE ALSO
+.Xr stat 2 ,
.Xr archive_entry_acl 3 ,
.Xr archive_entry_perms 3 ,
.Xr archive_entry_time 3 ,
-.Xr libarchive 3 ,
-.Xr stat 2
+.Xr libarchive 3
Modified: vendor/libarchive/dist/libarchive/archive_entry_time.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_entry_time.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_entry_time.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -48,7 +48,7 @@
.Nm archive_entry_mtime_nsec ,
.Nm archive_entry_mtime_is_set ,
.Nm archive_entry_set_mtime ,
-.Nm archive_entry_unset_mtime ,
+.Nm archive_entry_unset_mtime
.Nd functions for manipulating times in archive entry descriptions
.Sh LIBRARY
Streaming Archive Library (libarchive, -larchive)
@@ -113,8 +113,8 @@ The current state can be queried using
.Fn XXX_is_set .
Unset time fields have a second and nanosecond field of 0.
.Sh SEE ALSO
-.Xr archive_entry 3
-.Xr libarchive 3 ,
+.Xr archive_entry 3 ,
+.Xr libarchive 3
.Sh HISTORY
The
.Nm libarchive
Modified: vendor/libarchive/dist/libarchive/archive_read.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_read.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -155,7 +155,7 @@ to close the archive, then call
.Fn archive_read_free
to release all resources, including all memory allocated by the library.
.\"
-.Sh EXAMPLE
+.Sh EXAMPLES
The following illustrates basic usage of the library.
In this example,
the callback functions are simply wrappers around the standard
@@ -217,16 +217,16 @@ myclose(struct archive *a, void *client_data)
.\" .Sh ERRORS
.Sh SEE ALSO
.Xr tar 1 ,
-.Xr libarchive 3 ,
-.Xr archive_read_new 3 ,
.Xr archive_read_data 3 ,
.Xr archive_read_extract 3 ,
.Xr archive_read_filter 3 ,
.Xr archive_read_format 3 ,
.Xr archive_read_header 3 ,
+.Xr archive_read_new 3 ,
.Xr archive_read_open 3 ,
.Xr archive_read_set_options 3 ,
.Xr archive_util 3 ,
+.Xr libarchive 3 ,
.Xr tar 5
.Sh HISTORY
The
Modified: vendor/libarchive/dist/libarchive/archive_read_add_passphrase.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_add_passphrase.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_read_add_passphrase.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -59,16 +59,16 @@ or empty, this function will do nothing and
will be returned.
Otherwise,
.Cm ARCHIVE_OK
-will be returned.
+will be returned.
.It Fn archive_read_set_passphrase_callback
-Register callback function that will be invoked to get a passphrase
-for decrption after trying all passphrases registered by the
+Register a callback function that will be invoked to get a passphrase
+for decryption after trying all the passphrases registered by the
.Fn archive_read_add_passphrase
function failed.
.El
.\" .Sh ERRORS
.Sh SEE ALSO
.Xr tar 1 ,
-.Xr libarchive 3 ,
.Xr archive_read 3 ,
-.Xr archive_read_set_options 3
+.Xr archive_read_set_options 3 ,
+.Xr libarchive 3
Modified: vendor/libarchive/dist/libarchive/archive_read_data.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_data.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_read_data.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -28,7 +28,7 @@
.Dt ARCHIVE_READ_DATA 3
.Os
.Sh NAME
-.Nm archive_read_data
+.Nm archive_read_data ,
.Nm archive_read_data_block ,
.Nm archive_read_data_skip ,
.Nm archive_read_data_into_fd
@@ -118,7 +118,6 @@ functions.
.\"
.Sh SEE ALSO
.Xr tar 1 ,
-.Xr libarchive 3 ,
.Xr archive_read 3 ,
.Xr archive_read_extract 3 ,
.Xr archive_read_filter 3 ,
@@ -127,4 +126,5 @@ functions.
.Xr archive_read_open 3 ,
.Xr archive_read_set_options 3 ,
.Xr archive_util 3 ,
+.Xr libarchive 3 ,
.Xr tar 5
Modified: vendor/libarchive/dist/libarchive/archive_read_disk.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_disk.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_read_disk.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -99,9 +99,10 @@ following values:
.Bl -tag -compact -width "indent"
.It Cm ARCHIVE_READDISK_HONOR_NODUMP
Skip files and directories with the nodump file attribute (file flag) set.
-By default, the nodump file atrribute is ignored.
+By default, the nodump file attribute is ignored.
.It Cm ARCHIVE_READDISK_MAC_COPYFILE
-Mac OS X specific. Read metadata (ACLs and extended attributes) with
+Mac OS X specific.
+Read metadata (ACLs and extended attributes) with
.Xr copyfile 3 .
By default, metadata is read using
.Xr copyfile 3 .
@@ -120,7 +121,7 @@ or
for more information on file attributes.
.It Cm ARCHIVE_READDISK_NO_TRAVERSE_MOUNTS
Do not traverse mount points.
-By defaut, moint points are traversed.
+By default, mount points are traversed.
.It Cm ARCHIVE_READDISK_NO_XATTR
Do not read extended file attributes (xattrs).
By default, extended file attributes are read from disk.
@@ -216,7 +217,7 @@ of some other operation.
(For example, directory traversal libraries often provide this information.)
.Pp
Where necessary, user and group ids are converted to user and group names
-using the currently registered lookup functions above.
+using the currently-registered lookup functions above.
This affects the file ownership fields and ACL values in the
.Tn struct archive_entry
object.
@@ -226,7 +227,7 @@ More information about the
object and the overall design of the library can be found in the
.Xr libarchive 3
overview.
-.Sh EXAMPLE
+.Sh EXAMPLES
The following illustrates basic usage of the library by
showing how to use it to copy an item on disk into an archive.
.Bd -literal -offset indent
@@ -291,11 +292,11 @@ and
functions.
.\"
.Sh SEE ALSO
+.Xr tar 1 ,
.Xr archive_read 3 ,
.Xr archive_util 3 ,
.Xr archive_write 3 ,
.Xr archive_write_disk 3 ,
-.Xr tar 1 ,
.Xr libarchive 3
.Sh HISTORY
The
Modified: vendor/libarchive/dist/libarchive/archive_read_extract.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_extract.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_read_extract.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -126,7 +126,6 @@ and
functions.
.Sh SEE ALSO
.Xr tar 1 ,
-.Xr libarchive 3 ,
.Xr archive_read 3 ,
.Xr archive_read_data 3 ,
.Xr archive_read_filter 3 ,
@@ -134,4 +133,5 @@ functions.
.Xr archive_read_open 3 ,
.Xr archive_read_set_options 3 ,
.Xr archive_util 3 ,
+.Xr libarchive 3 ,
.Xr tar 5
Modified: vendor/libarchive/dist/libarchive/archive_read_filter.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_filter.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_read_filter.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -147,8 +147,8 @@ and
functions.
.\"
.Sh SEE ALSO
-.Xr libarchive 3 ,
.Xr archive_read 3 ,
.Xr archive_read_data 3 ,
.Xr archive_read_format 3 ,
-.Xr archive_read_format 3
+.Xr archive_read_format 3 ,
+.Xr libarchive 3
Modified: vendor/libarchive/dist/libarchive/archive_read_format.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_format.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_read_format.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -102,7 +102,7 @@ For example,
.Fn archive_read_support_format_tar
enables support for a variety of standard tar formats, old-style tar,
ustar, pax interchange format, and many common variants.
-.It Fn archive_read_support_format_all
+.It Fn archive_read_support_format_all
Enables support for all available formats except the
.Dq raw
format (see below).
@@ -125,7 +125,7 @@ it is not possible to accurately determine a format fo
an empty file based purely on contents.
So empty files are treated by libarchive as a distinct
format.
-.It Fn archive_read_support_format_raw
+.It Fn archive_read_support_format_raw
The
.Dq raw
format handler allows libarchive to be used to read arbitrary data.
@@ -153,11 +153,11 @@ functions.
.\"
.Sh SEE ALSO
.Xr tar 1 ,
-.Xr libarchive 3 ,
.Xr archive_read_data 3 ,
.Xr archive_read_filter 3 ,
.Xr archive_read_set_options 3 ,
.Xr archive_util 3 ,
+.Xr libarchive 3 ,
.Xr tar 5
.Sh BUGS
Many traditional archiver programs treat
Modified: vendor/libarchive/dist/libarchive/archive_read_free.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_free.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_read_free.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -83,11 +83,11 @@ and
functions.
.\"
.Sh SEE ALSO
-.Xr libarchive 3 ,
-.Xr archive_read_new 3 ,
.Xr archive_read_data 3 ,
.Xr archive_read_filter 3 ,
.Xr archive_read_format 3 ,
+.Xr archive_read_new 3 ,
.Xr archive_read_open 3 ,
.Xr archive_read_set_options 3 ,
-.Xr archive_util 3
+.Xr archive_util 3 ,
+.Xr libarchive 3
Modified: vendor/libarchive/dist/libarchive/archive_read_header.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_header.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_read_header.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -79,7 +79,6 @@ functions.
.\"
.Sh SEE ALSO
.Xr tar 1 ,
-.Xr libarchive 3 ,
.Xr archive_read 3 ,
.Xr archive_read_data 3 ,
.Xr archive_read_extract 3 ,
@@ -88,4 +87,5 @@ functions.
.Xr archive_read_open 3 ,
.Xr archive_read_set_options 3 ,
.Xr archive_util 3 ,
+.Xr libarchive 3 ,
.Xr tar 5
Modified: vendor/libarchive/dist/libarchive/archive_read_new.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_new.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_read_new.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -50,10 +50,10 @@ object can be found in the overview manual page for
.\" .Sh ERRORS
.Sh SEE ALSO
.Xr tar 1 ,
-.Xr libarchive 3 ,
.Xr archive_read_data 3 ,
.Xr archive_read_filter 3 ,
.Xr archive_read_format 3 ,
.Xr archive_read_set_options 3 ,
.Xr archive_util 3 ,
+.Xr libarchive 3 ,
.Xr tar 5
Modified: vendor/libarchive/dist/libarchive/archive_read_open.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_open.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_read_open.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -205,7 +205,7 @@ On failure, the callback should invoke
.Fn archive_set_error
to register an error code and message and
return
-.Cm ARCHIVE_FATAL.
+.Cm ARCHIVE_FATAL .
.\" .Sh EXAMPLE
.\"
.Sh RETURN VALUES
@@ -223,11 +223,11 @@ functions.
.\"
.Sh SEE ALSO
.Xr tar 1 ,
-.Xr libarchive 3 ,
.Xr archive_read 3 ,
.Xr archive_read_data 3 ,
.Xr archive_read_filter 3 ,
.Xr archive_read_format 3 ,
.Xr archive_read_set_options 3 ,
.Xr archive_util 3 ,
+.Xr libarchive 3 ,
.Xr tar 5
Modified: vendor/libarchive/dist/libarchive/archive_read_set_options.3
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_set_options.3 Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_read_set_options.3 Thu Sep 26 01:42:09 2019 (r352731)
@@ -212,7 +212,8 @@ Use
to disable.
.It Cm read_concatenated_archives
Ignore zeroed blocks in the archive, which occurs when multiple tar archives
-have been concatenated together. Without this option, only the contents of
+have been concatenated together.
+Without this option, only the contents of
the first concatenated archive would be read.
.El
.El
@@ -226,6 +227,6 @@ functions.
.\"
.Sh SEE ALSO
.Xr tar 1 ,
-.Xr libarchive 3 ,
+.Xr archive_read 3 ,
.Xr archive_write_set_options 3 ,
-.Xr archive_read 3
+.Xr libarchive 3
Modified: vendor/libarchive/dist/libarchive/archive_read_support_filter_gzip.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_support_filter_gzip.c Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_read_support_filter_gzip.c Thu Sep 26 01:42:09 2019 (r352731)
@@ -131,12 +131,20 @@ archive_read_support_filter_gzip(struct archive *_a)
*/
static ssize_t
peek_at_header(struct archive_read_filter *filter, int *pbits,
- struct private_data *state)
+#ifdef HAVE_ZLIB_H
+ struct private_data *state
+#else
+ void *state
+#endif
+ )
{
const unsigned char *p;
ssize_t avail, len;
int bits = 0;
int header_flags;
+#ifndef HAVE_ZLIB_H
+ (void)state; /* UNUSED */
+#endif
/* Start by looking at the first ten bytes of the header, which
* is all fixed layout. */
@@ -153,8 +161,10 @@ peek_at_header(struct archive_read_filter *filter, int
bits += 3;
header_flags = p[3];
/* Bytes 4-7 are mod time in little endian. */
+#ifdef HAVE_ZLIB_H
if (state)
state->mtime = archive_le32dec(p + 4);
+#endif
/* Byte 8 is deflate flags. */
/* XXXX TODO: return deflate flags back to consume_header for use
in initializing the decompressor. */
@@ -171,7 +181,9 @@ peek_at_header(struct archive_read_filter *filter, int
/* Null-terminated optional filename. */
if (header_flags & 8) {
+#ifdef HAVE_ZLIB_H
ssize_t file_start = len;
+#endif
do {
++len;
if (avail < len)
@@ -181,11 +193,13 @@ peek_at_header(struct archive_read_filter *filter, int
return (0);
} while (p[len - 1] != 0);
+#ifdef HAVE_ZLIB_H
if (state) {
/* Reset the name in case of repeat header reads. */
free(state->name);
state->name = strdup((const char *)&p[file_start]);
}
+#endif
}
/* Null-terminated optional comment. */
@@ -236,24 +250,6 @@ gzip_bidder_bid(struct archive_read_filter_bidder *sel
return (0);
}
-static int
-gzip_read_header(struct archive_read_filter *self, struct archive_entry *entry)
-{
- struct private_data *state;
-
- state = (struct private_data *)self->data;
-
- /* A mtime of 0 is considered invalid/missing. */
- if (state->mtime != 0)
- archive_entry_set_mtime(entry, state->mtime, 0);
-
- /* If the name is available, extract it. */
- if (state->name)
- archive_entry_set_pathname(entry, state->name);
-
- return (ARCHIVE_OK);
-}
-
#ifndef HAVE_ZLIB_H
/*
@@ -277,6 +273,24 @@ gzip_bidder_init(struct archive_read_filter *self)
#else
+static int
+gzip_read_header(struct archive_read_filter *self, struct archive_entry *entry)
+{
+ struct private_data *state;
+
+ state = (struct private_data *)self->data;
+
+ /* A mtime of 0 is considered invalid/missing. */
+ if (state->mtime != 0)
+ archive_entry_set_mtime(entry, state->mtime, 0);
+
+ /* If the name is available, extract it. */
+ if (state->name)
+ archive_entry_set_pathname(entry, state->name);
+
+ return (ARCHIVE_OK);
+}
+
/*
* Initialize the filter object.
*/
@@ -306,7 +320,9 @@ gzip_bidder_init(struct archive_read_filter *self)
self->read = gzip_filter_read;
self->skip = NULL; /* not supported */
self->close = gzip_filter_close;
+#ifdef HAVE_ZLIB_H
self->read_header = gzip_read_header;
+#endif
state->in_stream = 0; /* We're not actually within a stream yet. */
Modified: vendor/libarchive/dist/libarchive/archive_read_support_filter_lz4.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_support_filter_lz4.c Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_read_support_filter_lz4.c Thu Sep 26 01:42:09 2019 (r352731)
@@ -460,7 +460,7 @@ lz4_filter_read_descriptor(struct archive_read_filter
__archive_read_filter_consume(self->upstream, descriptor_bytes);
- /* Make sure we have an enough buffer for uncompressed data. */
+ /* Make sure we have a large enough buffer for uncompressed data. */
if (lz4_allocate_out_block(self) != ARCHIVE_OK)
return (ARCHIVE_FATAL);
if (state->flags.stream_checksum)
@@ -520,7 +520,7 @@ lz4_filter_read_data_block(struct archive_read_filter
if (read_buf == NULL)
goto truncated_error;
- /* Optional process, checking a block sum. */
+ /* Optional processing, checking a block sum. */
if (checksum_size) {
unsigned int chsum = __archive_xxhash.XXH32(
read_buf + 4, (int)compressed_size, 0);
@@ -640,7 +640,7 @@ lz4_filter_read_default_stream(struct archive_read_fil
if (ret == 0 && *p == NULL)
state->stage = SELECT_STREAM;
- /* Optional process, checking a stream sum. */
+ /* Optional processing, checking a stream sum. */
if (state->flags.stream_checksum) {
if (state->stage == SELECT_STREAM) {
unsigned int checksum;
@@ -660,7 +660,7 @@ lz4_filter_read_default_stream(struct archive_read_fil
if (checksum != checksum_stream) {
archive_set_error(&self->archive->archive,
ARCHIVE_ERRNO_MISC,
- "lz4 stream cheksum error");
+ "lz4 stream checksum error");
return (ARCHIVE_FATAL);
}
} else if (ret > 0)
@@ -674,7 +674,7 @@ static ssize_t
lz4_filter_read_legacy_stream(struct archive_read_filter *self, const void **p)
{
struct private_data *state = (struct private_data *)self->data;
- int compressed;
+ uint32_t compressed;
const char *read_buf;
ssize_t ret;
Modified: vendor/libarchive/dist/libarchive/archive_read_support_format_zip.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_support_format_zip.c Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_read_support_format_zip.c Thu Sep 26 01:42:09 2019 (r352731)
@@ -487,7 +487,7 @@ process_extra(struct archive_read *a, struct archive_e
/* Some ZIP files may have trailing 0 bytes. Let's check they
* are all 0 and ignore them instead of returning an error.
*
- * This is not techincally correct, but some ZIP files look
+ * This is not technically correct, but some ZIP files look
* like this and other tools support those files - so let's
* also support them.
*/
@@ -1053,7 +1053,7 @@ zip_read_local_file_header(struct archive_read *a, str
/* Make sure that entries with a trailing '/' are marked as directories
* even if the External File Attributes contains bogus values. If this
- * is not a directory and there is no type, assume regularfile. */
+ * is not a directory and there is no type, assume a regular file. */
if ((zip_entry->mode & AE_IFMT) != AE_IFDIR) {
int has_slash;
@@ -1104,7 +1104,7 @@ zip_read_local_file_header(struct archive_read *a, str
}
if (zip_entry->flags & LA_FROM_CENTRAL_DIRECTORY) {
- /* If this came from the central dir, it's size info
+ /* If this came from the central dir, its size info
* is definitive, so ignore the length-at-end flag. */
zip_entry->zip_flags &= ~ZIP_LENGTH_AT_END;
/* If local header is missing a value, use the one from
Modified: vendor/libarchive/dist/libarchive/archive_string.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_string.c Thu Sep 26 00:58:47 2019 (r352730)
+++ vendor/libarchive/dist/libarchive/archive_string.c Thu Sep 26 01:42:09 2019 (r352731)
@@ -458,7 +458,7 @@ archive_wstring_append_from_mbs_in_codepage(struct arc
if (from_cp == CP_C_LOCALE) {
/*
- * "C" locale special process.
+ * "C" locale special processing.
*/
wchar_t *ws;
const unsigned char *mp;
@@ -680,7 +680,7 @@ archive_string_append_from_wcs_in_codepage(struct arch
if (to_cp == CP_C_LOCALE) {
/*
- * "C" locale special process.
+ * "C" locale special processing.
*/
const wchar_t *wp = ws;
char *p;
@@ -889,7 +889,7 @@ add_converter(struct archive_string_conv *sc, int (*co
struct archive_string_conv *))
{
if (sc == NULL || sc->nconverter >= 2)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list