svn commit: r308317 - in user/alc/PQ_LAUNDRY: . bin/freebsd-version bin/sh/tests/execution cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/opensolaris/lib/libzfs_core/common contrib/hyperv/...

Fri Nov 4 21:10:06 UTC 2016

Author: markj
Date: Fri Nov  4 21:10:02 2016
New Revision: 308317
URL: https://svnweb.freebsd.org/changeset/base/308317

Log:
  MFH r308315

Added:
  user/alc/PQ_LAUNDRY/bin/sh/tests/execution/set-C1.0
     - copied unchanged from r308315, head/bin/sh/tests/execution/set-C1.0
  user/alc/PQ_LAUNDRY/contrib/tzdata/CONTRIBUTING
     - copied unchanged from r308315, head/contrib/tzdata/CONTRIBUTING
  user/alc/PQ_LAUNDRY/contrib/tzdata/LICENSE
     - copied unchanged from r308315, head/contrib/tzdata/LICENSE
  user/alc/PQ_LAUNDRY/contrib/tzdata/Makefile
     - copied unchanged from r308315, head/contrib/tzdata/Makefile
  user/alc/PQ_LAUNDRY/contrib/tzdata/NEWS
     - copied unchanged from r308315, head/contrib/tzdata/NEWS
  user/alc/PQ_LAUNDRY/contrib/tzdata/README
     - copied unchanged from r308315, head/contrib/tzdata/README
  user/alc/PQ_LAUNDRY/contrib/tzdata/Theory
     - copied unchanged from r308315, head/contrib/tzdata/Theory
  user/alc/PQ_LAUNDRY/contrib/tzdata/backzone
     - copied unchanged from r308315, head/contrib/tzdata/backzone
  user/alc/PQ_LAUNDRY/contrib/tzdata/checklinks.awk
     - copied unchanged from r308315, head/contrib/tzdata/checklinks.awk
  user/alc/PQ_LAUNDRY/contrib/tzdata/checktab.awk
     - copied unchanged from r308315, head/contrib/tzdata/checktab.awk
  user/alc/PQ_LAUNDRY/contrib/tzdata/leapseconds.awk
     - copied unchanged from r308315, head/contrib/tzdata/leapseconds.awk
  user/alc/PQ_LAUNDRY/contrib/tzdata/version
     - copied unchanged from r308315, head/contrib/tzdata/version
  user/alc/PQ_LAUNDRY/contrib/tzdata/zoneinfo2tdf.pl
     - copied unchanged from r308315, head/contrib/tzdata/zoneinfo2tdf.pl
  user/alc/PQ_LAUNDRY/lib/libc/gen/basename_compat.c
     - copied unchanged from r308315, head/lib/libc/gen/basename_compat.c
  user/alc/PQ_LAUNDRY/lib/libc/locale/endian.h
     - copied unchanged from r308315, head/lib/libc/locale/endian.h
  user/alc/PQ_LAUNDRY/sbin/zfsbootcfg/
     - copied from r308315, head/sbin/zfsbootcfg/
  user/alc/PQ_LAUNDRY/share/man/man4/chromebook_platform.4
     - copied unchanged from r308315, head/share/man/man4/chromebook_platform.4
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/a31_dmac.c
     - copied unchanged from r308315, head/sys/arm/allwinner/a31_dmac.c
  user/alc/PQ_LAUNDRY/sys/arm/nvidia/tegra_mc.c
     - copied unchanged from r308315, head/sys/arm/nvidia/tegra_mc.c
  user/alc/PQ_LAUNDRY/sys/dev/chromebook_platform/
     - copied from r308315, head/sys/dev/chromebook_platform/
  user/alc/PQ_LAUNDRY/sys/dev/gpio/bytgpio.c
     - copied unchanged from r308315, head/sys/dev/gpio/bytgpio.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hn_rndis.c
     - copied unchanged from r308315, head/sys/dev/hyperv/netvsc/hn_rndis.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/if_hn.c
     - copied unchanged from r308315, head/sys/dev/hyperv/netvsc/if_hn.c
  user/alc/PQ_LAUNDRY/sys/dev/sdhci/fsl_sdhci.c
     - copied unchanged from r308315, head/sys/dev/sdhci/fsl_sdhci.c
  user/alc/PQ_LAUNDRY/sys/dev/xen/gntdev/
     - copied from r308315, head/sys/dev/xen/gntdev/
  user/alc/PQ_LAUNDRY/sys/modules/chromebook_platform/
     - copied from r308315, head/sys/modules/chromebook_platform/
  user/alc/PQ_LAUNDRY/sys/xen/gntdev.h
     - copied unchanged from r308315, head/sys/xen/gntdev.h
  user/alc/PQ_LAUNDRY/tests/sys/kern/coredump_phnum_helper.c
     - copied unchanged from r308315, head/tests/sys/kern/coredump_phnum_helper.c
  user/alc/PQ_LAUNDRY/tests/sys/kern/coredump_phnum_test.sh
     - copied unchanged from r308315, head/tests/sys/kern/coredump_phnum_test.sh
  user/alc/PQ_LAUNDRY/usr.sbin/cpucontrol/amd10h.c
     - copied unchanged from r308315, head/usr.sbin/cpucontrol/amd10h.c
Deleted:
  user/alc/PQ_LAUNDRY/sys/arm/freescale/imx/imx_sdhci.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_rndis_filter.c
  user/alc/PQ_LAUNDRY/sys/powerpc/mpc85xx/fsl_sdhc.c
  user/alc/PQ_LAUNDRY/sys/powerpc/mpc85xx/fsl_sdhc.h
