svn commit: r352764 - in projects/clang900-import: . cddl/contrib/opensolaris/lib/libzfs/common contrib/ipfilter/tools contrib/libarchive/cat contrib/libarchive/cpio contrib/libarchive/libarchive c...

Dimitry Andric dim at FreeBSD.org
Thu Sep 26 18:26:01 UTC 2019 

Author: dim
Date: Thu Sep 26 18:25:54 2019
New Revision: 352764
URL: https://svnweb.freebsd.org/changeset/base/352764

Log:
  Merge ^/head r352587 through r352763.

Added:
  projects/clang900-import/lib/libc/sys/shm_open.c
     - copied unchanged from r352763, head/lib/libc/sys/shm_open.c
  projects/clang900-import/sys/kern/subr_filter.c
     - copied unchanged from r352763, head/sys/kern/subr_filter.c
  projects/clang900-import/sys/modules/tcp/bbr/
     - copied from r352763, head/sys/modules/tcp/bbr/
  projects/clang900-import/sys/netinet/tcp_stacks/bbr.c
     - copied unchanged from r352763, head/sys/netinet/tcp_stacks/bbr.c
  projects/clang900-import/sys/netinet/tcp_stacks/tcp_bbr.h
     - copied unchanged from r352763, head/sys/netinet/tcp_stacks/tcp_bbr.h
  projects/clang900-import/sys/sys/tim_filter.h
     - copied unchanged from r352763, head/sys/sys/tim_filter.h
  projects/clang900-import/tests/sys/kern/memfd_test.c
     - copied unchanged from r352763, head/tests/sys/kern/memfd_test.c
Deleted:
  projects/clang900-import/lib/libc/i386/string/memchr.S
