svn commit: r318691 - in user/markj/PQ_LAUNDRY_11: . contrib/libstdc++/config/abi/pre etc etc/autofs gnu/usr.bin/groff/tmac lib lib/clang lib/libefi lib/libefivar libexec/rtld-elf release/doc/en_US...

Mark Johnston markj at FreeBSD.org
Tue May 23 04:10:39 UTC 2017 

Author: markj
Date: Tue May 23 04:10:36 2017
New Revision: 318691
URL: https://svnweb.freebsd.org/changeset/base/318691

Log:
  Merge from stable/11 at r318690.

Added:
  user/markj/PQ_LAUNDRY_11/lib/libefivar/
     - copied from r318690, stable/11/lib/libefivar/
  user/markj/PQ_LAUNDRY_11/share/man/man5/cd9660.5
     - copied unchanged from r318690, stable/11/share/man/man5/cd9660.5
  user/markj/PQ_LAUNDRY_11/sys/boot/efi/include/efichar.h
     - copied unchanged from r318690, stable/11/sys/boot/efi/include/efichar.h
  user/markj/PQ_LAUNDRY_11/sys/boot/efi/libefi/efichar.c
     - copied unchanged from r318690, stable/11/sys/boot/efi/libefi/efichar.c
  user/markj/PQ_LAUNDRY_11/sys/contrib/edk2/
     - copied from r318690, stable/11/sys/contrib/edk2/
  user/markj/PQ_LAUNDRY_11/sys/dev/efidev/
     - copied from r318690, stable/11/sys/dev/efidev/
  user/markj/PQ_LAUNDRY_11/sys/i386/include/efi.h
     - copied unchanged from r318690, stable/11/sys/i386/include/efi.h
  user/markj/PQ_LAUNDRY_11/sys/mips/include/efi.h
     - copied unchanged from r318690, stable/11/sys/mips/include/efi.h
  user/markj/PQ_LAUNDRY_11/sys/pc98/include/efi.h
     - copied unchanged from r318690, stable/11/sys/pc98/include/efi.h
  user/markj/PQ_LAUNDRY_11/sys/powerpc/include/efi.h
     - copied unchanged from r318690, stable/11/sys/powerpc/include/efi.h
  user/markj/PQ_LAUNDRY_11/sys/riscv/include/efi.h
     - copied unchanged from r318690, stable/11/sys/riscv/include/efi.h
  user/markj/PQ_LAUNDRY_11/sys/sparc64/include/efi.h
     - copied unchanged from r318690, stable/11/sys/sparc64/include/efi.h
  user/markj/PQ_LAUNDRY_11/sys/sys/efiio.h
     - copied unchanged from r318690, stable/11/sys/sys/efiio.h
  user/markj/PQ_LAUNDRY_11/tools/build/options/WITHOUT_EFI
     - copied unchanged from r318690, stable/11/tools/build/options/WITHOUT_EFI
  user/markj/PQ_LAUNDRY_11/tools/build/options/WITH_EFI
     - copied unchanged from r318690, stable/11/tools/build/options/WITH_EFI
  user/markj/PQ_LAUNDRY_11/usr.sbin/efidp/
     - copied from r318690, stable/11/usr.sbin/efidp/
  user/markj/PQ_LAUNDRY_11/usr.sbin/efivar/
     - copied from r318690, stable/11/usr.sbin/efivar/
Deleted:
  user/markj/PQ_LAUNDRY_11/lib/libefi/