Modified:
  user/alc/PQ_LAUNDRY/Makefile
  user/alc/PQ_LAUNDRY/Makefile.inc1
  user/alc/PQ_LAUNDRY/UPDATING
  user/alc/PQ_LAUNDRY/bin/freebsd-version/freebsd-version.sh.in
  user/alc/PQ_LAUNDRY/bin/sh/tests/execution/Makefile
  user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
  user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h
  user/alc/PQ_LAUNDRY/contrib/hyperv/tools/hv_kvp_daemon.c
  user/alc/PQ_LAUNDRY/contrib/netbsd-tests/lib/libc/stdio/t_printf.c
  user/alc/PQ_LAUNDRY/contrib/tzdata/antarctica
  user/alc/PQ_LAUNDRY/contrib/tzdata/asia
  user/alc/PQ_LAUNDRY/contrib/tzdata/australasia
  user/alc/PQ_LAUNDRY/contrib/tzdata/europe
  user/alc/PQ_LAUNDRY/contrib/tzdata/zone.tab
  user/alc/PQ_LAUNDRY/contrib/tzdata/zone1970.tab
  user/alc/PQ_LAUNDRY/crypto/openssh/kex.c
  user/alc/PQ_LAUNDRY/etc/Makefile
  user/alc/PQ_LAUNDRY/etc/devd/usb.conf
  user/alc/PQ_LAUNDRY/etc/mtree/BSD.root.dist
  user/alc/PQ_LAUNDRY/etc/syslog.conf
  user/alc/PQ_LAUNDRY/gnu/lib/Makefile
  user/alc/PQ_LAUNDRY/gnu/lib/libgcc/Makefile
  user/alc/PQ_LAUNDRY/gnu/usr.bin/binutils/Makefile.inc0
  user/alc/PQ_LAUNDRY/gnu/usr.bin/binutils/ld/Makefile.mips
  user/alc/PQ_LAUNDRY/gnu/usr.bin/binutils/libbfd/Makefile.mips
  user/alc/PQ_LAUNDRY/gnu/usr.bin/cc/Makefile.inc
  user/alc/PQ_LAUNDRY/gnu/usr.bin/cc/Makefile.tgt
  user/alc/PQ_LAUNDRY/gnu/usr.bin/gdb/Makefile.inc
  user/alc/PQ_LAUNDRY/gnu/usr.bin/gdb/libgdb/Makefile
  user/alc/PQ_LAUNDRY/include/libgen.h
  user/alc/PQ_LAUNDRY/include/limits.h
  user/alc/PQ_LAUNDRY/lib/Makefile
  user/alc/PQ_LAUNDRY/lib/libc/Makefile
  user/alc/PQ_LAUNDRY/lib/libc/gen/Makefile.inc
  user/alc/PQ_LAUNDRY/lib/libc/gen/Symbol.map
  user/alc/PQ_LAUNDRY/lib/libc/gen/basename.3
  user/alc/PQ_LAUNDRY/lib/libc/gen/basename.c
  user/alc/PQ_LAUNDRY/lib/libc/gen/sysctl.3
  user/alc/PQ_LAUNDRY/lib/libc/locale/collate.c
  user/alc/PQ_LAUNDRY/lib/libc/locale/rune.c
  user/alc/PQ_LAUNDRY/lib/libc/mips/Makefile.inc
  user/alc/PQ_LAUNDRY/lib/libc/mips/Symbol.map
  user/alc/PQ_LAUNDRY/lib/libc/mips/gen/Makefile.inc
  user/alc/PQ_LAUNDRY/lib/libc/mips/gen/flt_rounds.c
  user/alc/PQ_LAUNDRY/lib/libc/powerpcspe/gen/setjmp.S
  user/alc/PQ_LAUNDRY/lib/libc/powerpcspe/gen/sigsetjmp.S
  user/alc/PQ_LAUNDRY/lib/libc/stdio/printf-pos.c
  user/alc/PQ_LAUNDRY/lib/libcompiler_rt/Makefile.inc
  user/alc/PQ_LAUNDRY/lib/libgcc_eh/Makefile.inc
  user/alc/PQ_LAUNDRY/lib/libgcc_s/Version.map
  user/alc/PQ_LAUNDRY/lib/libstand/bootp.c
  user/alc/PQ_LAUNDRY/lib/msun/ld80/k_expl.h
  user/alc/PQ_LAUNDRY/lib/msun/ld80/s_logl.c
  user/alc/PQ_LAUNDRY/lib/msun/mips/Makefile.inc
  user/alc/PQ_LAUNDRY/lib/msun/mips/Symbol.map
  user/alc/PQ_LAUNDRY/lib/msun/mips/fenv.c
  user/alc/PQ_LAUNDRY/lib/msun/mips/fenv.h
  user/alc/PQ_LAUNDRY/lib/msun/riscv/Makefile.inc
  user/alc/PQ_LAUNDRY/libexec/ftpd/blacklist.c
  user/alc/PQ_LAUNDRY/libexec/ftpd/blacklist_client.h
  user/alc/PQ_LAUNDRY/libexec/ftpd/ftpd.8
  user/alc/PQ_LAUNDRY/libexec/ftpd/ftpd.c
  user/alc/PQ_LAUNDRY/release/arm64/make-memstick.sh
  user/alc/PQ_LAUNDRY/release/tools/vagrant-virtualbox.conf
  user/alc/PQ_LAUNDRY/sbin/Makefile
  user/alc/PQ_LAUNDRY/sbin/geom/class/eli/geom_eli.c
  user/alc/PQ_LAUNDRY/sbin/ifconfig/ifieee80211.c
  user/alc/PQ_LAUNDRY/share/examples/Makefile
  user/alc/PQ_LAUNDRY/share/man/man4/cyapa.4
  user/alc/PQ_LAUNDRY/share/man/man4/ig4.4
  user/alc/PQ_LAUNDRY/share/man/man4/isl.4
  user/alc/PQ_LAUNDRY/share/man/man4/smb.4
  user/alc/PQ_LAUNDRY/share/man/man4/ure.4
  user/alc/PQ_LAUNDRY/share/man/man7/arch.7
  user/alc/PQ_LAUNDRY/share/mk/bsd.cpu.mk
  user/alc/PQ_LAUNDRY/share/mk/bsd.endian.mk
  user/alc/PQ_LAUNDRY/share/mk/bsd.lib.mk
  user/alc/PQ_LAUNDRY/share/mk/bsd.prog.mk
  user/alc/PQ_LAUNDRY/share/mk/bsd.stand.mk
  user/alc/PQ_LAUNDRY/share/mk/sys.mk
  user/alc/PQ_LAUNDRY/sys/amd64/conf/GENERIC
  user/alc/PQ_LAUNDRY/sys/amd64/conf/GENERIC-NODEBUG
  user/alc/PQ_LAUNDRY/sys/amd64/include/pmap.h
  user/alc/PQ_LAUNDRY/sys/amd64/include/smp.h
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/a10_codec.c
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/a10_dmac.c
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/aw_cir.c
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/aw_thermal.c
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/axp209.c
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/axp209reg.h
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/clk/aw_ahbclk.c
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/clk/aw_modclk.c
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/clk/aw_pll.c
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/files.allwinner
  user/alc/PQ_LAUNDRY/sys/arm/arm/pmap-v6.c
  user/alc/PQ_LAUNDRY/sys/arm/conf/GENERIC
  user/alc/PQ_LAUNDRY/sys/arm/freescale/imx/files.imx5
  user/alc/PQ_LAUNDRY/sys/arm/freescale/imx/files.imx6
  user/alc/PQ_LAUNDRY/sys/arm/include/cpu-v6.h
  user/alc/PQ_LAUNDRY/sys/arm/include/sysreg.h
  user/alc/PQ_LAUNDRY/sys/arm/nvidia/tegra124/files.tegra124
  user/alc/PQ_LAUNDRY/sys/arm/nvidia/tegra124/tegra124_car.c
  user/alc/PQ_LAUNDRY/sys/arm/nvidia/tegra124/tegra124_clk_per.c
  user/alc/PQ_LAUNDRY/sys/arm/nvidia/tegra124/tegra124_clk_pll.c
  user/alc/PQ_LAUNDRY/sys/boot/Makefile.ficl
  user/alc/PQ_LAUNDRY/sys/boot/common/Makefile.inc
  user/alc/PQ_LAUNDRY/sys/boot/efi/Makefile.inc
  user/alc/PQ_LAUNDRY/sys/boot/efi/libefi/efinet.c
  user/alc/PQ_LAUNDRY/sys/boot/efi/loader/main.c
  user/alc/PQ_LAUNDRY/sys/boot/fdt/dts/arm/bananapim2.dts
  user/alc/PQ_LAUNDRY/sys/boot/i386/common/drv.c
  user/alc/PQ_LAUNDRY/sys/boot/i386/common/drv.h
  user/alc/PQ_LAUNDRY/sys/boot/i386/gptzfsboot/Makefile
  user/alc/PQ_LAUNDRY/sys/boot/i386/zfsboot/Makefile
  user/alc/PQ_LAUNDRY/sys/boot/i386/zfsboot/zfsboot.c
  user/alc/PQ_LAUNDRY/sys/boot/mips/uboot/Makefile
  user/alc/PQ_LAUNDRY/sys/cam/cam_ccb.h
  user/alc/PQ_LAUNDRY/sys/cam/cam_periph.c
  user/alc/PQ_LAUNDRY/sys/cam/cam_xpt.c
  user/alc/PQ_LAUNDRY/sys/cam/ctl/ctl.c
  user/alc/PQ_LAUNDRY/sys/cam/ctl/ctl_ioctl.h
  user/alc/PQ_LAUNDRY/sys/cam/scsi/scsi_all.c
  user/alc/PQ_LAUNDRY/sys/cam/scsi/scsi_da.c
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  user/alc/PQ_LAUNDRY/sys/conf/NOTES
  user/alc/PQ_LAUNDRY/sys/conf/files
  user/alc/PQ_LAUNDRY/sys/conf/files.amd64
  user/alc/PQ_LAUNDRY/sys/conf/files.i386
  user/alc/PQ_LAUNDRY/sys/conf/files.powerpc
  user/alc/PQ_LAUNDRY/sys/conf/kern.mk
  user/alc/PQ_LAUNDRY/sys/conf/options
  user/alc/PQ_LAUNDRY/sys/dev/aacraid/aacraid_pci.c
  user/alc/PQ_LAUNDRY/sys/dev/ath/if_ath_rx.c
  user/alc/PQ_LAUNDRY/sys/dev/atkbdc/atkbd.c
  user/alc/PQ_LAUNDRY/sys/dev/atkbdc/atkbd_atkbdc.c
  user/alc/PQ_LAUNDRY/sys/dev/atkbdc/psm.c
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/bhnd_debug.h
  user/alc/PQ_LAUNDRY/sys/dev/cpuctl/cpuctl.c
  user/alc/PQ_LAUNDRY/sys/dev/cxgbe/common/t4_hw.c
  user/alc/PQ_LAUNDRY/sys/dev/cyapa/cyapa.c
  user/alc/PQ_LAUNDRY/sys/dev/e1000/if_em.c
  user/alc/PQ_LAUNDRY/sys/dev/extres/clk/clk.c
  user/alc/PQ_LAUNDRY/sys/dev/extres/clk/clk.h
  user/alc/PQ_LAUNDRY/sys/dev/hwpmc/hwpmc_amd.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/include/hyperv.h
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/include/vmbus.h
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/if_hnvar.h
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/utilities/hv_kvp.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/utilities/hv_kvp.h
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/utilities/hv_utilreg.h
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/vmbus.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/vmbus_chan.c
  user/alc/PQ_LAUNDRY/sys/dev/ichiic/ig4_iic.c
  user/alc/PQ_LAUNDRY/sys/dev/ichiic/ig4_pci.c
  user/alc/PQ_LAUNDRY/sys/dev/ichiic/ig4_reg.h
  user/alc/PQ_LAUNDRY/sys/dev/ichiic/ig4_var.h
  user/alc/PQ_LAUNDRY/sys/dev/iicbus/iicbus.c
  user/alc/PQ_LAUNDRY/sys/dev/ioat/ioat.c
  user/alc/PQ_LAUNDRY/sys/dev/ioat/ioat_internal.h
  user/alc/PQ_LAUNDRY/sys/dev/isl/isl.c
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwm.c
  user/alc/PQ_LAUNDRY/sys/dev/mii/miidevs
  user/alc/PQ_LAUNDRY/sys/dev/mii/rgephy.c
  user/alc/PQ_LAUNDRY/sys/dev/mii/rgephyreg.h
  user/alc/PQ_LAUNDRY/sys/dev/mpr/mpr.c
  user/alc/PQ_LAUNDRY/sys/dev/mpr/mpr_sas.c
  user/alc/PQ_LAUNDRY/sys/dev/mpr/mpr_sas_lsi.c
  user/alc/PQ_LAUNDRY/sys/dev/mpr/mprvar.h
  user/alc/PQ_LAUNDRY/sys/dev/mps/mps.c
  user/alc/PQ_LAUNDRY/sys/dev/mps/mps_sas.c
  user/alc/PQ_LAUNDRY/sys/dev/mps/mps_sas_lsi.c
  user/alc/PQ_LAUNDRY/sys/dev/mps/mpsvar.h
  user/alc/PQ_LAUNDRY/sys/dev/sdhci/sdhci.c
  user/alc/PQ_LAUNDRY/sys/dev/smbus/smb.c
  user/alc/PQ_LAUNDRY/sys/dev/smbus/smb.h
  user/alc/PQ_LAUNDRY/sys/dev/smbus/smbconf.h
  user/alc/PQ_LAUNDRY/sys/dev/smbus/smbus.c
  user/alc/PQ_LAUNDRY/sys/dev/smbus/smbus_if.m
  user/alc/PQ_LAUNDRY/sys/dev/usb/input/ums.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/net/if_ure.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/net/if_urereg.h
  user/alc/PQ_LAUNDRY/sys/dev/xen/netfront/netfront.c
  user/alc/PQ_LAUNDRY/sys/fs/nfsserver/nfs_nfsdport.c
  user/alc/PQ_LAUNDRY/sys/geom/eli/g_eli.h
  user/alc/PQ_LAUNDRY/sys/geom/eli/g_eli_integrity.c
  user/alc/PQ_LAUNDRY/sys/geom/geom_dev.c
  user/alc/PQ_LAUNDRY/sys/geom/geom_disk.c
  user/alc/PQ_LAUNDRY/sys/geom/geom_io.c
  user/alc/PQ_LAUNDRY/sys/geom/geom_subr.c
  user/alc/PQ_LAUNDRY/sys/geom/geom_vfs.c
  user/alc/PQ_LAUNDRY/sys/geom/part/g_part.c
  user/alc/PQ_LAUNDRY/sys/kern/kern_synch.c
  user/alc/PQ_LAUNDRY/sys/kern/subr_witness.c
  user/alc/PQ_LAUNDRY/sys/kern/vfs_bio.c
  user/alc/PQ_LAUNDRY/sys/kern/vfs_cluster.c
  user/alc/PQ_LAUNDRY/sys/kern/vfs_lookup.c
  user/alc/PQ_LAUNDRY/sys/kern/vfs_syscalls.c
  user/alc/PQ_LAUNDRY/sys/mips/include/float.h
  user/alc/PQ_LAUNDRY/sys/mips/mips/exception.S
  user/alc/PQ_LAUNDRY/sys/mips/mips/locore.S
  user/alc/PQ_LAUNDRY/sys/mips/mips/swtch.S
  user/alc/PQ_LAUNDRY/sys/mips/mips/trap.c
  user/alc/PQ_LAUNDRY/sys/modules/Makefile
  user/alc/PQ_LAUNDRY/sys/modules/dtrace/dtrace/Makefile
  user/alc/PQ_LAUNDRY/sys/modules/geom/Makefile
  user/alc/PQ_LAUNDRY/sys/modules/hyperv/netvsc/Makefile
  user/alc/PQ_LAUNDRY/sys/modules/i2c/controllers/ichiic/Makefile
  user/alc/PQ_LAUNDRY/sys/modules/i2c/cyapa/Makefile
  user/alc/PQ_LAUNDRY/sys/modules/i2c/isl/Makefile
  user/alc/PQ_LAUNDRY/sys/netinet/cc/cc_cdg.c
  user/alc/PQ_LAUNDRY/sys/netinet/cc/cc_chd.c
  user/alc/PQ_LAUNDRY/sys/netinet/cc/cc_dctcp.c
  user/alc/PQ_LAUNDRY/sys/netinet/cc/cc_htcp.c
  user/alc/PQ_LAUNDRY/sys/netinet/cc/cc_newreno.c
  user/alc/PQ_LAUNDRY/sys/netinet/tcp_input.c
  user/alc/PQ_LAUNDRY/sys/netpfil/ipfw/ip_fw_pfil.c
  user/alc/PQ_LAUNDRY/sys/powerpc/include/cpu.h
  user/alc/PQ_LAUNDRY/sys/powerpc/include/spr.h
  user/alc/PQ_LAUNDRY/sys/powerpc/powerpc/cpu.c
  user/alc/PQ_LAUNDRY/sys/riscv/include/asm.h
  user/alc/PQ_LAUNDRY/sys/riscv/include/float.h
  user/alc/PQ_LAUNDRY/sys/riscv/riscv/locore.S
  user/alc/PQ_LAUNDRY/sys/sys/bio.h
  user/alc/PQ_LAUNDRY/sys/sys/buf.h
  user/alc/PQ_LAUNDRY/sys/sys/namei.h
  user/alc/PQ_LAUNDRY/sys/ufs/ffs/ffs_subr.c
  user/alc/PQ_LAUNDRY/sys/ufs/ffs/ffs_vfsops.c
  user/alc/PQ_LAUNDRY/sys/vm/device_pager.c
  user/alc/PQ_LAUNDRY/sys/vm/vm_fault.c
  user/alc/PQ_LAUNDRY/sys/vm/vm_page.c
  user/alc/PQ_LAUNDRY/sys/vm/vm_pager.c
  user/alc/PQ_LAUNDRY/sys/vm/vm_pager.h
  user/alc/PQ_LAUNDRY/sys/x86/x86/busdma_machdep.c
  user/alc/PQ_LAUNDRY/sys/x86/xen/xen_intr.c
  user/alc/PQ_LAUNDRY/sys/xen/xen_intr.h
  user/alc/PQ_LAUNDRY/tests/sys/kern/Makefile
  user/alc/PQ_LAUNDRY/usr.bin/calendar/Makefile
  user/alc/PQ_LAUNDRY/usr.bin/fortune/datfiles/fortunes
  user/alc/PQ_LAUNDRY/usr.bin/sed/compile.c
  user/alc/PQ_LAUNDRY/usr.sbin/autofs/autounmountd.c
  user/alc/PQ_LAUNDRY/usr.sbin/cpucontrol/Makefile
  user/alc/PQ_LAUNDRY/usr.sbin/cpucontrol/amd.h
  user/alc/PQ_LAUNDRY/usr.sbin/cpucontrol/cpucontrol.c
  user/alc/PQ_LAUNDRY/usr.sbin/cron/cron/cron.8
  user/alc/PQ_LAUNDRY/usr.sbin/cron/cron/cron.h
  user/alc/PQ_LAUNDRY/usr.sbin/cron/cron/database.c
  user/alc/PQ_LAUNDRY/usr.sbin/cron/cron/pathnames.h
  user/alc/PQ_LAUNDRY/usr.sbin/cron/lib/misc.c
  user/alc/PQ_LAUNDRY/usr.sbin/ctld/ctld.c
  user/alc/PQ_LAUNDRY/usr.sbin/rtadvd/if.c
  user/alc/PQ_LAUNDRY/usr.sbin/syslogd/syslog.conf.5
  user/alc/PQ_LAUNDRY/usr.sbin/syslogd/syslogd.c
  user/alc/PQ_LAUNDRY/usr.sbin/vidcontrol/vidcontrol.c