Modified:
  projects/clang900-import/Makefile.inc1
  projects/clang900-import/ObsoleteFiles.inc
  projects/clang900-import/RELNOTES
  projects/clang900-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  projects/clang900-import/contrib/ipfilter/tools/ippool_y.y
  projects/clang900-import/contrib/libarchive/cat/bsdcat.1
  projects/clang900-import/contrib/libarchive/cpio/bsdcpio.1
  projects/clang900-import/contrib/libarchive/libarchive/archive.h
  projects/clang900-import/contrib/libarchive/libarchive/archive_entry.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_entry_acl.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_entry_misc.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_entry_paths.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_entry_perms.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_entry_stat.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_entry_time.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_read.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_read_add_passphrase.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_read_data.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_read_disk.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_read_extract.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_read_filter.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_read_format.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_read_free.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_read_header.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_read_new.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_read_open.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_read_set_options.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_read_support_filter_gzip.c
  projects/clang900-import/contrib/libarchive/libarchive/archive_read_support_filter_lz4.c
  projects/clang900-import/contrib/libarchive/libarchive/archive_read_support_format_zip.c
  projects/clang900-import/contrib/libarchive/libarchive/archive_string.c
  projects/clang900-import/contrib/libarchive/libarchive/archive_util.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_write.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_write_blocksize.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_write_data.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_write_disk.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_write_disk_posix.c
  projects/clang900-import/contrib/libarchive/libarchive/archive_write_filter.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_write_finish_entry.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_write_format.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_write_free.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_write_header.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_write_new.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_write_open.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c
  projects/clang900-import/contrib/libarchive/libarchive/archive_write_set_format_mtree.c
  projects/clang900-import/contrib/libarchive/libarchive/archive_write_set_options.3
  projects/clang900-import/contrib/libarchive/libarchive/archive_write_set_passphrase.3
  projects/clang900-import/contrib/libarchive/libarchive/libarchive_changes.3
  projects/clang900-import/contrib/libarchive/libarchive/libarchive_internals.3
  projects/clang900-import/contrib/libarchive/libarchive/tar.5
  projects/clang900-import/contrib/libarchive/libarchive/test/test_archive_write_add_filter_by_name.c
  projects/clang900-import/contrib/libarchive/libarchive/test/test_archive_write_set_format_filter_by_ext.c
  projects/clang900-import/contrib/libarchive/libarchive/test/test_read_format_raw.c
  projects/clang900-import/contrib/libarchive/libarchive/test/test_read_format_zip.c
  projects/clang900-import/contrib/libarchive/libarchive/test/test_read_format_zip_traditional_encryption_data.c
  projects/clang900-import/contrib/libarchive/libarchive/test/test_write_filter_zstd.c
  projects/clang900-import/contrib/libarchive/tar/bsdtar.1
  projects/clang900-import/contrib/libarchive/tar/test/test_option_n.c
  projects/clang900-import/contrib/libarchive/tar/test/test_option_xattrs.c
  projects/clang900-import/contrib/libarchive/test_utils/test_main.c
  projects/clang900-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
  projects/clang900-import/lib/libc/gen/posix_spawn.c
  projects/clang900-import/lib/libc/i386/string/Makefile.inc
  projects/clang900-import/lib/libc/include/libc_private.h
  projects/clang900-import/lib/libc/regex/engine.c
  projects/clang900-import/lib/libc/regex/regcomp.c
  projects/clang900-import/lib/libc/sys/Makefile.inc
  projects/clang900-import/lib/libc/sys/Symbol.map
  projects/clang900-import/lib/libc/sys/fcntl.2
  projects/clang900-import/lib/libc/sys/mount.2
  projects/clang900-import/lib/libc/sys/rfork.2
  projects/clang900-import/lib/libc/sys/shm_open.2
  projects/clang900-import/lib/libkvm/kvm_proc.c
  projects/clang900-import/lib/libregex/tests/libregex_test.sh
  projects/clang900-import/lib/libthr/thread/thr_mutex.c
  projects/clang900-import/lib/msun/src/e_exp.c
  projects/clang900-import/lib/msun/src/e_expf.c
  projects/clang900-import/lib/msun/src/s_expm1.c
  projects/clang900-import/lib/msun/src/s_expm1f.c
  projects/clang900-import/sbin/mount/mntopts.h
  projects/clang900-import/sbin/mount/mount.8
  projects/clang900-import/sbin/mount/mount.c
  projects/clang900-import/sbin/nvmecontrol/perftest.c
  projects/clang900-import/sbin/ping6/ping6.c
  projects/clang900-import/share/mk/suite.test.mk
  projects/clang900-import/stand/efi/libefi/efi_console.c
  projects/clang900-import/stand/forth/menu.4th
  projects/clang900-import/stand/forth/menu.rc
  projects/clang900-import/stand/i386/libi386/vidconsole.c
  projects/clang900-import/stand/lua/color.lua
  projects/clang900-import/stand/lua/config.lua
  projects/clang900-import/stand/lua/logo-beastie.lua
  projects/clang900-import/stand/lua/logo-orb.lua
  projects/clang900-import/stand/lua/menu.lua
  projects/clang900-import/stand/lua/password.lua
  projects/clang900-import/sys/amd64/amd64/efirt_machdep.c
  projects/clang900-import/sys/amd64/amd64/elf_machdep.c
  projects/clang900-import/sys/amd64/amd64/pmap.c
  projects/clang900-import/sys/amd64/linux/linux_proto.h
  projects/clang900-import/sys/amd64/linux32/linux32_proto.h
  projects/clang900-import/sys/arm/arm/pmap-v6.c
  projects/clang900-import/sys/arm64/arm64/efirt_machdep.c
  projects/clang900-import/sys/arm64/arm64/pmap.c
  projects/clang900-import/sys/arm64/linux/linux_proto.h
  projects/clang900-import/sys/cam/scsi/scsi_da.c
  projects/clang900-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/clang900-import/sys/cddl/dev/dtrace/amd64/dtrace_asm.S
  projects/clang900-import/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
  projects/clang900-import/sys/cddl/dev/dtrace/i386/dtrace_asm.S
  projects/clang900-import/sys/cddl/dev/dtrace/i386/dtrace_subr.c
  projects/clang900-import/sys/compat/cloudabi/cloudabi_fd.c
  projects/clang900-import/sys/compat/freebsd32/freebsd32_proto.h
  projects/clang900-import/sys/compat/freebsd32/freebsd32_syscall.h
  projects/clang900-import/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/clang900-import/sys/compat/freebsd32/freebsd32_sysent.c
  projects/clang900-import/sys/compat/freebsd32/freebsd32_systrace_args.c
  projects/clang900-import/sys/compat/freebsd32/syscalls.master
  projects/clang900-import/sys/compat/linsysfs/linsysfs.c
  projects/clang900-import/sys/conf/files
  projects/clang900-import/sys/conf/kern.mk
  projects/clang900-import/sys/conf/makeLINT.mk
  projects/clang900-import/sys/conf/options
  projects/clang900-import/sys/contrib/ipfilter/netinet/fil.c
  projects/clang900-import/sys/contrib/octeon-sdk/cvmx-app-init.h
  projects/clang900-import/sys/dev/agp/agp_i810.c
  projects/clang900-import/sys/dev/firewire/if_fwip.c
  projects/clang900-import/sys/dev/ixgbe/if_ix.c
  projects/clang900-import/sys/dev/ixgbe/if_ixv.c
  projects/clang900-import/sys/dev/ixgbe/ixgbe.h
  projects/clang900-import/sys/dev/jme/if_jme.c
  projects/clang900-import/sys/dev/nvme/nvme_ahci.c
  projects/clang900-import/sys/dev/nvme/nvme_ctrlr.c
  projects/clang900-import/sys/dev/nvme/nvme_ctrlr_cmd.c
  projects/clang900-import/sys/dev/nvme/nvme_pci.c
  projects/clang900-import/sys/dev/nvme/nvme_private.h
  projects/clang900-import/sys/dev/nvme/nvme_qpair.c
  projects/clang900-import/sys/dev/nvme/nvme_sysctl.c
  projects/clang900-import/sys/dev/pccard/pccard.c
  projects/clang900-import/sys/dev/vt/hw/fb/vt_fb.c
  projects/clang900-import/sys/dev/vt/vt.h
  projects/clang900-import/sys/dev/vt/vt_buf.c
  projects/clang900-import/sys/dev/vt/vt_core.c
  projects/clang900-import/sys/dev/vt/vt_cpulogos.c
  projects/clang900-import/sys/fs/nfs/nfsport.h
  projects/clang900-import/sys/fs/nfsclient/nfs_clbio.c
  projects/clang900-import/sys/fs/nfsclient/nfs_clnfsiod.c
  projects/clang900-import/sys/fs/nfsclient/nfs_clnode.c
  projects/clang900-import/sys/fs/nfsclient/nfs_clport.c
  projects/clang900-import/sys/fs/nfsclient/nfs_clrpcops.c
  projects/clang900-import/sys/fs/nfsclient/nfs_clsubs.c
  projects/clang900-import/sys/fs/nfsclient/nfs_clvfsops.c
  projects/clang900-import/sys/fs/nfsclient/nfs_clvnops.c
  projects/clang900-import/sys/i386/i386/pmap.c
  projects/clang900-import/sys/i386/i386/pmap_base.c
  projects/clang900-import/sys/i386/include/pmap_base.h
  projects/clang900-import/sys/i386/linux/linux_proto.h
  projects/clang900-import/sys/kern/capabilities.conf
  projects/clang900-import/sys/kern/init_sysent.c
  projects/clang900-import/sys/kern/kern_descrip.c
  projects/clang900-import/sys/kern/kern_exec.c
  projects/clang900-import/sys/kern/kern_fork.c
  projects/clang900-import/sys/kern/kern_sig.c
  projects/clang900-import/sys/kern/kern_thread.c
  projects/clang900-import/sys/kern/link_elf.c
  projects/clang900-import/sys/kern/makesyscalls.sh
  projects/clang900-import/sys/kern/sched_ule.c
  projects/clang900-import/sys/kern/subr_epoch.c
  projects/clang900-import/sys/kern/subr_lock.c
  projects/clang900-import/sys/kern/subr_stack.c
  projects/clang900-import/sys/kern/subr_terminal.c
  projects/clang900-import/sys/kern/syscalls.c
  projects/clang900-import/sys/kern/syscalls.master
  projects/clang900-import/sys/kern/systrace_args.c
  projects/clang900-import/sys/kern/uipc_shm.c
  projects/clang900-import/sys/kern/vfs_cache.c
  projects/clang900-import/sys/kern/vfs_mount.c
  projects/clang900-import/sys/kern/vfs_subr.c
  projects/clang900-import/sys/mips/cavium/std.octeon1
  projects/clang900-import/sys/mips/mips/pmap.c
  projects/clang900-import/sys/modules/tcp/Makefile
  projects/clang900-import/sys/net/if.c
  projects/clang900-import/sys/net/if_ethersubr.c
  projects/clang900-import/sys/net/if_vlan.c
  projects/clang900-import/sys/net/iflib.c
  projects/clang900-import/sys/netinet/ip_output.c
  projects/clang900-import/sys/netinet/ip_var.h
  projects/clang900-import/sys/netinet/sctp_indata.c
  projects/clang900-import/sys/netinet/sctp_input.c
  projects/clang900-import/sys/netinet/sctputil.c
  projects/clang900-import/sys/netinet/sctputil.h
  projects/clang900-import/sys/netinet/tcp.h
  projects/clang900-import/sys/netinet/tcp_ratelimit.h
  projects/clang900-import/sys/netinet/tcp_stacks/rack.c
  projects/clang900-import/sys/netinet/tcp_stacks/rack_bbr_common.c
  projects/clang900-import/sys/netinet/tcp_stacks/rack_bbr_common.h
  projects/clang900-import/sys/netinet/tcp_stacks/sack_filter.c
  projects/clang900-import/sys/netinet/tcp_stacks/sack_filter.h
  projects/clang900-import/sys/netinet/tcp_stacks/tcp_rack.h
  projects/clang900-import/sys/netinet/tcp_syncache.c
  projects/clang900-import/sys/netinet/tcp_syncache.h
  projects/clang900-import/sys/powerpc/booke/pmap.c
  projects/clang900-import/sys/powerpc/include/atomic.h
  projects/clang900-import/sys/powerpc/powerpc/mp_machdep.c
  projects/clang900-import/sys/riscv/riscv/elf_machdep.c
  projects/clang900-import/sys/riscv/riscv/pmap.c
  projects/clang900-import/sys/sys/epoch.h
  projects/clang900-import/sys/sys/fcntl.h
  projects/clang900-import/sys/sys/file.h
  projects/clang900-import/sys/sys/mbuf.h
  projects/clang900-import/sys/sys/mman.h
  projects/clang900-import/sys/sys/mount.h
  projects/clang900-import/sys/sys/param.h
  projects/clang900-import/sys/sys/proc.h
  projects/clang900-import/sys/sys/signalvar.h
  projects/clang900-import/sys/sys/stack.h
  projects/clang900-import/sys/sys/syscall.h
  projects/clang900-import/sys/sys/syscall.mk
  projects/clang900-import/sys/sys/syscallsubr.h
  projects/clang900-import/sys/sys/sysproto.h
  projects/clang900-import/sys/sys/unistd.h
  projects/clang900-import/sys/sys/vnode.h
  projects/clang900-import/sys/vm/vm_page.c
  projects/clang900-import/sys/vm/vm_page.h
  projects/clang900-import/sys/x86/iommu/intel_idpgtbl.c
  projects/clang900-import/sys/x86/x86/tsc.c
  projects/clang900-import/tests/sys/kern/Makefile
  projects/clang900-import/tests/sys/kern/coredump_phnum_test.sh
  projects/clang900-import/tests/sys/posixshm/posixshm_test.c
  projects/clang900-import/tools/debugscripts/gdbinit.kernel
  projects/clang900-import/usr.bin/bsdiff/bspatch/bspatch.c
  projects/clang900-import/usr.bin/grep/grep.c
  projects/clang900-import/usr.bin/grep/util.c
  projects/clang900-import/usr.bin/kdump/kdump.c
  projects/clang900-import/usr.bin/truss/syscalls.c
  projects/clang900-import/usr.sbin/cron/cron/cron.h
  projects/clang900-import/usr.sbin/cron/cron/do_command.c
  projects/clang900-import/usr.sbin/cron/cron/popen.c
  projects/clang900-import/usr.sbin/cron/crontab/crontab.5
  projects/clang900-import/usr.sbin/cron/lib/entry.c
  projects/clang900-import/usr.sbin/efibootmgr/efibootmgr.8
  projects/clang900-import/usr.sbin/freebsd-update/freebsd-update.8
  projects/clang900-import/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
  projects/clang900-import/   (props changed)
  projects/clang900-import/cddl/   (props changed)
  projects/clang900-import/cddl/contrib/opensolaris/   (props changed)
  projects/clang900-import/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/clang900-import/contrib/ipfilter/   (props changed)
  projects/clang900-import/contrib/libarchive/   (props changed)
  projects/clang900-import/contrib/netbsd-tests/   (props changed)
  projects/clang900-import/sys/cddl/contrib/opensolaris/   (props changed)
  projects/clang900-import/sys/contrib/ipfilter/   (props changed)
  projects/clang900-import/sys/contrib/octeon-sdk/   (props changed)