Modified:
  user/markj/PQ_LAUNDRY_11/Makefile.inc1
  user/markj/PQ_LAUNDRY_11/contrib/libstdc++/config/abi/pre/gnu.ver
  user/markj/PQ_LAUNDRY_11/etc/autofs/special_media
  user/markj/PQ_LAUNDRY_11/etc/rc
  user/markj/PQ_LAUNDRY_11/gnu/usr.bin/groff/tmac/mdoc.local.in
  user/markj/PQ_LAUNDRY_11/lib/Makefile
  user/markj/PQ_LAUNDRY_11/lib/clang/llvm.build.mk
  user/markj/PQ_LAUNDRY_11/libexec/rtld-elf/rtld.c
  user/markj/PQ_LAUNDRY_11/release/doc/en_US.ISO8859-1/relnotes/article.xml
  user/markj/PQ_LAUNDRY_11/sbin/dhclient/dhclient.c
  user/markj/PQ_LAUNDRY_11/sbin/dhclient/options.c
  user/markj/PQ_LAUNDRY_11/sbin/kldconfig/kldconfig.8
  user/markj/PQ_LAUNDRY_11/sbin/kldload/kldload.8
  user/markj/PQ_LAUNDRY_11/sbin/mount/mount.8
  user/markj/PQ_LAUNDRY_11/sbin/mount_cd9660/mount_cd9660.8
  user/markj/PQ_LAUNDRY_11/sbin/mount_nfs/mount_nfs.c
  user/markj/PQ_LAUNDRY_11/share/man/man3/intro.3
  user/markj/PQ_LAUNDRY_11/share/man/man4/geom.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/u3g.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/uark.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/uart.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/ubsa.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/ubser.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/uchcom.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/ucom.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/ucycom.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/uftdi.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/uipaq.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/umcs.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/umct.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/umodem.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/umoscom.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/uplcom.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/usb.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/uslcom.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/uvisor.4
  user/markj/PQ_LAUNDRY_11/share/man/man4/uvscom.4
  user/markj/PQ_LAUNDRY_11/share/man/man5/Makefile
  user/markj/PQ_LAUNDRY_11/share/man/man5/src.conf.5
  user/markj/PQ_LAUNDRY_11/share/mk/bsd.init.mk
  user/markj/PQ_LAUNDRY_11/share/mk/bsd.libnames.mk
  user/markj/PQ_LAUNDRY_11/share/mk/src.libnames.mk
  user/markj/PQ_LAUNDRY_11/share/mk/src.opts.mk
  user/markj/PQ_LAUNDRY_11/sys/amd64/amd64/efirt.c
  user/markj/PQ_LAUNDRY_11/sys/amd64/amd64/pmap.c
  user/markj/PQ_LAUNDRY_11/sys/arm/include/efi.h
  user/markj/PQ_LAUNDRY_11/sys/arm/include/vmparam.h
  user/markj/PQ_LAUNDRY_11/sys/arm64/include/efi.h
  user/markj/PQ_LAUNDRY_11/sys/boot/efi/boot1/boot1.c
  user/markj/PQ_LAUNDRY_11/sys/boot/efi/boot1/boot_module.h
  user/markj/PQ_LAUNDRY_11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  user/markj/PQ_LAUNDRY_11/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c
  user/markj/PQ_LAUNDRY_11/sys/cddl/dev/fbt/powerpc/fbt_isa.c
  user/markj/PQ_LAUNDRY_11/sys/conf/files
  user/markj/PQ_LAUNDRY_11/sys/conf/newvers.sh
  user/markj/PQ_LAUNDRY_11/sys/dev/atkbdc/psm.c
  user/markj/PQ_LAUNDRY_11/sys/dev/mmc/bridge.h
  user/markj/PQ_LAUNDRY_11/sys/dev/mmc/mmc.c
  user/markj/PQ_LAUNDRY_11/sys/dev/mmc/mmcbr_if.m
  user/markj/PQ_LAUNDRY_11/sys/dev/mmc/mmcbrvar.h
  user/markj/PQ_LAUNDRY_11/sys/dev/mmc/mmcreg.h
  user/markj/PQ_LAUNDRY_11/sys/dev/qlnx/qlnxe/qlnx_def.h
  user/markj/PQ_LAUNDRY_11/sys/dev/qlnx/qlnxe/qlnx_ioctl.c
  user/markj/PQ_LAUNDRY_11/sys/dev/qlnx/qlnxe/qlnx_os.c
  user/markj/PQ_LAUNDRY_11/sys/dev/qlnx/qlnxe/qlnx_os.h
  user/markj/PQ_LAUNDRY_11/sys/dev/sdhci/sdhci.c
  user/markj/PQ_LAUNDRY_11/sys/dev/sdhci/sdhci.h
  user/markj/PQ_LAUNDRY_11/sys/dev/sdhci/sdhci_acpi.c
  user/markj/PQ_LAUNDRY_11/sys/dev/sdhci/sdhci_if.m
  user/markj/PQ_LAUNDRY_11/sys/dev/sdhci/sdhci_pci.c
  user/markj/PQ_LAUNDRY_11/sys/dev/usb/controller/xhci_pci.c
  user/markj/PQ_LAUNDRY_11/sys/dev/vt/vt_core.c
  user/markj/PQ_LAUNDRY_11/sys/fs/nfsclient/nfs_clcomsubs.c
  user/markj/PQ_LAUNDRY_11/sys/kern/kern_sig.c
  user/markj/PQ_LAUNDRY_11/sys/kern/vfs_bio.c
  user/markj/PQ_LAUNDRY_11/sys/libkern/crc32.c
  user/markj/PQ_LAUNDRY_11/sys/modules/efirt/Makefile
  user/markj/PQ_LAUNDRY_11/sys/modules/qlnx/qlnxe/Makefile
  user/markj/PQ_LAUNDRY_11/sys/net/ethernet.h
  user/markj/PQ_LAUNDRY_11/sys/net/if_var.h
  user/markj/PQ_LAUNDRY_11/sys/netinet/libalias/alias.c
  user/markj/PQ_LAUNDRY_11/sys/ofed/drivers/net/mlx4/en_netdev.c
  user/markj/PQ_LAUNDRY_11/sys/ofed/drivers/net/mlx4/eq.c
  user/markj/PQ_LAUNDRY_11/sys/ofed/drivers/net/mlx4/fw.c
  user/markj/PQ_LAUNDRY_11/sys/ofed/drivers/net/mlx4/fw.h
  user/markj/PQ_LAUNDRY_11/sys/ofed/drivers/net/mlx4/main.c
  user/markj/PQ_LAUNDRY_11/sys/ofed/drivers/net/mlx4/mlx4_en.h
  user/markj/PQ_LAUNDRY_11/sys/ofed/drivers/net/mlx4/profile.c
  user/markj/PQ_LAUNDRY_11/sys/ofed/drivers/net/mlx4/qp.c
  user/markj/PQ_LAUNDRY_11/sys/ofed/drivers/net/mlx4/resource_tracker.c
  user/markj/PQ_LAUNDRY_11/sys/ofed/include/linux/mlx4/device.h
  user/markj/PQ_LAUNDRY_11/sys/powerpc/booke/trap_subr.S
  user/markj/PQ_LAUNDRY_11/sys/powerpc/include/trap.h
  user/markj/PQ_LAUNDRY_11/sys/rpc/clnt_vc.c
  user/markj/PQ_LAUNDRY_11/sys/sys/proc.h
  user/markj/PQ_LAUNDRY_11/tools/build/options/makeman
  user/markj/PQ_LAUNDRY_11/usr.bin/grep/grep.1
  user/markj/PQ_LAUNDRY_11/usr.bin/sort/sort.1.in
  user/markj/PQ_LAUNDRY_11/usr.bin/tip/tip/cu.1
  user/markj/PQ_LAUNDRY_11/usr.bin/which/which.c
  user/markj/PQ_LAUNDRY_11/usr.sbin/Makefile
  user/markj/PQ_LAUNDRY_11/usr.sbin/fstyp/fstyp.8
  user/markj/PQ_LAUNDRY_11/usr.sbin/fstyp/fstyp.c
  user/markj/PQ_LAUNDRY_11/usr.sbin/rmt/Makefile
  user/markj/PQ_LAUNDRY_11/usr.sbin/rpcbind/rpcbind.c
Directory Properties:
  user/markj/PQ_LAUNDRY_11/   (props changed)

Modified: user/markj/PQ_LAUNDRY_11/Makefile.inc1
==============================================================================
--- user/markj/PQ_LAUNDRY_11/Makefile.inc1	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/Makefile.inc1	Tue May 23 04:10:36 2017	(r318691)
@@ -596,7 +596,7 @@ XCXXFLAGS+=	-isystem ${WORLDTMP}/usr/inc
 .endif
 .else
 TARGET_ABI?=	unknown
-TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
+TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.1
 XCFLAGS+=	-target ${TARGET_TRIPLE}
 .endif
 XCFLAGS+=	--sysroot=${WORLDTMP}

Modified: user/markj/PQ_LAUNDRY_11/contrib/libstdc++/config/abi/pre/gnu.ver
==============================================================================
--- user/markj/PQ_LAUNDRY_11/contrib/libstdc++/config/abi/pre/gnu.ver	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/contrib/libstdc++/config/abi/pre/gnu.ver	Tue May 23 04:10:36 2017	(r318691)
@@ -121,7 +121,7 @@ GLIBCXX_3.4 {
       std::__moneypunct_cache*;
       std::__numpunct_cache*;
       std::__timepunct_cache*;
-      __gnu_debug::_Error_formatter*
+      __gnu_debug::_Error_formatter*;
     };
 
     # Names not in an 'extern' block are mangled names.