Directory Properties:
  user/alc/PQ_LAUNDRY/   (props changed)
  user/alc/PQ_LAUNDRY/cddl/   (props changed)
  user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/   (props changed)
  user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  user/alc/PQ_LAUNDRY/contrib/netbsd-tests/   (props changed)
  user/alc/PQ_LAUNDRY/contrib/tzdata/   (props changed)
  user/alc/PQ_LAUNDRY/crypto/openssh/   (props changed)
  user/alc/PQ_LAUNDRY/gnu/lib/   (props changed)
  user/alc/PQ_LAUNDRY/gnu/usr.bin/binutils/   (props changed)
  user/alc/PQ_LAUNDRY/gnu/usr.bin/gdb/   (props changed)
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/   (props changed)

Modified: user/alc/PQ_LAUNDRY/Makefile
==============================================================================

--- user/alc/PQ_LAUNDRY/Makefile	Fri Nov  4 21:02:33 2016	(r308316)
+++ user/alc/PQ_LAUNDRY/Makefile	Fri Nov  4 21:10:02 2016	(r308317)
@@ -239,7 +239,7 @@ _MAKE+=	MK_META_MODE=no
 _TARGET_ARCH=	${TARGET:S/pc98/i386/:S/arm64/aarch64/}
 .elif !defined(TARGET) && defined(TARGET_ARCH) && \
     ${TARGET_ARCH} != ${MACHINE_ARCH}
-_TARGET=		${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/:C/powerpcspe/powerpc/:C/riscv64/riscv/}
+_TARGET=		${TARGET_ARCH:C/mips(n32|64)?(el)?(hf)?/mips/:C/arm(v6)?(eb)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/:C/powerpcspe/powerpc/:C/riscv64/riscv/}
 .endif
 .if defined(TARGET) && !defined(_TARGET)
 _TARGET=${TARGET}
@@ -421,7 +421,7 @@ TARGETS?=amd64 arm arm64 i386 mips pc98 
 _UNIVERSE_TARGETS=	${TARGETS}
 TARGET_ARCHES_arm?=	arm armeb armv6
 TARGET_ARCHES_arm64?=	aarch64