Modified: projects/clang900-import/Makefile.inc1
==============================================================================
--- projects/clang900-import/Makefile.inc1	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/Makefile.inc1	Thu Sep 26 18:25:54 2019	(r352764)
@@ -947,7 +947,8 @@ _cleanobj_fast_depend_hack: .PHONY
 # Syscall stubs rewritten in C and obsolete MD assembly implementations
 # Date      SVN Rev  Syscalls
 # 20180604  r334626  brk sbrk
-.for f in brk sbrk
+# 20190916  r352703  shm_open
+.for f in brk sbrk shm_open
 	@if [ -e "${OBJTOP}/lib/libc/.depend.${f}.o" ] && \
 	    egrep -qw '${f}\.[sS]' ${OBJTOP}/lib/libc/.depend.${f}.o; then \
 		echo "Removing stale dependencies for ${f} syscall wrappers"; \

Modified: projects/clang900-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang900-import/ObsoleteFiles.inc	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/ObsoleteFiles.inc	Thu Sep 26 18:25:54 2019	(r352764)
@@ -827,6 +827,9 @@ OLD_DIRS+=usr/lib/clang/6.0.1/lib
 OLD_DIRS+=usr/lib/clang/6.0.1
 # 20181116: Rename test file.
 OLD_FILES+=usr/tests/sys/netinet/reuseport_lb