@@ -604,34 +604,6 @@ GLIBCXX_3.4.4 {
 } GLIBCXX_3.4.3;
 
 GLIBCXX_3.4.5 {
-
-    # std::string
-    _ZNKSs11_M_disjunctEPKc;
-    _ZNKSs15_M_check_lengthE[jm][jm]PKc;
-    _ZNSs4_Rep26_M_set_length_and_sharableE*;
-    _ZNSs7_M_copyEPcPKc[jm];
-    _ZNSs7_M_moveEPcPKc[jm];
-    _ZNSs9_M_assignEPc[jm]c;
-
-    # std::wstring
-    _ZNKSbIwSt11char_traitsIwESaIwEE11_M_disjunctEPKw;
-    _ZNKSbIwSt11char_traitsIwESaIwEE15_M_check_lengthE[jm][jm]PKc;
-    _ZNSbIwSt11char_traitsIwESaIwEE4_Rep26_M_set_length_and_sharableE*;
-    _ZNSbIwSt11char_traitsIwESaIwEE7_M_copyEPwPKw[jm];
-    _ZNSbIwSt11char_traitsIwESaIwEE7_M_moveEPwPKw[jm];
-    _ZNSbIwSt11char_traitsIwESaIwEE9_M_assignEPw[jm]w;
-
-    _ZNKSt13basic_fstreamI[cw]St11char_traitsI[cw]EE7is_openEv;
-    _ZNKSt14basic_ifstreamI[cw]St11char_traitsI[cw]EE7is_openEv;
-    _ZNKSt14basic_ofstreamI[cw]St11char_traitsI[cw]EE7is_openEv;
-
-    _ZNSi6ignoreE[ilv];
-    _ZNSt13basic_istreamIwSt11char_traitsIwEE6ignoreE[ilv];
-
-    _ZNSt11char_traitsI[cw]E2eqERK[cw]S2_;
-
-    _ZNSt19istreambuf_iteratorI[cw]St11char_traitsI[cw]EEppEv;
-
 } GLIBCXX_3.4.4;
 
 GLIBCXX_3.4.6 {
@@ -643,8 +615,6 @@ GLIBCXX_3.4.6 {
 
     _ZNSt15basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EE9showmanycEv;
 
-    _ZNKSt15basic_stringbufIwSt11char_traitsIwESaIwEE3strEv;
-
     _ZN9__gnu_cxx6__poolILb1EE13_M_initializeEv;
 
 } GLIBCXX_3.4.5;

Modified: user/markj/PQ_LAUNDRY_11/etc/autofs/special_media
==============================================================================
--- user/markj/PQ_LAUNDRY_11/etc/autofs/special_media	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/etc/autofs/special_media	Tue May 23 04:10:36 2017	(r318691)
@@ -39,6 +39,15 @@ print_map_entry() {
 	_p="$2"
 
 	case "${_fstype}" in
+	"exfat")
+		if [ -f "/usr/local/sbin/mount.exfat" ]; then
+			echo "-mountprog=/usr/local/sbin/mount.exfat,fstype=${_fstype},nosuid	:/dev/${_p}" 
+		else
+			/usr/bin/logger -p info -t "special_media[$$]" \
+			    "Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-exfat first"
+			exit 1
+		fi
+		;;
 	"ntfs")
 		if [ -f "/usr/local/bin/ntfs-3g" ]; then
 			echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype},nosuid	:/dev/${_p}" 

Modified: user/markj/PQ_LAUNDRY_11/etc/rc
==============================================================================
--- user/markj/PQ_LAUNDRY_11/etc/rc	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/etc/rc	Tue May 23 04:10:36 2017	(r318691)
@@ -135,16 +135,16 @@ done
 # Note: this assumes firstboot_sentinel is on / when we have
 # a read-only /, or that it is on media that's writable.
 if [ -e ${firstboot_sentinel} ]; then