-TARGET_ARCHES_mips?=	mipsel mips mips64el mips64 mipsn32
+TARGET_ARCHES_mips?=	mipsel mips mips64el mips64 mipsn32 mipselhf mipshf mips64elhf mips64hf
 TARGET_ARCHES_powerpc?=	powerpc powerpc64 powerpcspe
 TARGET_ARCHES_pc98?=	i386
 .for target in ${TARGETS}

Modified: user/alc/PQ_LAUNDRY/Makefile.inc1
==============================================================================
--- user/alc/PQ_LAUNDRY/Makefile.inc1	Fri Nov  4 21:02:33 2016	(r308316)
+++ user/alc/PQ_LAUNDRY/Makefile.inc1	Fri Nov  4 21:10:02 2016	(r308317)
@@ -356,6 +356,10 @@ KNOWN_ARCHES?=	aarch64/arm64 \
 		mipsn32el/mips \
 		mips64/mips \
 		mipsn32/mips \
+		mipshf/mips \
+		mipselhf/mips \
+		mips64elhf/mips \
+		mips64hf/mips \
 		powerpc \
 		powerpc64/powerpc \
 		powerpcspe/powerpc \
@@ -539,8 +543,8 @@ HMAKE+=		PATH=${TMPPATH} METALOG=${METAL
 
 CROSSENV+=	CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCXXFLAGS} ${XCFLAGS}" \
 		CPP="${XCPP} ${XCFLAGS}" \
-		AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
-		OBJCOPY="${XOBJCOPY}" \
+		AS="${XAS}" AR="${XAR}" LD="${XLD}" LLVM_LINK="${XLLVM_LINK}" \
+		NM=${XNM} OBJCOPY="${XOBJCOPY}" \
 		RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \
 		SIZE="${XSIZE}"
 
@@ -1997,7 +2001,7 @@ libraries: .MAKE .PHONY
 #
 # static libgcc.a prerequisite for shared libc
 #
-_prereq_libs= gnu/lib/libgcc lib/libcompiler_rt
+_prereq_libs= lib/libcompiler_rt
 .if ${MK_SSP} != "no"
 _prereq_libs+= gnu/lib/libssp/libssp_nonshared
 .endif
@@ -2009,7 +2013,6 @@ _prereq_libs+= gnu/lib/libssp/libssp_non
 #
 _startup_libs=	gnu/lib/csu
 _startup_libs+=	lib/csu
-_startup_libs+=	gnu/lib/libgcc
 _startup_libs+=	lib/libcompiler_rt
 _startup_libs+=	lib/libc
 _startup_libs+=	lib/libc_nonshared
@@ -2017,11 +2020,27 @@ _startup_libs+=	lib/libc_nonshared
 _startup_libs+=	lib/libcxxrt
 .endif
 
+.if ${MK_LLVM_LIBUNWIND} != "no"
+_prereq_libs+=	lib/libgcc_eh lib/libgcc_s
+_startup_libs+=	lib/libgcc_eh lib/libgcc_s
+
+lib/libgcc_s__L: lib/libc__L
+lib/libgcc_s__L: lib/libc_nonshared__L
+.if ${MK_LIBCPLUSPLUS} != "no"
+lib/libcxxrt__L: lib/libgcc_s__L
+.endif
+
+.else # MK_LLVM_LIBUNWIND == no
+
+_prereq_libs+=	gnu/lib/libgcc
+_startup_libs+=	gnu/lib/libgcc
+
 gnu/lib/libgcc__L: lib/libc__L
 gnu/lib/libgcc__L: lib/libc_nonshared__L
 .if ${MK_LIBCPLUSPLUS} != "no"
 lib/libcxxrt__L: gnu/lib/libgcc__L
 .endif
+.endif
 
 _prebuild_libs=	${_kerberos5_lib_libasn1} \
 		${_kerberos5_lib_libhdb} \

Modified: user/alc/PQ_LAUNDRY/UPDATING
==============================================================================
--- user/alc/PQ_LAUNDRY/UPDATING	Fri Nov  4 21:02:33 2016	(r308316)
+++ user/alc/PQ_LAUNDRY/UPDATING	Fri Nov  4 21:10:02 2016	(r308317)
@@ -51,6 +51,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12
 
 ****************************** SPECIAL WARNING: ******************************
 
+20161030:
+	isl(4) and cyapa(4) drivers now require a new driver,
+	chromebook_platform(4), to work properly on Chromebook-class hardware.
+	On other types of hardware the drivers may need to be configured using
+	device hints.  Please see the corresponding manual pages for details.
+
 20161017:
 	The urtwn(4) driver was merged into rtwn(4) and now consists of
 	rtwn(4) main module + rtwn_usb(4) and rtwn_pci(4) bus-specific

Modified: user/alc/PQ_LAUNDRY/bin/freebsd-version/freebsd-version.sh.in
==============================================================================
--- user/alc/PQ_LAUNDRY/bin/freebsd-version/freebsd-version.sh.in	Fri Nov  4 21:02:33 2016	(r308316)
+++ user/alc/PQ_LAUNDRY/bin/freebsd-version/freebsd-version.sh.in	Fri Nov  4 21:10:02 2016	(r308317)
@@ -36,7 +36,7 @@ USERLAND_VERSION="@@REVISION@@-@@BRANCH@
 : ${LOADER_CONF_FILES:=$LOADER_DIR/defaults/loader.conf $LOADER_DIR/loader.conf $LOADER_DIR/loader.conf.local}
 LOADER_RE1='^\([A-Z_a-z][0-9A-Z_a-z]*=[-./0-9A-Z_a-z]\{1,\}\).*$'
 LOADER_RE2='^\([A-Z_a-z][0-9A-Z_a-z]*="[-./0-9A-Z_a-z]\{1,\}"\).*$'
-KERNEL_RE='^@(#)@@TYPE@@ \([-.0-9A-Za-z]\{1,\}\) .*$'
+KERNEL_RE='^@@TYPE@@ \([-.0-9A-Za-z]\{1,\}\) .*$'
 
 progname=$(basename $0)
 
@@ -67,7 +67,7 @@ kernel_version() {
 	if [ ! -f "$kernfile" -o ! -r "$kernfile" ] ; then
 		error "unable to locate kernel"
 	fi
-	strings "$kernfile" | sed -n "s/$KERNEL_RE/\\1/p"
+	what -qs "$kernfile" | sed -n "s/$KERNEL_RE/\\1/p"
 }
 
 #

Modified: user/alc/PQ_LAUNDRY/bin/sh/tests/execution/Makefile
==============================================================================
--- user/alc/PQ_LAUNDRY/bin/sh/tests/execution/Makefile	Fri Nov  4 21:02:33 2016	(r308316)
+++ user/alc/PQ_LAUNDRY/bin/sh/tests/execution/Makefile	Fri Nov  4 21:10:02 2016	(r308317)
@@ -37,6 +37,7 @@ ${PACKAGE}FILES+=		redir4.0
 ${PACKAGE}FILES+=		redir5.0
 ${PACKAGE}FILES+=		redir6.0
 ${PACKAGE}FILES+=		redir7.0
+${PACKAGE}FILES+=		set-C1.0
 ${PACKAGE}FILES+=		set-n1.0
 ${PACKAGE}FILES+=		set-n2.0
 ${PACKAGE}FILES+=		set-n3.0