+# 20181113: libufs version bumped to 7.
+OLD_LIBS+=lib/libufs.so.6
+OLD_LIBS+=usr/lib32/libufs.so.6
 # 20181112: Cleanup old libcap_dns.
 OLD_LIBS+=lib/casper/libcap_dns.so.1
 OLD_LIBS+=usr/lib32/libcap_dns.so.1

Modified: projects/clang900-import/RELNOTES
==============================================================================
--- projects/clang900-import/RELNOTES	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/RELNOTES	Thu Sep 26 18:25:54 2019	(r352764)
@@ -10,6 +10,11 @@ newline.  Entries should be separated by a newline.
 
 Changes to this file should not be MFCed.
 
+r352668:
+	cron(8) now supports the -n (suppress mail on succesful run) and -q
+	(suppress logging of command execution) options in the crontab format.
+	See the crontab(5) manpage for details.
+
 r352304:
 	ntpd is no longer by default locked in memory. rlimit memlock 32
 	or rlimit memlock 0 can be used to restore this behaviour.

Modified: projects/clang900-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- projects/clang900-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Thu Sep 26 18:25:54 2019	(r352764)
@@ -948,39 +948,32 @@ typedef struct send_dump_data {
 } send_dump_data_t;
 
 static int
-estimate_ioctl(zfs_handle_t *zhp, uint64_t fromsnap_obj,
-    boolean_t fromorigin, enum lzc_send_flags flags, uint64_t *sizep)
+zfs_send_space(zfs_handle_t *zhp, const char *snapname, const char *from,
+    enum lzc_send_flags flags, uint64_t *spacep)
 {
-	zfs_cmd_t zc = { 0 };
 	libzfs_handle_t *hdl = zhp->zfs_hdl;
+	int error;
 
-	assert(zhp->zfs_type == ZFS_TYPE_SNAPSHOT);
-	assert(fromsnap_obj == 0 || !fromorigin);
+	assert(snapname != NULL);
+	error = lzc_send_space(snapname, from, flags, spacep);
 
-	(void) strlcpy(zc.zc_name, zhp->zfs_name, sizeof (zc.zc_name));
-	zc.zc_obj = fromorigin;
-	zc.zc_sendobj = zfs_prop_get_int(zhp, ZFS_PROP_OBJSETID);
-	zc.zc_fromobj = fromsnap_obj;
-	zc.zc_guid = 1;  /* estimate flag */
-	zc.zc_flags = flags;
-
-	if (zfs_ioctl(zhp->zfs_hdl, ZFS_IOC_SEND, &zc) != 0) {
+	if (error != 0) {
 		char errbuf[1024];
 		(void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN,
-		    "warning: cannot estimate space for '%s'"), zhp->zfs_name);
+		    "warning: cannot estimate space for '%s'"), snapname);
 