-	[ ${root_rw_mount} = "yes" ] || mount -uw /
+	[ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -uw /
 	chflags -R 0 ${firstboot_sentinel}
 	rm -rf ${firstboot_sentinel}
 	if [ -e ${firstboot_sentinel}-reboot ]; then
 		chflags -R 0 ${firstboot_sentinel}-reboot
 		rm -rf ${firstboot_sentinel}-reboot
-		[ ${root_rw_mount} = "yes" ] || mount -ur /
+		[ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -ur /
 		kill -INT 1
 	fi
-	[ ${root_rw_mount} = "yes" ] || mount -ur /
+	[ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -ur /
 fi
 
 echo ''

Modified: user/markj/PQ_LAUNDRY_11/gnu/usr.bin/groff/tmac/mdoc.local.in
==============================================================================
--- user/markj/PQ_LAUNDRY_11/gnu/usr.bin/groff/tmac/mdoc.local.in	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/gnu/usr.bin/groff/tmac/mdoc.local.in	Tue May 23 04:10:36 2017	(r318691)
@@ -50,7 +50,7 @@
 .ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads)
 .
 .\" Default .Os value
-.ds doc-default-operating-system FreeBSD\~11.0
+.ds doc-default-operating-system FreeBSD\~11.1
 .
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-2.2.9  2.2.9
@@ -62,7 +62,10 @@
 .ds doc-operating-system-FreeBSD-9.3    9.3
 .ds doc-operating-system-FreeBSD-10.0   10.0
 .ds doc-operating-system-FreeBSD-10.1   10.1
+.ds doc-operating-system-FreeBSD-10.2   10.2
+.ds doc-operating-system-FreeBSD-10.3   10.3
 .ds doc-operating-system-FreeBSD-11.0   11.0
+.ds doc-operating-system-FreeBSD-11.1   11.1
 .
 .\" Definitions for other *BSDs not (yet) in doc-common
 .ds doc-operating-system-NetBSD-7.0     7.0

Modified: user/markj/PQ_LAUNDRY_11/lib/Makefile
==============================================================================
--- user/markj/PQ_LAUNDRY_11/lib/Makefile	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/lib/Makefile	Tue May 23 04:10:36 2017	(r318691)
@@ -49,6 +49,7 @@ SUBDIR=	${SUBDIR_BOOTSTRAP} \
 	libdpv \
 	libdwarf \
 	libedit \
+	${_libefivar} \
 	${_libelftc} \
 	libevent \
 	libexecinfo \
@@ -232,6 +233,10 @@ _libcxxrt=	libcxxrt
 _libcplusplus=	libc++
 .endif
 
+.if ${MK_EFI} != "no"
+_libefivar=	libefivar
+.endif
+
 .if ${MK_LIBTHR} != "no"
 _libthr=	libthr
 .endif

Modified: user/markj/PQ_LAUNDRY_11/lib/clang/llvm.build.mk
==============================================================================
--- user/markj/PQ_LAUNDRY_11/lib/clang/llvm.build.mk	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/lib/clang/llvm.build.mk	Tue May 23 04:10:36 2017	(r318691)
@@ -31,7 +31,7 @@ TARGET_ABI=	gnueabi
 .else
 TARGET_ABI=	unknown
 .endif
-OS_VERSION=	freebsd11.0
+OS_VERSION=	freebsd11.1
 
 TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-${TARGET_ABI}-${OS_VERSION}
 BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-unknown-${OS_VERSION}

Modified: user/markj/PQ_LAUNDRY_11/libexec/rtld-elf/rtld.c
==============================================================================
--- user/markj/PQ_LAUNDRY_11/libexec/rtld-elf/rtld.c	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/libexec/rtld-elf/rtld.c	Tue May 23 04:10:36 2017	(r318691)
@@ -339,22 +339,16 @@ _LD(const char *var)
 func_ptr_type
 _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp)
 {
-    Elf_Auxinfo *aux_info[AT_COUNT];
-    int i;
-    int argc;
-    char **argv;
-    char **env;
-    Elf_Auxinfo *aux;
-    Elf_Auxinfo *auxp;
-    const char *argv0;
+    Elf_Auxinfo *aux, *auxp, *aux_info[AT_COUNT];
     Objlist_Entry *entry;
-    Obj_Entry *obj;
-    Obj_Entry *preload_tail;
-    Obj_Entry *last_interposer;
+    Obj_Entry *last_interposer, *obj, *preload_tail;
+    const Elf_Phdr *phdr;
     Objlist initlist;
     RtldLockState lockstate;
-    char *library_path_rpath;
-    int mib[2];
+    char **argv, *argv0, **env, *kexecpath, *library_path_rpath;
+    caddr_t imgentry;
+    char buf[MAXPATHLEN];
+    int argc, fd, i, mib[2], phnum;
     size_t len;
 
     /*
@@ -477,7 +471,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_
      * already loaded.
      */
     if (aux_info[AT_EXECFD] != NULL) {	/* Load the main program. */
-	int fd = aux_info[AT_EXECFD]->a_un.a_val;
+	fd = aux_info[AT_EXECFD]->a_un.a_val;
 	dbg("loading main program");
 	obj_main = map_object(fd, argv0, NULL);
 	close(fd);
@@ -485,10 +479,6 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_
 	    rtld_die();
 	max_stack_flags = obj->stack_flags;
     } else {				/* Main program already loaded. */
-	const Elf_Phdr *phdr;
-	int phnum;
-	caddr_t entry;
-
 	dbg("processing main program's program header");
 	assert(aux_info[AT_PHDR] != NULL);
 	phdr = (const Elf_Phdr *) aux_info[AT_PHDR]->a_un.a_ptr;
@@ -497,15 +487,12 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_
 	assert(aux_info[AT_PHENT] != NULL);
 	assert(aux_info[AT_PHENT]->a_un.a_val == sizeof(Elf_Phdr));
 	assert(aux_info[AT_ENTRY] != NULL);
-	entry = (caddr_t) aux_info[AT_ENTRY]->a_un.a_ptr;
-	if ((obj_main = digest_phdr(phdr, phnum, entry, argv0)) == NULL)
+	imgentry = (caddr_t) aux_info[AT_ENTRY]->a_un.a_ptr;
+	if ((obj_main = digest_phdr(phdr, phnum, imgentry, argv0)) == NULL)
 	    rtld_die();
     }
 
     if (aux_info[AT_EXECPATH] != NULL) {
-	    char *kexecpath;
-	    char buf[MAXPATHLEN];
-
 	    kexecpath = aux_info[AT_EXECPATH]->a_un.a_ptr;
 	    dbg("AT_EXECPATH %p %s", kexecpath, kexecpath);
 	    if (kexecpath[0] == '/')

Modified: user/markj/PQ_LAUNDRY_11/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- user/markj/PQ_LAUNDRY_11/release/doc/en_US.ISO8859-1/relnotes/article.xml	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/release/doc/en_US.ISO8859-1/relnotes/article.xml	Tue May 23 04:10:36 2017	(r318691)
@@ -159,8 +159,8 @@
     <sect2 xml:id="userland-config">
       <title>Userland Configuration Changes</title>
 
-      <para revision="313203">The &man.inetd.8; utility can now be
-	built without <literal>libwrap</literal> support when
+      <para revision="313203">The &man.inetd.8; utility is now built
+	without <literal>libwrap</literal> support when
 	<literal>WITHOUT_TCP_WRAPPERS</literal> is set in
 	&man.src.conf.5;.</para>
 
@@ -174,11 +174,20 @@
 	<literal>WITH_LLD_AS_LD</literal> build knob has been added,
 	which installs <application>LLD</application> as
 	<filename>/usr/bin/ld</filename> if set.</para>
+
+      <para revision="318472" contrib="sponsor" sponsor="&ff;">
+	<application>LLD</application> has been enabled by default and
+	installed as <filename>/usr/bin/ld</filename> on
+	&os;/&arch.arm64;.</para>
     </sect2>
 
     <sect2 xml:id="userland-programs">
       <title>Userland Application Changes</title>
 
+      <para revision="305476" contrib="sponsor"
+	sponsor="&ff;">Support for &man.blacklistd.8; has been added
+	to <application>OpenSSH</application>.</para>
+
       <para revision="308720" contrib="sponsor" sponsor="&gandi;">The
 	&man.cron.8; utility has been updated to add support for
 	including files within <filename
@@ -197,15 +206,15 @@
 	default.</para>
 
       <para revision="308914">The &man.zfsbootcfg.8; utility has been
-	added, providing one-time &man.nextboot.8; options for
-	&man.zfsboot.8;.</para>
+	added, providing one-time &man.boot.config.5;-style options
+	for &man.zfsboot.8;.</para>
 
       <para revision="315514" contrib="sponsor" sponsor="&yandex;">The
 	&man.setkey.8; utility has been modified to show the runtime
 	<acronym>NAT-T</acronym> configuration.  The
 	<literal>-g</literal> and <literal>-t</literal> flags have
 	been added, which list only global and virtual policies,
-	respectively when used with the <literal>-D</literal> and
+	respectively, when used with the <literal>-D</literal> and
 	<literal>-P</literal> flags.</para>
 
       <para revision="316098" contrib="sponsor"
@@ -220,7 +229,11 @@
 
       <para revision="317855">The &man.daemon.8; utility has been
 	updated to allow redirecting &man.stdout.4; and &man.stderr.4;
-	output to &man.syslog.3; and to a file.</para>
+	output to &man.syslog.3; or to a file.</para>
+
+      <para revision="318576" contrib="sponsor" sponsor="&ff;">The
+	&man.efivar.8; utility has been added, providing an interface
+	to manage <acronym>UEFI</acronym> variables.</para>
     </sect2>
 
     <sect2 xml:id="userland-contrib">
@@ -307,8 +320,8 @@
 	sponsor="&ff;">&man.blacklistd.8; support for
 	<application>OpenSSH</application> has been refined to adjust
 	notification points to catch all authentication failures
-	rather than authentication failures caused by invalid
-	login usernames.</para>
+	rather than only those caused by invalid login
+	usernames.</para>
     </sect2>
 
     <sect2 xml:id="userland-installer">
@@ -333,6 +346,13 @@
       <title><filename class="directory">/etc/periodic</filename>
 	Scripts</title>
 
+      <para revision="317373">The default &man.periodic.conf.5; has
+	been updated to include the
+	<literal>anticongestion_sleeptime</literal> option,
+	consolidating random sleeps in &man.periodic.8; scripts and
+	replacing the <literal>daily_ntpd_avoid_congestion</literal>
+	option.  The default value is 3600 seconds.</para>
+
       <para revision="317857">The <filename>410.status-mfi</filename>
 	&man.periodic.8; script has been added to monitor the status
 	of &man.mfi.4; volumes.</para>
@@ -341,16 +361,31 @@
     <sect2 xml:id="userland-libraries">
       <title>Runtime Libraries and API</title>
 
+      <para revision="316039">The &man.kvm.close.3; function has been
+	updated to return the accumulated error from previous
+	&man.close.2; calls.</para>
+
+      <para revision="316613">The C standard library has been updated
+	to make use of &man.reallocarray.3; for bounds
+	checking.</para>
+
       <para revision="317618" contrib="sponsor"
 	sponsor="&dellemc;">The <function>clock_nanosleep()</function>
 	system call has been added.  The
 	<function>nanosleep()</function> system call is now a wrapper
 	around <function>clock_nanosleep()</function>.</para>
+
+      <para revision="318121">The system libraries have been updated
+	to make use of &man.reallocarray.3; for bounds
+	checking.</para>
     </sect2>
 
     <sect2 xml:id="userland-abi">
       <title>ABI Compatibility</title>
 
+      <para revision="309258">The type <literal>max_align_t</literal>
+	is now defined for C11 compliance.</para>
+
       <para revision="315274" contrib="sponsor"
 	sponsor="&dellemc;">The
 	<function>sem_clockwait_np()</function> library function has
@@ -358,8 +393,25 @@
 	clock and choose between absolute and relative mode.</para>
 
       <para revision="315282">The <application>clang</application>
-	<literal>nullability</literal> attribute has been added to the
-	<literal>C</literal> library headers.</para>
+	<literal>nullability</literal> qualifiers have been added to
+	the <literal>C</literal> library headers.</para>
+
+      <para revision="315282">Uses of the <acronym>GNU</acronym>
+	<literal>__nonnull__</literal> attribute have been replaced
+	with the more benign <application>Clang</application>
+	nullability attributes.</para>
+    </sect2>
+
+    <sect2 xml:id="userland-debug">
+      <title>Userland Debugging</title>
+
+      <para revision="304499">&man.ptrace.2; now supports events for
+	&man.vfork.2;, permitting reliable debugging across
+	&man.vfork.2; invocations.</para>
+
+      <para revision="306786">Process core dumps now include the
+	process ID (<acronym>PID</acronym>) and command line
+	arguments.</para>
     </sect2>
   </sect1>
 
@@ -373,14 +425,10 @@
     <sect2 xml:id="kernel-bugfix">
       <title>Kernel Bug Fixes</title>
 
-      <para revision="316039">The &man.kvm.close.3; function has been
-	updated to return the accumulated error from previous
-	&man.close.2; calls.</para>
-
       <para revision="317434">The &man.ipf.4; packet filter has been
-	updated to prevent "keep state" from incorrectly
-	implying "keep frags", matching the behavior
-	documented in &man.ipf.5;.</para>
+	updated to prevent <literal>keep state</literal> from
+	incorrectly implying <literal>keep frags</literal>, matching
+	the behavior documented in &man.ipf.5;.</para>
     </sect2>
 
     <sect2 xml:id="kernel-config">
@@ -400,6 +448,11 @@
     <sect2 xml:id="kernel-modules">
       <title>Kernel Modules</title>
 
+      <para revision="307144">&man.cloudabi.4; has been updated to
+	allow running 32-bit binaries within 64-bit userland
+	environments when the kernel configuration file has the
+	<literal>COMPAT_CLOUDABI32</literal> option present.</para>
+
       <para revision="315514" contrib="sponsor" sponsor="&yandex;">The
 	<literal>ipsec</literal> and <literal>tcpmd5</literal> kernel
 	modules have been added.</para>
@@ -473,6 +526,17 @@
       <para revision="308942">The &man.bytgpio.4; driver has been
 	added, providing support for Intel® Bay Trail™
 	SoC GPIO controllers.</para>
+
+      <para revision="312394"><filename>/dev/kmem</filename> no longer
+	supports access via <function>mmap()</function>.  Consumers
+	wishing to use <filename>/dev/kmem</filename> must use
+	<function>read()</function> and
+	<function>write()</function>.</para>
+
+      <para revision="306533" contrib="sponsor"
+	sponsor="&chelsio;">&man.devctl.8; now supports a "clear
+	driver" command as a complement to "set
+	driver".</para>
     </sect2>
 
     <sect2 xml:id="drivers-storage">
@@ -484,11 +548,42 @@
     <sect2 xml:id="drivers-network">
       <title>Network Drivers</title>
 
+      <para revision="306660" contrib="sponsor"
+	sponsor="&chelsio;">The &man.cxgbe.4; driver has been updated
+	to provide support for Virtual Function devices
+	(<acronym>VFs</acronym>) on Chelsio T4 and T5 adapters.</para>
+
+      <para revision="306661" contrib="sponsor"
+	sponsor="&chelsio;">TCP connections using the TCP Offload
+	Engine (<acronym>TOE</acronym>) on Chelsio T4+ adapters can
+	now perform zero-copy sends via
+	<function>aio_write()</function>.</para>
+
+      <para revision="306664" contrib="sponsor"
+	sponsor="&chelsio;">The &man.cxgbev.4; driver has been added,
+	providing support for Virtual Function devices
+	(<acronym>VFs</acronym>) on Chelsio T4 and T5 adapters.</para>
+
       <para revision="309377" contrib="sponsor"
 	sponsor="&broadcom;">The &man.bnxt.4; driver has been added,
 	providing support for Broadcom® NetXtreme-C™ and
 	NetXtreme-E™ devices.</para>
 
+      <para revision="309560" contrib="sponsor"
+	sponsor="&chelsio;">The &man.cxgbe.4; driver now supports
+	devices using T6-based adapters which support 10, 25, 40, and
+	100 Gbps.</para>
+
+      <para revision="309560" contrib="sponsor"
+	sponsor="&chelsio;">The &man.cxgbe.4; driver has been updated
+	to provide support for Virtual Function devices
+	(<acronym>VFs</acronym>) on Chelsio T6 adapters.</para>
+
+      <para revision="309560" contrib="sponsor"
+	sponsor="&chelsio;">The &man.cxgbev.4; driver has been updated
+	to provide support for Virtual Function devices
+	(<acronym>VFs</acronym>) on Chelsio T6 adapters.</para>
+
       <para revision="310852" contrib="sponsor"
 	sponsor="&netgate;">The &man.miibus.4; driver has been updated
 	to support Microchip/Micrel KSZ9031 Gigabit ethernet
@@ -511,6 +606,12 @@
 	sponsor="&netgate;">The &man.etherswitch.4; driver has been
 	updated to support RTL8366RB and RTL8366SR cards.</para>
 
+      <para revision="315514" contrib="sponsor" sponsor="&yandex;">The
+	&man.if.ipsec.4; virtual tunneling interface has been added,
+	implementing route-based <acronym>VPN</acronym>s protected
+	with Encapsulating Security Payload
+	(<acronym>ESP</acronym>).</para>
+
       <para revision="317116">The &man.qlnxe.4; driver has been added,
 	providing support for Cavium® Qlogic™ 45000 Series
 	adapters.</para>
@@ -535,12 +636,6 @@
     <sect2 xml:id="hardware-support">
       <title>Hardware Support</title>
 
-      <para revision="307144">The &man.cloudabi.4; driver has been
-	updated to allow running 32-bit binaries within 64-bit
-	userland environments when the kernel configuration file has
-	the <literal>COMPAT_CLOUDABI32</literal> option
-	present.</para>
-
       <para revision="307576">The &man.atkbdc.4; driver has been
 	updated to provide support for Elantech® trackpads.  To
 	enable hardware support, add
@@ -551,7 +646,35 @@
     <sect2 xml:id="hardware-virtualization">
       <title>Virtualization Support</title>
 
-      <para> </para>
+      <para revision="306471" contrib="sponsor"
+	sponsor="&chelsio;"><acronym>PCI</acronym> passthrough with
+	&man.bhyve.4; supports more dynamic configurations permitting
+	devices to be marked for passthrough or host use at
+	runtime.</para>
+
+      <para revision="306520" contrib="sponsor"
+	sponsor="&chelsio;"><acronym>PCI</acronym> passthrough with
+	&man.bhyve.4; resets functions via <acronym>FLR</acronym> when
+	a virtual machine is started and stopped.</para>
+
+      <para revision="309312" contrib="sponsor"
+	sponsor="&ms;"><acronym>PCI</acronym> passthrough support has
+	been enabled on &os; virtual machines running on
+	Microsoft® Hyper-V™.</para>
+
+      <para revision="314091" contrib="sponsor" sponsor="&ms;">The
+	&man.hv.netvsc.4; driver <acronym>SR-IOV</acronym>
+	implementation has been updated to support Virtual Function
+	(<acronym>VF</acronym>) devices, such as the Mellanox®
+	Connect-X3™ network card.</para>
+
+      <para revision="316272" contrib="sponsor" sponsor="&ms;">Support
+	for Microsoft® Hyper-V™ Generation 2 virtual
+	machines has been added.</para>
+
+      <para revision="317119" contrib="sponsor" sponsor="&ms;">Support
+	for synthetic keyboards has been added for virtual machines
+	running on Microsoft® Hyper-V™.</para>
     </sect2>
 
     <sect2 xml:id="hardware-arm">
@@ -587,7 +710,7 @@
     </sect2>
 
     <sect2 xml:id="storage-geom">
-      <title>&man.geom.4;</title>
+      <title><literal>geom(4)</literal></title>
 
       <para> </para>
     </sect2>
@@ -633,7 +756,7 @@
 	sponsor="&dellemc;">The network stack has been modified to fix
 	incorrect or invalid <acronym>IP</acronym> addresses if
 	multiple threads emit a <acronym>UDP</acronym>
-	<literal>log_in_vein</literal> message concurrently.</para>
+	<literal>log_in_vain</literal> message concurrently.</para>
 
       <para revision="317386" contrib="sponsor"
 	sponsor="&multiplay;">The <acronym>TCP</acronym> stack has
@@ -646,7 +769,8 @@
 
       <para revision="309337" contrib="sponsor"
 	sponsor="&dellemc;">Support for <acronym>GARP</acronym>
-	retransmit has been added.  A new &man.sysctl.8;,
+	(gratuitous <acronym>ARP</acronym>) retransmit has been added.
+	A new &man.sysctl.8;,
 	<literal>net.link.ether.inet.garp_rexmit_count</literal>, has
 	been added, which sets the maximum number of retransmissions
 	when set to a non-zero value.</para>

Modified: user/markj/PQ_LAUNDRY_11/sbin/dhclient/dhclient.c
==============================================================================
--- user/markj/PQ_LAUNDRY_11/sbin/dhclient/dhclient.c	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/sbin/dhclient/dhclient.c	Tue May 23 04:10:36 2017	(r318691)
@@ -107,7 +107,11 @@ struct pidfh *pidfile;
  */
 #define ASSERT_STATE(state_is, state_shouldbe) {}
 
-#define TIME_MAX 2147483647
+/*
+ * We need to check that the expiry, renewal and rebind times are not beyond
+ * the end of time (~2038 when a 32-bit time_t is being used).
+ */
+#define TIME_MAX        ((((time_t) 1 << (sizeof(time_t) * CHAR_BIT - 2)) - 1) * 2 + 1)
 
 int		log_priority;
 int		no_daemon;
@@ -762,15 +766,17 @@ dhcpack(struct packet *packet)
 	else
 		ip->client->new->expiry = default_lease_time;
 	/* A number that looks negative here is really just very large,
-	   because the lease expiry offset is unsigned. */
-	if (ip->client->new->expiry < 0)
-		ip->client->new->expiry = TIME_MAX;
+	   because the lease expiry offset is unsigned. Also make sure that
+           the addition of cur_time below does not overflow (a 32 bit) time_t. */
+	if (ip->client->new->expiry < 0 ||
+            ip->client->new->expiry > TIME_MAX - cur_time)
+		ip->client->new->expiry = TIME_MAX - cur_time;
 	/* XXX should be fixed by resetting the client state */
 	if (ip->client->new->expiry < 60)
 		ip->client->new->expiry = 60;
 
         /* Unless overridden in the config, take the server-provided renewal
-         * time if there is one; otherwise figure it out according to the spec.
+         * time if there is one. Otherwise figure it out according to the spec.
          * Also make sure the renewal time does not exceed the expiry time.
          */
         if (ip->client->config->default_actions[DHO_DHCP_RENEWAL_TIME] ==
@@ -782,7 +788,8 @@ dhcpack(struct packet *packet)
 		    ip->client->new->options[DHO_DHCP_RENEWAL_TIME].data);
 	else
 		ip->client->new->renewal = ip->client->new->expiry / 2;
-        if (ip->client->new->renewal > ip->client->new->expiry / 2)
+        if (ip->client->new->renewal < 0 ||
+            ip->client->new->renewal > ip->client->new->expiry / 2)
                 ip->client->new->renewal = ip->client->new->expiry / 2;
 
 	/* Same deal with the rebind time. */
@@ -794,20 +801,15 @@ dhcpack(struct packet *packet)
 		ip->client->new->rebind = getULong(
 		    ip->client->new->options[DHO_DHCP_REBINDING_TIME].data);
 	else
-		ip->client->new->rebind = ip->client->new->renewal * 7 / 4;
-        if (ip->client->new->rebind > ip->client->new->renewal * 7 / 4)
-                ip->client->new->rebind = ip->client->new->renewal * 7 / 4;
-
-	ip->client->new->expiry += cur_time;
-	/* Lease lengths can never be negative. */
-	if (ip->client->new->expiry < cur_time)
-		ip->client->new->expiry = TIME_MAX;
-	ip->client->new->renewal += cur_time;
-	if (ip->client->new->renewal < cur_time)
-		ip->client->new->renewal = TIME_MAX;
-	ip->client->new->rebind += cur_time;
-	if (ip->client->new->rebind < cur_time)
-		ip->client->new->rebind = TIME_MAX;
+		ip->client->new->rebind = ip->client->new->renewal / 4 * 7;
+	if (ip->client->new->rebind < 0 ||
+            ip->client->new->rebind > ip->client->new->renewal / 4 * 7)
+                ip->client->new->rebind = ip->client->new->renewal / 4 * 7;
+
+        /* Convert the time offsets into seconds-since-the-epoch */
+        ip->client->new->expiry += cur_time;
+        ip->client->new->renewal += cur_time;
+        ip->client->new->rebind += cur_time;
 
 	bind_lease(ip);
 }

Modified: user/markj/PQ_LAUNDRY_11/sbin/dhclient/options.c
==============================================================================
--- user/markj/PQ_LAUNDRY_11/sbin/dhclient/options.c	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/sbin/dhclient/options.c	Tue May 23 04:10:36 2017	(r318691)
@@ -783,7 +783,7 @@ pretty_print_option(unsigned int code, u
 				dp += 4;
 				break;
 			case 'L':
-				opcount = snprintf(op, opleft, "%ld",
+				opcount = snprintf(op, opleft, "%lu",
 				    (unsigned long)getULong(dp));
 				if (opcount >= opleft || opcount == -1)
 					goto toobig;
@@ -799,7 +799,7 @@ pretty_print_option(unsigned int code, u
 				dp += 2;
 				break;
 			case 'S':
-				opcount = snprintf(op, opleft, "%d",
+				opcount = snprintf(op, opleft, "%u",
 				    getUShort(dp));
 				if (opcount >= opleft || opcount == -1)
 					goto toobig;

Modified: user/markj/PQ_LAUNDRY_11/sbin/kldconfig/kldconfig.8
==============================================================================
--- user/markj/PQ_LAUNDRY_11/sbin/kldconfig/kldconfig.8	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/sbin/kldconfig/kldconfig.8	Tue May 23 04:10:36 2017	(r318691)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 15, 2001
+.Dd April 27, 2017
 .Dt KLDCONFIG 8
 .Os
 .Sh NAME
@@ -98,6 +98,7 @@ The default module search path used by t
 .Sh SEE ALSO
 .Xr kldload 2 ,
 .Xr kldload 8 ,
+.Xr kldxref 8 ,
 .Xr sysctl 8
 .Sh HISTORY
 The

Modified: user/markj/PQ_LAUNDRY_11/sbin/kldload/kldload.8
==============================================================================
--- user/markj/PQ_LAUNDRY_11/sbin/kldload/kldload.8	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/sbin/kldload/kldload.8	Tue May 23 04:10:36 2017	(r318691)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 18, 2012
+.Dd April 27, 2017
 .Dt KLDLOAD 8
 .Os
 .Sh NAME
@@ -116,7 +116,8 @@ Modules may also be auto-loaded through 
 .Xr security 7 ,
 .Xr kldconfig 8 ,
 .Xr kldstat 8 ,
-.Xr kldunload 8
+.Xr kldunload 8 ,
+.Xr kldxref 8
 .Sh HISTORY
 The
 .Nm

Modified: user/markj/PQ_LAUNDRY_11/sbin/mount/mount.8
==============================================================================
--- user/markj/PQ_LAUNDRY_11/sbin/mount/mount.8	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/sbin/mount/mount.8	Tue May 23 04:10:36 2017	(r318691)
@@ -28,7 +28,7 @@
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
 .\" $FreeBSD$
 .\"
-.Dd October 13, 2015
+.Dd March 22, 2017
 .Dt MOUNT 8
 .Os
 .Sh NAME
@@ -543,6 +543,7 @@ support for a particular file system mig
 .Xr nmount 2 ,
 .Xr acl 3 ,
 .Xr mac 4 ,
+.Xr cd9660 5 ,
 .Xr devfs 5 ,
 .Xr ext2fs 5 ,
 .Xr fstab 5 ,

Modified: user/markj/PQ_LAUNDRY_11/sbin/mount_cd9660/mount_cd9660.8
==============================================================================
--- user/markj/PQ_LAUNDRY_11/sbin/mount_cd9660/mount_cd9660.8	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/sbin/mount_cd9660/mount_cd9660.8	Tue May 23 04:10:36 2017	(r318691)
@@ -32,7 +32,7 @@
 .\"     @(#)mount_cd9660.8	8.3 (Berkeley) 3/27/94
 .\" $FreeBSD$
 .\"
-.Dd March 5, 2013
+.Dd March 22, 2017
 .Dt MOUNT_CD9660 8
 .Os
 .Sh NAME
@@ -138,6 +138,7 @@ The following command can be used to mou
 .Xr cdcontrol 1 ,
 .Xr mount 2 ,
 .Xr unmount 2 ,
+.Xr cd9660 5 ,
 .Xr fstab 5 ,
 .Xr mount 8
 .Sh HISTORY

Modified: user/markj/PQ_LAUNDRY_11/sbin/mount_nfs/mount_nfs.c
==============================================================================
--- user/markj/PQ_LAUNDRY_11/sbin/mount_nfs/mount_nfs.c	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/sbin/mount_nfs/mount_nfs.c	Tue May 23 04:10:36 2017	(r318691)
@@ -651,7 +651,7 @@ getnfsargs(char *spec, struct iovec **io
 
 	build_iovec(iov, iovlen, "hostname", nam, (size_t)-1);
 	/* Add mounted file system to PATH_MOUNTTAB */
-	if (!add_mtab(hostp, spec))
+	if (mountmode != V4 && !add_mtab(hostp, spec))
 		warnx("can't update %s for %s:%s", PATH_MOUNTTAB, hostp, spec);
 	return (1);
 }

Modified: user/markj/PQ_LAUNDRY_11/share/man/man3/intro.3
==============================================================================
--- user/markj/PQ_LAUNDRY_11/share/man/man3/intro.3	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/share/man/man3/intro.3	Tue May 23 04:10:36 2017	(r318691)
@@ -28,7 +28,7 @@
 .\"     @(#)intro.3	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd June 5, 1993
+.Dd March 22, 2017
 .Dt INTRO 3
 .Os
 .Sh NAME
@@ -40,26 +40,16 @@ library functions, their error returns a
 common definitions and concepts.
 Most of these functions are available from the C library,
 .Em libc .
-.\" (see
-.\" .Xr libc 3 ) .
 Other libraries, such as the math library,
 .Em libm ,
 must be indicated at compile time with the
 .Fl l
 option of the compiler.
-.\" .Pp
-.\" A subset of the
-.\" .Xr libc functions
-.\" are available from Fortran;
-.\" they are described separately in
-.\" .Xr intro 3f .
 .Pp
 The various libraries (followed by the loader flag):
 .Bl -tag -width "libc (-lc)"
-.It Xr libc Pq Fl l Ns Ar c
+.It Em libc Pq Fl l Ns Ar c
 Standard C library functions.
-.\" (See
-.\" .Xr libc 3 . )
 When using the C compiler
 .Xr cc 1 ,
 it is not necessary
@@ -67,8 +57,8 @@ to supply the loader flag
 .Fl l Ns Ar c
 for these functions.
 There are several `libraries' or groups of functions included inside of
-.Xr libc :
-the standard
+.Em libc
+: the standard
 .Tn I/O
 routines,
 database routines,
@@ -77,12 +67,12 @@ string operators,
 character tests and character operators,
 des encryption routines,
 storage allocation, time functions, signal handling and more.
-.It Xr libcurses Pq Fl l Ns Ar curses Fl l Ns Ar termcap
+.It Em libcurses Pq Fl l Ns Ar curses Fl l Ns Ar termcap
 Terminal independent screen management routines
 for two dimensional non-bitmap display terminals.
 (See
 .Xr ncurses 3 . )
-.It Xr libcompat Pq Fl l Ns Ar compat
+.It Em libcompat Pq Fl l Ns Ar compat
 Functions which are obsolete but are available for compatibility with
 .Bx 4.3 .
 In particular,
@@ -92,45 +82,30 @@ have been included for source code compa
 Use of these routines should, for the most part, be avoided.
 The manual page entry for each compatibility routine
 indicates the proper interface to use.
-.It Xr libkvm Pq Fl l Ns Ar kvm
+.It Em libkvm Pq Fl l Ns Ar kvm
 Functions used to access kernel memory are in this library.
 They can be used
 against both a running system and a crash dump.
 (See
 .Xr kvm 3 . )
-.It Xr libl Pq Fl l Ns Ar l
+.It Em libl Pq Fl l Ns Ar l
 The library for
 .Xr lex 1 .
-.\" .It Xr libln
-.It Xr libm Pq Fl l Ns Ar m
+.It Em libm Pq Fl l Ns Ar m
 The math library,
 .Em libm .
 The math library is loaded as needed by the Pascal compiler,
-.\" .Xr pc 1 ,
 but not by the C compiler which requires the
 .Fl l Ns Ar m
 flag.
 (See
 .Xr math 3 . )
-.It Xr libmp Pq Fl l Ns Ar mp
-.\" .It Xr libom
-.\" Old math library.
-.\" .It Xr libplot Pq Fl l Ns Ar plot
-.\" Device independent plotting functions.
-.\" (See
-.\" .Xr plot 3 . )
-.\" .It Xr libplotf77 Pq Fl l Ns Ar plotf77
-.\" The device independent plotting functions for fortran.
-.\" (See
-.\" .Xr plot 3 . )
-.\" .It Xr libresolv Pq Fl l Ns Ar resolv
-.\" Routines for network address resolution.
-.It Xr libtermcap Pq Fl l Ns Ar termcap
+.It Em libmp Pq Fl l Ns Ar mp
+.It Em libtermcap Pq Fl l Ns Ar termcap
 The terminal independent operation library package.
 (See
 .Xr termcap 3 . )
-.\" .It libvt0.a
-.It Xr liby Pq Fl l Ns Ar y
+.It Em liby Pq Fl l Ns Ar y
 The library for
 .Xr yacc 1 .
 .El
@@ -146,17 +121,12 @@ the math library
 the math library compiled for profiling
 .El
 .Sh SEE ALSO
-.\" .Xr libc 3 ,
 .Xr cc 1 ,
 .Xr ld 1 ,
 .Xr nm 1 ,
 .Xr intro 2 ,
 .Xr math 3 ,
 .Xr stdio 3
-.\" .Sh LIST OF FUNCTIONS
-.\" .Bl -column "strncasecmpxxx" "system"
-.\" .Sy Name	Description
-.\" .El
 .Sh HISTORY
 An
 .Nm

Modified: user/markj/PQ_LAUNDRY_11/share/man/man4/geom.4
==============================================================================
--- user/markj/PQ_LAUNDRY_11/share/man/man4/geom.4	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/share/man/man4/geom.4	Tue May 23 04:10:36 2017	(r318691)
@@ -34,7 +34,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 8, 2015
+.Dd April 20, 2017
 .Dt GEOM 4
 .Os
 .Sh NAME
@@ -55,6 +55,7 @@
 .Cd options GEOM_MAP
 .Cd options GEOM_MBR
 .Cd options GEOM_MIRROR
+.Cd options GEOM_MOUNTVER
 .Cd options GEOM_MULTIPATH
 .Cd options GEOM_NOP
 .Cd options GEOM_PART_APM

Modified: user/markj/PQ_LAUNDRY_11/share/man/man4/u3g.4
==============================================================================
--- user/markj/PQ_LAUNDRY_11/share/man/man4/u3g.4	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/share/man/man4/u3g.4	Tue May 23 04:10:36 2017	(r318691)
@@ -18,7 +18,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 26, 2013
+.Dd April 26, 2017
 .Dt U3G 4
 .Os
 .Sh NAME
@@ -97,6 +97,20 @@ See
 .Xr usbconfig 8
 and
 .Xr usb_quirk 4 .
+.Sh FILES
+.Bl -tag -width "/dev/ttyU*.*.init" -compact
+.It Pa /dev/ttyU*.*
+for callin ports
+.It Pa /dev/ttyU*.*.init
+.It Pa /dev/ttyU*.*.lock
+corresponding callin initial-state and lock-state devices
+.Pp
+.It Pa /dev/cuaU*.*
+for callout ports
+.It Pa /dev/cuaU*.*.init
+.It Pa /dev/cuaU*.*.lock
+corresponding callout initial-state and lock-state devices
+.El
 .Sh SEE ALSO
 .Xr tty 4 ,
 .Xr ucom 4 ,

Modified: user/markj/PQ_LAUNDRY_11/share/man/man4/uark.4
==============================================================================
--- user/markj/PQ_LAUNDRY_11/share/man/man4/uark.4	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/share/man/man4/uark.4	Tue May 23 04:10:36 2017	(r318691)
@@ -16,7 +16,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 20, 2011
+.Dd April 26, 2017
 .Dt UARK 4
 .Os
 .Sh NAME
@@ -57,6 +57,20 @@ KQ-U8A Data Cable
 .It
 Skymaster USB to RS232
 .El
+.Sh FILES
+.Bl -tag -width "/dev/ttyU*.init" -compact
+.It Pa /dev/ttyU*
+for callin ports
+.It Pa /dev/ttyU*.init
+.It Pa /dev/ttyU*.lock
+corresponding callin initial-state and lock-state devices
+.Pp
+.It Pa /dev/cuaU*
+for callout ports
+.It Pa /dev/cuaU*.init
+.It Pa /dev/cuaU*.lock
+corresponding callout initial-state and lock-state devices
+.El
 .Sh SEE ALSO
 .Xr tty 4 ,
 .Xr ucom 4 ,

Modified: user/markj/PQ_LAUNDRY_11/share/man/man4/uart.4
==============================================================================
--- user/markj/PQ_LAUNDRY_11/share/man/man4/uart.4	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/share/man/man4/uart.4	Tue May 23 04:10:36 2017	(r318691)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 9, 2015
+.Dd April 26, 2017
 .Dt UART 4
 .Os
 .Sh NAME
@@ -226,7 +226,7 @@ level signal at up to 12 volts.
 A connection to header pins or an edge-connector on an embedded board
 is typically a TTL signal at 3.3 or 5 volts.
 .Sh FILES
-.Bl -tag -width ".Pa /dev/ttyu?.init" -compact
+.Bl -tag -width "/dev/ttyu?.init" -compact
 .It Pa /dev/ttyu?
 for callin ports
 .It Pa /dev/ttyu?.init

Modified: user/markj/PQ_LAUNDRY_11/share/man/man4/ubsa.4
==============================================================================
--- user/markj/PQ_LAUNDRY_11/share/man/man4/ubsa.4	Tue May 23 03:48:42 2017	(r318690)
+++ user/markj/PQ_LAUNDRY_11/share/man/man4/ubsa.4	Tue May 23 04:10:36 2017	(r318691)
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 20, 2011
+.Dd April 26, 2017
 .Dt UBSA 4
 .Os
 .Sh NAME
@@ -81,6 +81,20 @@ GoHubs GoCOM232
 .It

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

More information about the svn-src-user mailing list