Copied: user/alc/PQ_LAUNDRY/bin/sh/tests/execution/set-C1.0 (from r308315, head/bin/sh/tests/execution/set-C1.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/alc/PQ_LAUNDRY/bin/sh/tests/execution/set-C1.0	Fri Nov  4 21:10:02 2016	(r308317, copy of r308315, head/bin/sh/tests/execution/set-C1.0)
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+T=$(mktemp -d "${TMPDIR:-/tmp}/sh-test.XXXXXXXX") || exit
+trap 'rm -rf "$T"' 0
+
+set -C
+echo . >"$T/a" &&
+[ -s "$T/a" ] &&
+{ ! true >"$T/a"; } 2>/dev/null &&
+[ -s "$T/a" ] &&
+ln -s /dev/null "$T/b" &&
+true >"$T/b"

Modified: user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==============================================================================
--- user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Fri Nov  4 21:02:33 2016	(r308316)
+++ user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Fri Nov  4 21:10:02 2016	(r308317)
@@ -213,6 +213,7 @@ extern int zpool_get_state(zpool_handle_
 extern const char *zpool_state_to_name(vdev_state_t, vdev_aux_t);
 extern const char *zpool_pool_state_to_name(pool_state_t);
 extern void zpool_free_handles(libzfs_handle_t *);
+extern int zpool_nextboot(libzfs_handle_t *, uint64_t, uint64_t, const char *);
 
 /*
  * Iterate over all active pools in the system.

Modified: user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
==============================================================================
--- user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	Fri Nov  4 21:02:33 2016	(r308316)
+++ user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	Fri Nov  4 21:10:02 2016	(r308317)
@@ -4126,3 +4126,25 @@ out:
 	libzfs_fini(hdl);
 	return (ret);
 }
+
+int
+zpool_nextboot(libzfs_handle_t *hdl, uint64_t pool_guid, uint64_t dev_guid,
+    const char *command)
+{
+	zfs_cmd_t zc = { 0 };
+	nvlist_t *args;
+	char *packed;
+	size_t size;
+	int error;
+
+	args = fnvlist_alloc();
+	fnvlist_add_uint64(args, ZPOOL_CONFIG_POOL_GUID, pool_guid);
+	fnvlist_add_uint64(args, ZPOOL_CONFIG_GUID, dev_guid);
+	fnvlist_add_string(args, "command", command);
+	error = zcmd_write_src_nvlist(hdl, &zc, args);
+	if (error == 0)
+		error = ioctl(hdl->libzfs_fd, ZFS_IOC_NEXTBOOT, &zc);
+	zcmd_free_nvlists(&zc);
+	nvlist_free(args);
+	return (error);
+}

Modified: user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
==============================================================================
--- user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Fri Nov  4 21:02:33 2016	(r308316)
+++ user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Fri Nov  4 21:10:02 2016	(r308317)
@@ -596,8 +596,9 @@ recv_read(int fd, void *buf, int ilen)
 }
 
 static int
-lzc_receive_impl(const char *snapname, nvlist_t *props, const char *origin,
-    boolean_t force, boolean_t resumable, int fd)
+recv_impl(const char *snapname, nvlist_t *props, const char *origin,
+    boolean_t force, boolean_t resumable, int fd,
+    const dmu_replay_record_t *begin_record)
 {
 	/*
 	 * The receive ioctl is still legacy, so we need to construct our own
@@ -642,9 +643,14 @@ lzc_receive_impl(const char *snapname, n
 		(void) strlcpy(zc.zc_string, origin, sizeof (zc.zc_string));
 
 	/* zc_begin_record is non-byteswapped BEGIN record */
-	error = recv_read(fd, &zc.zc_begin_record, sizeof (zc.zc_begin_record));
-	if (error != 0)
-		goto out;
+	if (begin_record == NULL) {
+		error = recv_read(fd, &zc.zc_begin_record,
+		    sizeof (zc.zc_begin_record));
+		if (error != 0)
+			goto out;
+	} else {
+		zc.zc_begin_record = *begin_record;
+	}
 
 	/* zc_cookie is fd to read from */
 	zc.zc_cookie = fd;
@@ -685,7 +691,7 @@ int
 lzc_receive(const char *snapname, nvlist_t *props, const char *origin,
     boolean_t force, int fd)
 {
-	return (lzc_receive_impl(snapname, props, origin, force, B_FALSE, fd));
+	return (recv_impl(snapname, props, origin, force, B_FALSE, fd, NULL));
 }
 
 /*
@@ -698,7 +704,29 @@ int
 lzc_receive_resumable(const char *snapname, nvlist_t *props, const char *origin,
     boolean_t force, int fd)
 {
-	return (lzc_receive_impl(snapname, props, origin, force, B_TRUE, fd));
+	return (recv_impl(snapname, props, origin, force, B_TRUE, fd, NULL));
+}
+
+/*
+ * Like lzc_receive, but allows the caller to read the begin record and then to
+ * pass it in.  That could be useful if the caller wants to derive, for example,
+ * the snapname or the origin parameters based on the information contained in
+ * the begin record.
+ * The begin record must be in its original form as read from the stream,
+ * in other words, it should not be byteswapped.
+ *
+ * The 'resumable' parameter allows to obtain the same behavior as with
+ * lzc_receive_resumable.
+ */
+int
+lzc_receive_with_header(const char *snapname, nvlist_t *props,
+    const char *origin, boolean_t force, boolean_t resumable, int fd,
+    const dmu_replay_record_t *begin_record)
+{
+	if (begin_record == NULL)
+		return (EINVAL);
+	return (recv_impl(snapname, props, origin, force, resumable, fd,
+	    begin_record));
 }
 
 /*

Modified: user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h
==============================================================================
--- user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h	Fri Nov  4 21:02:33 2016	(r308316)
+++ user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h	Fri Nov  4 21:10:02 2016	(r308317)
@@ -68,10 +68,15 @@ enum lzc_send_flags {
 int lzc_send(const char *, const char *, int, enum lzc_send_flags);
 int lzc_send_resume(const char *, const char *, int,
     enum lzc_send_flags, uint64_t, uint64_t);
+int lzc_send_space(const char *, const char *, uint64_t *);
+
+struct dmu_replay_record;
+
 int lzc_receive(const char *, nvlist_t *, const char *, boolean_t, int);
 int lzc_receive_resumable(const char *, nvlist_t *, const char *,
     boolean_t, int);
-int lzc_send_space(const char *, const char *, uint64_t *);
+int lzc_receive_with_header(const char *, nvlist_t *, const char *, boolean_t,
+    boolean_t, int, const struct dmu_replay_record *);
 
 boolean_t lzc_exists(const char *);
 

Modified: user/alc/PQ_LAUNDRY/contrib/hyperv/tools/hv_kvp_daemon.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/hyperv/tools/hv_kvp_daemon.c	Fri Nov  4 21:02:33 2016	(r308316)
+++ user/alc/PQ_LAUNDRY/contrib/hyperv/tools/hv_kvp_daemon.c	Fri Nov  4 21:10:02 2016	(r308317)
@@ -52,9 +52,10 @@
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
+#include <assert.h>
 
 #include "hv_kvp.h"
-
+#include "hv_utilreg.h"
 typedef uint8_t		__u8;
 typedef uint16_t	__u16;
 typedef uint32_t	__u32;
@@ -684,18 +685,16 @@ kvp_get_ipconfig_info(char *if_name, str
 	 */
 	kvp_process_ipconfig_file(cmd, (char *)buffer->gate_way,
 	    (MAX_GATEWAY_SIZE * 2), INET_ADDRSTRLEN, 0);
-
 	/*
 	 * Retrieve the IPV6 address of default gateway.
 	 */
-	snprintf(cmd, sizeof(cmd), "netstat -rn inet6 | grep %s | awk '/default/ {print $2 }", if_name);
+	snprintf(cmd, sizeof(cmd), "netstat -rn inet6 | grep %s | awk '/default/ {print $2 }'", if_name);
 
 	/*
 	 * Execute the command to gather gateway IPV6 info.
 	 */
 	kvp_process_ipconfig_file(cmd, (char *)buffer->gate_way,
 	    (MAX_GATEWAY_SIZE * 2), INET6_ADDRSTRLEN, 1);
-
 	/*
 	 * we just invoke an external script to get the DNS info.
 	 *
@@ -782,11 +781,11 @@ kvp_process_ip_address(void *addrp,
 	}
 
 	if ((length - *offset) < addr_length + 1) {
-		return (HV_KVP_E_FAIL);
+		return (EINVAL);
 	}
 	if (str == NULL) {
 		strlcpy(buffer, "inet_ntop failed\n", length);
-		return (HV_KVP_E_FAIL);
+		return (errno);
 	}
 	if (*offset == 0) {
 		strlcpy(buffer, tmp, length);
@@ -832,7 +831,7 @@ kvp_get_ip_info(int family, char *if_nam
 
 	if (getifaddrs(&ifap)) {
 		strlcpy(buffer, "getifaddrs failed\n", buffer_length);
-		return (HV_KVP_E_FAIL);
+		return (errno);
 	}
 
 	curp = ifap;
@@ -924,7 +923,6 @@ kvp_get_ip_info(int family, char *if_nam
 			/*
 			 * Collect other ip configuration info.
 			 */
-
 			kvp_get_ipconfig_info(if_name, ip_buffer);
 		}
 
@@ -954,7 +952,7 @@ kvp_write_file(FILE *f, const char *s1, 
 	ret = fprintf(f, "%s%s%s%s\n", s1, s2, "=", s3);
 
 	if (ret < 0) {
-		return (HV_KVP_E_FAIL);
+		return (EIO);
 	}
 
 	return (0);
@@ -979,7 +977,7 @@ kvp_set_ip_info(char *if_name, struct hv
 
 	if (file == NULL) {
 		KVP_LOG(LOG_ERR, "FreeBSD Failed to open config file\n");
-		return (HV_KVP_E_FAIL);
+		return (errno);
 	}
 
 	/*
@@ -988,7 +986,7 @@ kvp_set_ip_info(char *if_name, struct hv
 
 	mac_addr = kvp_if_name_to_mac(if_name);
 	if (mac_addr == NULL) {
-		error = HV_KVP_E_FAIL;
+		error = EINVAL;
 		goto kvp_set_ip_info_error;
 	}
 	/* MAC Address */
@@ -1091,28 +1089,30 @@ kvp_op_getipinfo(struct hv_kvp_msg *op_m
 {
 	struct hv_kvp_ipaddr_value *ip_val;
 	char *if_name;
+	int error = 0;
 
 	assert(op_msg != NULL);
 	KVP_LOG(LOG_DEBUG, "In kvp_op_getipinfo.\n");
 
 	ip_val = &op_msg->body.kvp_ip_val;
-	op_msg->hdr.error = HV_KVP_S_OK;
+	op_msg->hdr.error = HV_S_OK;
 
 	if_name = kvp_mac_to_if_name((char *)ip_val->adapter_id);
 
 	if (if_name == NULL) {
 		/* No interface found with the mac address. */
-		op_msg->hdr.error = HV_KVP_E_FAIL;
+		op_msg->hdr.error = HV_E_FAIL;
 		goto kvp_op_getipinfo_done;
 	}
 
-	op_msg->hdr.error = kvp_get_ip_info(0, if_name,
+	error = kvp_get_ip_info(0, if_name,
 	    HV_KVP_OP_GET_IP_INFO, ip_val, (MAX_IP_ADDR_SIZE * 2));
-
+	if (error)
+		op_msg->hdr.error = HV_E_FAIL;
 	free(if_name);
 
 kvp_op_getipinfo_done:
-	return(op_msg->hdr.error);
+	return (error);
 }
 
 
@@ -1121,25 +1121,27 @@ kvp_op_setipinfo(struct hv_kvp_msg *op_m
 {
 	struct hv_kvp_ipaddr_value *ip_val;
 	char *if_name;
+	int error = 0;
 
 	assert(op_msg != NULL);
 	KVP_LOG(LOG_DEBUG, "In kvp_op_setipinfo.\n");
 
 	ip_val = &op_msg->body.kvp_ip_val;
-	op_msg->hdr.error = HV_KVP_S_OK;
+	op_msg->hdr.error = HV_S_OK;
 
 	if_name = (char *)ip_val->adapter_id;
 
 	if (if_name == NULL) {
 		/* No adapter provided. */
-		op_msg->hdr.error = HV_KVP_GUID_NOTFOUND;
+		op_msg->hdr.error = HV_GUID_NOTFOUND;
 		goto kvp_op_setipinfo_done;
 	}
 
-	op_msg->hdr.error = kvp_set_ip_info(if_name, ip_val);
-
+	error = kvp_set_ip_info(if_name, ip_val);
+	if (error)
+		op_msg->hdr.error = HV_E_FAIL;
 kvp_op_setipinfo_done:
-	return(op_msg->hdr.error);
+	return (error);
 }
 
 
@@ -1154,7 +1156,7 @@ kvp_op_setgetdel(struct hv_kvp_msg *op_m
 	assert(op_hdlr != NULL);
 
 	op_pool = op_msg->hdr.kvp_hdr.pool;
-	op_msg->hdr.error = HV_KVP_S_OK;
+	op_msg->hdr.error = HV_S_OK;
 
 	switch(op_hdlr->kvp_op_key) {
 	case HV_KVP_OP_SET:
@@ -1198,8 +1200,7 @@ kvp_op_setgetdel(struct hv_kvp_msg *op_m
 	}
 
 	if (error != 0)
-		op_msg->hdr.error = HV_KVP_S_CONT;
-
+		op_msg->hdr.error = HV_S_CONT;
 	return(error);
 }
 
@@ -1216,7 +1217,7 @@ kvp_op_enumerate(struct hv_kvp_msg *op_m
 
 	op = op_msg->hdr.kvp_hdr.operation;
 	op_pool = op_msg->hdr.kvp_hdr.pool;
-	op_msg->hdr.error = HV_KVP_S_OK;
+	op_msg->hdr.error = HV_S_OK;
 
 	/*
 	 * If the pool is not HV_KVP_POOL_AUTO, read from the appropriate
@@ -1229,7 +1230,7 @@ kvp_op_enumerate(struct hv_kvp_msg *op_m
 		    HV_KVP_EXCHANGE_MAX_KEY_SIZE,
 		    op_msg->body.kvp_enum_data.data.msg_value.value,
 		    HV_KVP_EXCHANGE_MAX_VALUE_SIZE)) {
-			op_msg->hdr.error = HV_KVP_S_CONT;
+			op_msg->hdr.error = HV_S_CONT;
 			error = -1;
 		}
 		goto kvp_op_enumerate_done;
@@ -1298,12 +1299,14 @@ kvp_op_enumerate(struct hv_kvp_msg *op_m
 		KVP_LOG(LOG_ERR, "Auto pool Index %d not found.\n",
 		    op_msg->body.kvp_enum_data.index);
 #endif
-		op_msg->hdr.error = HV_KVP_S_CONT;
+		op_msg->hdr.error = HV_S_CONT;
 		error = -1;
 		break;
 	}
 
 kvp_op_enumerate_done:
+	if (error != 0)
+		op_msg->hdr.error = HV_S_CONT;
 	return(error);
 }
 
@@ -1496,10 +1499,13 @@ main(int argc, char *argv[])
 			 */
 			error = kvp_op_hdlrs[op].kvp_op_exec(hv_msg,
 			    (void *)&kvp_op_hdlrs[op]);
-			if (error != 0 && hv_msg->hdr.error != HV_KVP_S_CONT)
-				KVP_LOG(LOG_WARNING,
-				    "Operation failed OP = %d, error = 0x%x\n",
-				    op, error);
+			if (error != 0) {
+				assert(hv_msg->hdr.error != HV_S_OK);
+				if (hv_msg->hdr.error != HV_S_CONT)
+					KVP_LOG(LOG_WARNING,
+					    "Operation failed OP = %d, error = 0x%x\n",
+					    op, error);
+			}
 		}
 
 		/*

Modified: user/alc/PQ_LAUNDRY/contrib/netbsd-tests/lib/libc/stdio/t_printf.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/netbsd-tests/lib/libc/stdio/t_printf.c	Fri Nov  4 21:02:33 2016	(r308316)
+++ user/alc/PQ_LAUNDRY/contrib/netbsd-tests/lib/libc/stdio/t_printf.c	Fri Nov  4 21:10:02 2016	(r308317)
@@ -120,12 +120,6 @@ ATF_TC_BODY(snprintf_posarg_error, tc)
 {
 	char s[16], fmt[32];
 
-#ifndef __NetBSD__
-	atf_tc_expect_signal(SIGSEGV,
-	    "some non-NetBSD platforms including FreeBSD don't validate "
-	    "negative size; testcase blows up with SIGSEGV");
-#endif
-
 	snprintf(fmt, sizeof(fmt), "%%%zu$d", SIZE_MAX / sizeof(size_t));
 
 	ATF_CHECK(snprintf(s, sizeof(s), fmt, -23) == -1);

Copied: user/alc/PQ_LAUNDRY/contrib/tzdata/CONTRIBUTING (from r308315, head/contrib/tzdata/CONTRIBUTING)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/alc/PQ_LAUNDRY/contrib/tzdata/CONTRIBUTING	Fri Nov  4 21:10:02 2016	(r308317, copy of r308315, head/contrib/tzdata/CONTRIBUTING)
@@ -0,0 +1,73 @@
+Contributing to the tz code and data
+
+The time zone database is by no means authoritative: governments
+change timekeeping rules erratically and sometimes with little
+warning, the data entries do not cover all of civil time before
+1970, and undoubtedly errors remain in the code and data.  Feel
+free to fill gaps or fix mistakes, and please email improvements
+to tz at iana.org for use in the future.
+
+To email small changes, please run a POSIX shell command like
+'diff -u old/europe new/europe >myfix.patch', and attach
+myfix.patch to the email.
+
+For more-elaborate changes, please read the Theory file and browse
+the mailing list archives <http://mm.icann.org/pipermail/tz/> for
+examples of patches that tend to work well.  Ideally, additions to
+data should contain commentary citing reliable sources as
+justification.
+
+Please submit changes against either the latest release in
+<ftp://ftp.iana.org/tz/> or the master branch of the experimental
+Git repository.  If you use Git the following workflow may be helpful:
+
+  * Copy the experimental repository.
+
+      git clone https://github.com/eggert/tz.git
+      cd tz
+
+  * Get current with the master branch.
+
+      git checkout master
+      git pull
+
+  * Switch to a new branch for the changes.  Choose a different
+    branch name for each change set.
+
+      git checkout -b mybranch
+
+  * Edit source files.  Include commentary that justifies the
+    changes by citing reliable sources.
+
+  * Debug the changes, e.g.:
+
+      make check
+      make install
+      ./zdump -v America/Los_Angeles
+
+  * For each separable change, commit it in the new branch, e.g.:
+
+      git add northamerica
+      git commit
+
+    See recent 'git log' output for the commit-message style.
+
+  * Create patch files 0001-*, 0002-*, ...
+
+      git format-patch master
+
+  * After reviewing the patch files, send the patches to tz at iana.org
+    for others to review.
+
+      git send-email master
+
+  * Start anew by getting current with the master branch again
+    (the second step above).
+
+Please do not create issues or pull requests on GitHub, as the
+proper procedure for proposing and distributing patches is via
+email as illustrated above.
+
+-----
+
+This file is in the public domain.

Copied: user/alc/PQ_LAUNDRY/contrib/tzdata/LICENSE (from r308315, head/contrib/tzdata/LICENSE)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/alc/PQ_LAUNDRY/contrib/tzdata/LICENSE	Fri Nov  4 21:10:02 2016	(r308317, copy of r308315, head/contrib/tzdata/LICENSE)
@@ -0,0 +1,4 @@
+With a few exceptions, all files in the tz code and data (including
+this one) are in the public domain.  The exceptions are date.c,
+newstrftime.3, and strftime.c, which contain material derived from BSD
+and which use the BSD 3-clause license.

Copied: user/alc/PQ_LAUNDRY/contrib/tzdata/Makefile (from r308315, head/contrib/tzdata/Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/alc/PQ_LAUNDRY/contrib/tzdata/Makefile	Fri Nov  4 21:10:02 2016	(r308317, copy of r308315, head/contrib/tzdata/Makefile)
@@ -0,0 +1,793 @@
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
+
+# Package name for the code distribution.
+PACKAGE=	tzcode
+
+# Version number for the distribution, overridden in the 'tarballs' rule below.
+VERSION=	unknown
+
+# Email address for bug reports.
+BUGEMAIL=	tz at iana.org
+
+# Change the line below for your time zone (after finding the zone you want in
+# the time zone files, or adding it to a time zone file).
+# Alternately, if you discover you've got the wrong time zone, you can just
+#	zic -l rightzone
+# to correct things.
+# Use the command
+#	make zonenames
+# to get a list of the values you can use for LOCALTIME.
+
+LOCALTIME=	GMT
+
+# If you want something other than Eastern United States time as a template
+# for handling POSIX-style time zone environment variables,
+# change the line below (after finding the zone you want in the
+# time zone files, or adding it to a time zone file).
+# (When a POSIX-style environment variable is handled, the rules in the
+# template file are used to determine "spring forward" and "fall back" days and
+# times; the environment variable itself specifies UT offsets of standard and
+# summer time.)
+# Alternately, if you discover you've got the wrong time zone, you can just
+#	zic -p rightzone
+# to correct things.
+# Use the command
+#	make zonenames
+# to get a list of the values you can use for POSIXRULES.
+# If you want POSIX compatibility, use "America/New_York".
+
+POSIXRULES=	America/New_York
+
+# Also see TZDEFRULESTRING below, which takes effect only
+# if the time zone files cannot be accessed.
+
+# Everything gets put in subdirectories of. . .
+
+TOPDIR=		/usr/local
+
+# "Compiled" time zone information is placed in the "TZDIR" directory
+# (and subdirectories).
+# Use an absolute path name for TZDIR unless you're just testing the software.
+
+TZDIR_BASENAME=	zoneinfo
+TZDIR=		$(TOPDIR)/etc/$(TZDIR_BASENAME)
+
+# Types to try, as an alternative to time_t.  int64_t should be first.
+TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
+
+# The "tzselect", "zic", and "zdump" commands get installed in. . .
+
+ETCDIR=		$(TOPDIR)/etc
+
+# If you "make INSTALL", the "date" command gets installed in. . .
+
+BINDIR=		$(TOPDIR)/bin
+
+# Manual pages go in subdirectories of. . .
+
+MANDIR=		$(TOPDIR)/man
+
+# Library functions are put in an archive in LIBDIR.
+
+LIBDIR=		$(TOPDIR)/lib
+
+# If you always want time values interpreted as "seconds since the epoch
+# (not counting leap seconds)", use
+#	REDO=		posix_only
+# below.  If you always want right time values interpreted as "seconds since
+# the epoch" (counting leap seconds)", use
+#	REDO=		right_only
+# below.  If you want both sets of data available, with leap seconds not
+# counted normally, use
+#	REDO=		posix_right
+# below.  If you want both sets of data available, with leap seconds counted
+# normally, use
+#	REDO=		right_posix
+# below.  POSIX mandates that leap seconds not be counted; for compatibility
+# with it, use "posix_only" or "posix_right".
+
+REDO=		posix_right
+
+# If you want out-of-scope and often-wrong data from the file 'backzone', use
+#	PACKRATDATA=	backzone
+# To omit this data, use
+#	PACKRATDATA=
+
+PACKRATDATA=
+
+# Since "." may not be in PATH...
+
+YEARISTYPE=	./yearistype
+
+# Non-default libraries needed to link.
+LDLIBS=
+
+# Add the following to the end of the "CFLAGS=" line as needed.
+#  -DBIG_BANG=-9999999LL if the Big Bang occurred at time -9999999 (see zic.c)
+#  -DHAVE_DECL_ASCTIME_R=0 if <time.h> does not declare asctime_r
+#  -DHAVE_DIRECT_H if mkdir needs <direct.h> (MS-Windows)
+#  -DHAVE_DOS_FILE_NAMES if file names have drive specifiers etc. (MS-DOS)
+#  -DHAVE_GETTEXT=1 if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris)
+#  -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares
+#	ctime_r and asctime_r incompatibly with the POSIX standard
+#	(Solaris when _POSIX_PTHREAD_SEMANTICS is not defined).
+#  -DHAVE_INTTYPES_H=1 if you have a pre-C99 compiler with "inttypes.h"
+#  -DHAVE_LINK=0 if your system lacks a link function
+#  -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function
+#  -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz
+#	This defaults to 1 if a working localtime_rz seems to be available.
+#	localtime_rz can make zdump significantly faster, but is nonstandard.
+#  -DHAVE_POSIX_DECLS=0 if your system's include files do not declare
+#	functions like 'link' or variables like 'tzname' required by POSIX
+#  -DHAVE_STDINT_H=1 if you have a pre-C99 compiler with "stdint.h"
+#  -DHAVE_STRFTIME_L=1 if <time.h> declares locale_t and strftime_l
+#	This defaults to 0 if _POSIX_VERSION < 200809, 1 otherwise.
+#  -DHAVE_STRDUP=0 if your system lacks the strdup function
+#  -DHAVE_SYMLINK=0 if your system lacks the symlink function
+#  -DHAVE_SYS_STAT_H=0 if your compiler lacks a "sys/stat.h"
+#  -DHAVE_SYS_WAIT_H=0 if your compiler lacks a "sys/wait.h"
+#  -DHAVE_TZSET=0 if your system lacks a tzset function
+#  -DHAVE_UNISTD_H=0 if your compiler lacks a "unistd.h" (Microsoft C++ 7?)
+#  -DEPOCH_LOCAL=1 if the 'time' function returns local time not UT
+#  -DEPOCH_OFFSET=N if the 'time' function returns a value N greater
+#	than what POSIX specifies, assuming local time is UT.
+#	For example, N is 252460800 on AmigaOS.
+#  -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU=1
+#	if you do not want run time warnings about formats that may cause
+#	year 2000 grief
+#  -Dssize_t=long on ancient hosts that lack ssize_t
+#  -DTHREAD_SAFE=1 to make localtime.c thread-safe, as POSIX requires;
+#	not needed by the main-program tz code, which is single-threaded.
+#	Append other compiler flags as needed, e.g., -pthread on GNU/Linux.
+#  -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t
+#  -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz"
+#  -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory;
+#	the default is system-supplied, typically "/usr/lib/locale"
+#  -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified
+#	DST transitions if the time zone files cannot be accessed
+#  -DUNINIT_TRAP=1 if reading uninitialized storage can cause problems
+#	other than simply getting garbage data
+#  -DUSE_LTZ=0 to build zdump with the system time zone library
+#	Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below.
+#  -DZIC_MAX_ABBR_LEN_WO_WARN=3
+#	(or some other number) to set the maximum time zone abbreviation length
+#	that zic will accept without a warning (the default is 6)
+#  $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking
+GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \
+	-Wall -Wextra \
+	-Wbad-function-cast -Wcast-align -Wdate-time \
+	-Wdeclaration-after-statement \
+	-Wdouble-promotion \
+	-Wformat=2 -Winit-self -Wjump-misses-init \
+	-Wlogical-op -Wmissing-prototypes -Wnested-externs \
+	-Wold-style-definition -Woverlength-strings -Wpointer-arith \
+	-Wshadow -Wstrict-prototypes -Wsuggest-attribute=const \
+	-Wsuggest-attribute=format -Wsuggest-attribute=noreturn \
+	-Wsuggest-attribute=pure -Wtrampolines \
+	-Wunused -Wwrite-strings \
+	-Wno-address -Wno-format-nonliteral -Wno-sign-compare \
+	-Wno-type-limits -Wno-unused-parameter
+#
+# If you want to use System V compatibility code, add
+#	-DUSG_COMPAT
+# to the end of the "CFLAGS=" line.  This arrange for "timezone" and "daylight"
+# variables to be kept up-to-date by the time conversion functions.  Neither
+# "timezone" nor "daylight" is described in X3J11's work.
+#
+# If your system has a "GMT offset" field in its "struct tm"s
+# (or if you decide to add such a field in your system's "time.h" file),
+# add the name to a define such as
+#	-DTM_GMTOFF=tm_gmtoff
+# to the end of the "CFLAGS=" line.  If not defined, the code attempts to
+# guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this.
+# Similarly, if your system has a "zone abbreviation" field, define
+#	-DTM_ZONE=tm_zone
+# and define NO_TM_ZONE to suppress any guessing.  These two fields are not
+# required by POSIX, but are widely available on GNU/Linux and BSD systems.
+#
+# If you want functions that were inspired by early versions of X3J11's work,
+# add
+#	-DSTD_INSPIRED
+# to the end of the "CFLAGS=" line.  This arranges for the functions
+# "tzsetwall", "offtime", "timelocal", "timegm", "timeoff",
+# "posix2time", and "time2posix" to be added to the time conversion library.
+# "tzsetwall" is like "tzset" except that it arranges for local wall clock
+# time (rather than the time specified in the TZ environment variable)
+# to be used.
+# "offtime" is like "gmtime" except that it accepts a second (long) argument
+# that gives an offset to add to the time_t when converting it.
+# "timelocal" is equivalent to "mktime".
+# "timegm" is like "timelocal" except that it turns a struct tm into
+# a time_t using UT (rather than local time as "timelocal" does).
+# "timeoff" is like "timegm" except that it accepts a second (long) argument
+# that gives an offset to use when converting to a time_t.
+# "posix2time" and "time2posix" are described in an included manual page.
+# X3J11's work does not describe any of these functions.
+# Sun has provided "tzsetwall", "timelocal", and "timegm" in SunOS 4.0.
+# These functions may well disappear in future releases of the time
+# conversion package.
+#
+# If you don't want functions that were inspired by NetBSD, add
+#	-DNETBSD_INSPIRED=0
+# to the end of the "CFLAGS=" line.  Otherwise, the functions
+# "localtime_rz", "mktime_z", "tzalloc", and "tzfree" are added to the
+# time library, and if STD_INSPIRED is also defined the functions
+# "posix2time_z" and "time2posix_z" are added as well.
+# The functions ending in "_z" (or "_rz") are like their unsuffixed
+# (or suffixed-by-"_r") counterparts, except with an extra first
+# argument of opaque type timezone_t that specifies the time zone.
+# "tzalloc" allocates a timezone_t value, and "tzfree" frees it.
+#
+# If you want to allocate state structures in localtime, add
+#	-DALL_STATE
+# to the end of the "CFLAGS=" line.  Storage is obtained by calling malloc.
+#
+# If you want an "altzone" variable (a la System V Release 3.1), add
+#	-DALTZONE
+# to the end of the "CFLAGS=" line.
+# This variable is not described in X3J11's work.
+#
+# NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put
+# out by the National Institute of Standards and Technology
+# which claims to test C and Posix conformance.  If you want to pass PCTS, add
+#	-DPCTS
+# to the end of the "CFLAGS=" line.
+#
+# If you want strict compliance with XPG4 as of 1994-04-09, add
+#	-DXPG4_1994_04_09
+# to the end of the "CFLAGS=" line.  This causes "strftime" to always return
+# 53 as a week number (rather than 52 or 53) for those days in January that
+# before the first Monday in January when a "%V" format is used and January 1
+# falls on a Friday, Saturday, or Sunday.
+
+CFLAGS=
+
+# Linker flags.  Default to $(LFLAGS) for backwards compatibility
+# to release 2012h and earlier.
+
+LDFLAGS=	$(LFLAGS)
+
+# For leap seconds, this Makefile uses LEAPSECONDS='-L leapseconds' in
+# submake command lines.  The default is no leap seconds.
+
+LEAPSECONDS=
+
+# The zic command and its arguments.
+
+zic=		./zic
+ZIC=		$(zic) $(ZFLAGS)
+
+ZFLAGS=
+
+# How to use zic to install tz binary files.
+
+ZIC_INSTALL=	$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS)
+
+# The name of a Posix-compliant 'awk' on your system.
+AWK=		awk
+
+# The full path name of a Posix-compliant shell, preferably one that supports
+# the Korn shell's 'select' statement as an extension.
+# These days, Bash is the most popular.
+# It should be OK to set this to /bin/sh, on platforms where /bin/sh
+# lacks 'select' or doesn't completely conform to Posix, but /bin/bash
+# is typically nicer if it works.
+KSHELL=		/bin/bash
+
+# The path where SGML DTDs are kept and the catalog file(s) to use when
+# validating.  The default should work on both Debian and Red Hat.
+SGML_TOPDIR= /usr
+SGML_DTDDIR= $(SGML_TOPDIR)/share/xml/w3c-sgml-lib/schema/dtd
+SGML_SEARCH_PATH= $(SGML_DTDDIR)/REC-html401-19991224
+SGML_CATALOG_FILES= \
+  $(SGML_TOPDIR)/share/doc/w3-recs/html/www.w3.org/TR/1999/REC-html401-19991224/HTML4.cat:$(SGML_TOPDIR)/share/sgml/html/4.01/HTML4.cat
+
+# The name, arguments and environment of a program to validate your web pages.
+# See <http://openjade.sourceforge.net/doc/> for a validator, and
+# <https://validator.w3.org/source/> for a validation library.
+VALIDATE = nsgmls
+VALIDATE_FLAGS = -s -B -wall -wno-unused-param
+VALIDATE_ENV = \
+  SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \
+  SGML_SEARCH_PATH=$(SGML_SEARCH_PATH) \
+  SP_CHARSET_FIXED=YES \
+  SP_ENCODING=UTF-8
+
+# This expensive test requires USE_LTZ.
+# To suppress it, define this macro to be empty.
+CHECK_TIME_T_ALTERNATIVES = check_time_t_alternatives
+
+# SAFE_CHAR is a regular expression that matches a safe character.
+# Some parts of this distribution are limited to safe characters;
+# others can use any UTF-8 character.
+# For now, the safe characters are a safe subset of ASCII.
+# The caller must set the shell variable 'sharp' to the character '#',
+# since Makefile macros cannot contain '#'.
+# TAB_CHAR is a single tab character, in single quotes.
+TAB_CHAR=	'	'
+SAFE_CHARSET1=	$(TAB_CHAR)' !\"'$$sharp'$$%&'\''()*+,./0123456789:;<=>?@'
+SAFE_CHARSET2=	'ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\^_`'
+SAFE_CHARSET3=	'abcdefghijklmnopqrstuvwxyz{|}~'
+SAFE_CHARSET=	$(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3)
+SAFE_CHAR=	'[]'$(SAFE_CHARSET)'-]'
+
+# OK_CHAR matches any character allowed in the distributed files.
+# This is the same as SAFE_CHAR, except that multibyte letters are
+# also allowed so that commentary can contain people's names and quote
+# non-English sources.  For non-letters the sources are limited to
+# ASCII renderings for the convenience of maintainers whose text editors
+# mishandle UTF-8 by default (e.g., XEmacs 21.4.22).
+OK_CHAR=	'[][:alpha:]'$(SAFE_CHARSET)'-]'
+
+# SAFE_LINE matches a line of safe characters.
+# SAFE_SHARP_LINE is similar, except any OK character can follow '#';
+# this is so that comments can contain non-ASCII characters.
+# OK_LINE matches a line of OK characters.
+SAFE_LINE=	'^'$(SAFE_CHAR)'*$$'
+SAFE_SHARP_LINE='^'$(SAFE_CHAR)'*('$$sharp$(OK_CHAR)'*)?$$'
+OK_LINE=	'^'$(OK_CHAR)'*$$'
+
+# Flags to give 'tar' when making a distribution.
+# Try to use flags appropriate for GNU tar.
+GNUTARFLAGS= --numeric-owner --owner=0 --group=0 --mode=go+u,go-w --sort=name
+TARFLAGS=	`if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; \
+		 then echo $(GNUTARFLAGS); \
+		 else :; \
+		 fi`
+
+# Flags to give 'gzip' when making a distribution.
+GZIPFLAGS=	-9n
+
+###############################################################################
+
+#MAKE=		make
+
+cc=		cc
+CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
+
+AR=		ar
+
+# ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib.
+RANLIB=		:
+
+TZCOBJS=	zic.o
+TZDOBJS=	zdump.o localtime.o asctime.o
+DATEOBJS=	date.o localtime.o strftime.o asctime.o
+LIBSRCS=	localtime.c asctime.c difftime.c
+LIBOBJS=	localtime.o asctime.o difftime.o
+HEADERS=	tzfile.h private.h
+NONLIBSRCS=	zic.c zdump.c
+NEWUCBSRCS=	date.c strftime.c
+SOURCES=	$(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) \
+			tzselect.ksh workman.sh
+MANS=		newctime.3 newstrftime.3 newtzset.3 time2posix.3 \
+			tzfile.5 tzselect.8 zic.8 zdump.8
+MANTXTS=	newctime.3.txt newstrftime.3.txt newtzset.3.txt \
+			time2posix.3.txt \
+			tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \
+			date.1.txt
+COMMON=		CONTRIBUTING LICENSE Makefile NEWS README Theory version
+WEB_PAGES=	tz-art.htm tz-how-to.html tz-link.htm
+DOCS=		$(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
+PRIMARY_YDATA=	africa antarctica asia australasia \
+		europe northamerica southamerica
+YDATA=		$(PRIMARY_YDATA) pacificnew etcetera backward
+NDATA=		systemv factory
+TDATA=		$(YDATA) $(NDATA)
+ZONETABLES=	zone1970.tab zone.tab
+TABDATA=	iso3166.tab leapseconds $(ZONETABLES)
+LEAP_DEPS=	leapseconds.awk leap-seconds.list
+DATA=		$(YDATA) $(NDATA) backzone $(TABDATA) \
+			leap-seconds.list yearistype.sh
+AWK_SCRIPTS=	checklinks.awk checktab.awk leapseconds.awk
+MISC=		$(AWK_SCRIPTS) zoneinfo2tdf.pl
+TZS_YEAR=	2050
+TZS=		to$(TZS_YEAR).tzs
+TZS_NEW=	to$(TZS_YEAR)new.tzs
+TZS_DEPS=	$(PRIMARY_YDATA) asctime.c localtime.c \
+			private.h tzfile.h zdump.c zic.c

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