-		switch (errno) {
+		switch (error) {
 		case EXDEV:
 			zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
 			    "not an earlier snapshot from the same fs"));
 			return (zfs_error(hdl, EZFS_CROSSTARGET, errbuf));
 
 		case ENOENT:
-			if (zfs_dataset_exists(hdl, zc.zc_name,
+			if (zfs_dataset_exists(hdl, snapname,
 			    ZFS_TYPE_SNAPSHOT)) {
 				zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
-				    "incremental source (@%s) does not exist"),
-				    zc.zc_value);
+				    "incremental source (%s) does not exist"),
+				    snapname);
 			}
 			return (zfs_error(hdl, EZFS_NOENT, errbuf));
 
@@ -994,16 +987,15 @@ estimate_ioctl(zfs_handle_t *zhp, uint64_t fromsnap_ob
 		case ERANGE:
 		case EFAULT:
 		case EROFS:
-			zfs_error_aux(hdl, strerror(errno));
+		case EINVAL:
+			zfs_error_aux(hdl, strerror(error));
 			return (zfs_error(hdl, EZFS_BADBACKUP, errbuf));
 
 		default:
-			return (zfs_standard_error(hdl, errno, errbuf));
+			return (zfs_standard_error(hdl, error, errbuf));
 		}
 	}
 
-	*sizep = zc.zc_objset_type;
-
 	return (0);
 }
 
@@ -1290,13 +1282,22 @@ dump_snapshot(zfs_handle_t *zhp, void *arg)
 	    (sdd->fromorigin || sdd->replicate);
 
 	if (sdd->verbose || sdd->progress) {
-		(void) estimate_ioctl(zhp, sdd->prevsnap_obj,
-		    fromorigin, flags, &size);
-		sdd->size += size;
+		char fromds[ZFS_MAX_DATASET_NAME_LEN];
 
-		send_print_verbose(fout, zhp->zfs_name,
-		    sdd->prevsnap[0] ? sdd->prevsnap : NULL,
-		    size, sdd->parsable);
+		if (sdd->prevsnap[0] != '\0') {
+			(void) strlcpy(fromds, zhp->zfs_name, sizeof (fromds));
+			*(strchr(fromds, '@') + 1) = '\0';
+			(void) strlcat(fromds, sdd->prevsnap, sizeof (fromds));
+		}
+		if (zfs_send_space(zhp, zhp->zfs_name,
+		    sdd->prevsnap[0] ? fromds : NULL, flags, &size) != 0) {
+			size = 0; /* cannot estimate send space */
+		} else {
+			send_print_verbose(fout, zhp->zfs_name,
+			    sdd->prevsnap[0] ? sdd->prevsnap : NULL,
+			    size, sdd->parsable);
+		}
+		sdd->size += size;
 	}
 
 	if (!sdd->dryrun) {
@@ -2054,6 +2055,15 @@ zfs_send_one(zfs_handle_t *zhp, const char *from, int 
 		if (err == 0) {
 			send_print_verbose(fout, zhp->zfs_name, from, size,
 			    flags.parsable);
+			if (flags.parsable) {
+				(void) fprintf(fout, "size\t%llu\n",
+				    (longlong_t)size);
+			} else {
+				char buf[16];
+				zfs_nicenum(size, buf, sizeof (buf));
+				(void) fprintf(fout, dgettext(TEXT_DOMAIN,
+				    "total estimated size is %s\n"), buf);
+			}
 		} else {
 			(void) fprintf(stderr, "Cannot estimate send size: "
 			    "%s\n", strerror(errno));

Modified: projects/clang900-import/contrib/ipfilter/tools/ippool_y.y
==============================================================================
--- projects/clang900-import/contrib/ipfilter/tools/ippool_y.y	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/ipfilter/tools/ippool_y.y	Thu Sep 26 18:25:54 2019	(r352764)
@@ -309,11 +309,27 @@ range:	addrmask			{ $$ = calloc(1, sizeof(*$$));
 					  $$->ipn_info = 0;
 					  $$->ipn_addr = $1[0];
 					  $$->ipn_mask = $1[1];
+#ifdef USE_INET6
+					  if (use_inet6)
+						$$->ipn_addr.adf_family =
+							AF_INET6;
+					  else
+#endif
+						$$->ipn_addr.adf_family =
+							AF_INET;
 					}
 	| '!' addrmask			{ $$ = calloc(1, sizeof(*$$));
 					  $$->ipn_info = 1;
 					  $$->ipn_addr = $2[0];
 					  $$->ipn_mask = $2[1];
+#ifdef USE_INET6
+					  if (use_inet6)
+						$$->ipn_addr.adf_family =
+							AF_INET6;
+					  else
+#endif
+						$$->ipn_addr.adf_family =
+							AF_INET;
 					}
 	| YY_STR			{ $$ = add_poolhosts($1);
 					  free($1);

Modified: projects/clang900-import/contrib/libarchive/cat/bsdcat.1
==============================================================================
--- projects/clang900-import/contrib/libarchive/cat/bsdcat.1	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/cat/bsdcat.1	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/cpio/bsdcpio.1
==============================================================================
--- projects/clang900-import/contrib/libarchive/cpio/bsdcpio.1	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/cpio/bsdcpio.1	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive.h
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive.h	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive.h	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_entry.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_entry.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_entry.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_entry_acl.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_entry_acl.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_entry_acl.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_entry_misc.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_entry_misc.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_entry_misc.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_entry_paths.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_entry_paths.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_entry_paths.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_entry_perms.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_entry_perms.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_entry_perms.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_entry_stat.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_entry_stat.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_entry_stat.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_entry_time.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_entry_time.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_entry_time.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_read.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_read.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_read.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_read_add_passphrase.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_read_add_passphrase.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_read_add_passphrase.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_read_data.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_read_data.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_read_data.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_read_disk.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_read_disk.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_read_disk.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_read_extract.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_read_extract.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_read_extract.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_read_filter.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_read_filter.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_read_filter.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_read_format.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_read_format.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_read_format.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_read_free.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_read_free.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_read_free.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_read_header.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_read_header.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_read_header.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_read_new.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_read_new.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_read_new.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_read_open.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_read_open.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_read_open.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_read_set_options.3
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_read_set_options.3	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_read_set_options.3	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_read_support_filter_gzip.c
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_read_support_filter_gzip.c	Thu Sep 26 18:24:04 2019	(r352763)
+++ projects/clang900-import/contrib/libarchive/libarchive/archive_read_support_filter_gzip.c	Thu Sep 26 18:25:54 2019	(r352764)
@@ -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: projects/clang900-import/contrib/libarchive/libarchive/archive_read_support_filter_lz4.c
==============================================================================
--- projects/clang900-import/contrib/libarchive/libarchive/archive_read_support_filter_lz4.c	Thu Sep 26 18:24:04 2019	(r352763)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-projects mailing list