svn commit: r295364 - in user/ngie/make_check: . bin/csh bin/dd bin/sh bin/test contrib/bsnmp/snmp_mibII contrib/elftoolchain/readelf contrib/libucl/tests contrib/libxo contrib/ofed/librdmacm/examp...

Garrett Cooper ngie at FreeBSD.org
Sun Feb 7 04:58:10 UTC 2016 

Author: ngie
Date: Sun Feb  7 04:58:06 2016
New Revision: 295364
URL: https://svnweb.freebsd.org/changeset/base/295364

Log:
  MFhead @ r295363

Added:
  user/ngie/make_check/sbin/nvmecontrol/power.c
     - copied unchanged from r295363, head/sbin/nvmecontrol/power.c
  user/ngie/make_check/sys/arm/include/cpu-v4.h
     - copied unchanged from r295363, head/sys/arm/include/cpu-v4.h
  user/ngie/make_check/sys/arm/xscale/i8134x/i80321_timer.c
     - copied unchanged from r295363, head/sys/arm/xscale/i8134x/i80321_timer.c
  user/ngie/make_check/sys/arm/xscale/i8134x/i80321_wdog.c
     - copied unchanged from r295363, head/sys/arm/xscale/i8134x/i80321_wdog.c
  user/ngie/make_check/sys/arm/xscale/i8134x/i80321reg.h
     - copied unchanged from r295363, head/sys/arm/xscale/i8134x/i80321reg.h
  user/ngie/make_check/sys/arm/xscale/i8134x/i80321var.h
     - copied unchanged from r295363, head/sys/arm/xscale/i8134x/i80321var.h
  user/ngie/make_check/usr.sbin/ctld/uclparse.c
     - copied unchanged from r295363, head/usr.sbin/ctld/uclparse.c
Deleted:
  user/ngie/make_check/contrib/libucl/tests/.gitignore
  user/ngie/make_check/contrib/libxo/.gitignore
  user/ngie/make_check/contrib/unbound/.gitignore
  user/ngie/make_check/sys/arm/arm/cpufunc_asm_arm10.S
  user/ngie/make_check/sys/arm/xscale/i80321/
Modified:
  user/ngie/make_check/Makefile
  user/ngie/make_check/Makefile.inc1
  user/ngie/make_check/bin/csh/Makefile
  user/ngie/make_check/bin/csh/iconv_stub.c
  user/ngie/make_check/bin/dd/args.c
  user/ngie/make_check/bin/dd/dd.1
  user/ngie/make_check/bin/sh/redir.c
  user/ngie/make_check/bin/sh/sh.1
  user/ngie/make_check/bin/test/test.c
  user/ngie/make_check/contrib/bsnmp/snmp_mibII/mibII.c
  user/ngie/make_check/contrib/elftoolchain/readelf/readelf.c
  user/ngie/make_check/contrib/ofed/librdmacm/examples/build/cmatose/Makefile
  user/ngie/make_check/contrib/ofed/librdmacm/examples/build/mckey/Makefile
  user/ngie/make_check/contrib/ofed/librdmacm/examples/build/udaddy/Makefile
  user/ngie/make_check/contrib/openresolv/Makefile
  user/ngie/make_check/contrib/openresolv/resolvconf.8.in
  user/ngie/make_check/contrib/openresolv/resolvconf.conf.5.in
  user/ngie/make_check/contrib/openresolv/resolvconf.in
  user/ngie/make_check/contrib/openresolv/unbound.in
  user/ngie/make_check/contrib/smbfs/smbutil/print.c
  user/ngie/make_check/crypto/openssh/sshd_config
  user/ngie/make_check/crypto/openssh/sshd_config.5
  user/ngie/make_check/etc/defaults/rc.conf
  user/ngie/make_check/etc/periodic/daily/800.scrub-zfs
  user/ngie/make_check/etc/rc.d/jail
  user/ngie/make_check/lib/libc/nls/msgcat.c
  user/ngie/make_check/lib/libc/sys/connect.2
  user/ngie/make_check/lib/libdevctl/devctl.3
  user/ngie/make_check/lib/libmemstat/memstat_uma.c
  user/ngie/make_check/sbin/nvmecontrol/Makefile
  user/ngie/make_check/sbin/nvmecontrol/nvmecontrol.8
  user/ngie/make_check/sbin/nvmecontrol/nvmecontrol.c
  user/ngie/make_check/sbin/nvmecontrol/nvmecontrol.h
  user/ngie/make_check/sbin/pfctl/pf_print_state.c
  user/ngie/make_check/sbin/rcorder/rcorder.c
  user/ngie/make_check/sbin/swapon/swapon.c
  user/ngie/make_check/share/i18n/esdb/MISC/MISC.alias
  user/ngie/make_check/share/man/man4/inet.4
  user/ngie/make_check/share/mk/bsd.incs.mk
  user/ngie/make_check/share/mk/bsd.links.mk
  user/ngie/make_check/share/mk/bsd.man.mk
  user/ngie/make_check/share/mk/bsd.nls.mk
  user/ngie/make_check/sys/amd64/amd64/uma_machdep.c
  user/ngie/make_check/sys/arm/allwinner/a20/a20_mp.c
  user/ngie/make_check/sys/arm/altera/socfpga/socfpga_mp.c
  user/ngie/make_check/sys/arm/amlogic/aml8726/aml8726_mp.c
  user/ngie/make_check/sys/arm/annapurna/alpine/alpine_machdep.c
  user/ngie/make_check/sys/arm/arm/cpufunc.c
  user/ngie/make_check/sys/arm/arm/cpufunc_asm.S
  user/ngie/make_check/sys/arm/arm/cpufunc_asm_arm11.S
  user/ngie/make_check/sys/arm/arm/cpufunc_asm_arm11x6.S
  user/ngie/make_check/sys/arm/arm/cpufunc_asm_arm9.S
  user/ngie/make_check/sys/arm/arm/cpufunc_asm_armv4.S
  user/ngie/make_check/sys/arm/arm/cpufunc_asm_armv5_ec.S
  user/ngie/make_check/sys/arm/arm/cpufunc_asm_armv7.S
  user/ngie/make_check/sys/arm/arm/cpufunc_asm_fa526.S
  user/ngie/make_check/sys/arm/arm/cpufunc_asm_xscale.S
  user/ngie/make_check/sys/arm/arm/cpufunc_asm_xscale_c3.S
  user/ngie/make_check/sys/arm/arm/cpuinfo.c
  user/ngie/make_check/sys/arm/arm/db_interface.c
  user/ngie/make_check/sys/arm/arm/debug_monitor.c
  user/ngie/make_check/sys/arm/arm/devmap.c
  user/ngie/make_check/sys/arm/arm/dump_machdep.c
  user/ngie/make_check/sys/arm/arm/elf_machdep.c
  user/ngie/make_check/sys/arm/arm/elf_trampoline.c
  user/ngie/make_check/sys/arm/arm/fiq.c
  user/ngie/make_check/sys/arm/arm/fusu.S
  user/ngie/make_check/sys/arm/arm/genassym.c
  user/ngie/make_check/sys/arm/arm/identcpu.c
  user/ngie/make_check/sys/arm/arm/locore-v6.S
  user/ngie/make_check/sys/arm/arm/machdep.c
  user/ngie/make_check/sys/arm/arm/minidump_machdep.c
  user/ngie/make_check/sys/arm/arm/mp_machdep.c
  user/ngie/make_check/sys/arm/arm/pmap-v6.c
  user/ngie/make_check/sys/arm/arm/pmap.c
  user/ngie/make_check/sys/arm/arm/swtch-v4.S
  user/ngie/make_check/sys/arm/arm/swtch-v6.S
  user/ngie/make_check/sys/arm/arm/sys_machdep.c
  user/ngie/make_check/sys/arm/arm/trap-v6.c
  user/ngie/make_check/sys/arm/arm/trap.c
  user/ngie/make_check/sys/arm/arm/vm_machdep.c
  user/ngie/make_check/sys/arm/at91/at91_machdep.c
  user/ngie/make_check/sys/arm/broadcom/bcm2835/bcm2836_mp.c
  user/ngie/make_check/sys/arm/cavium/cns11xx/econa_machdep.c
  user/ngie/make_check/sys/arm/conf/NOTES
  user/ngie/make_check/sys/arm/freescale/imx/imx6_mp.c
  user/ngie/make_check/sys/arm/include/cpu-v6.h
  user/ngie/make_check/sys/arm/include/cpu.h
  user/ngie/make_check/sys/arm/include/cpuconf.h
  user/ngie/make_check/sys/arm/include/cpufunc.h
  user/ngie/make_check/sys/arm/include/kdb.h
  user/ngie/make_check/sys/arm/include/pmap-v6.h
  user/ngie/make_check/sys/arm/include/pmap.h
  user/ngie/make_check/sys/arm/include/vm.h
  user/ngie/make_check/sys/arm/mv/armada38x/pmsu.c
  user/ngie/make_check/sys/arm/mv/armadaxp/armadaxp.c
  user/ngie/make_check/sys/arm/mv/armadaxp/armadaxp_mp.c
  user/ngie/make_check/sys/arm/mv/mv_common.c
  user/ngie/make_check/sys/arm/mv/mv_machdep.c
  user/ngie/make_check/sys/arm/mv/orion/db88f5xxx.c
  user/ngie/make_check/sys/arm/rockchip/rk30xx_mp.c
  user/ngie/make_check/sys/arm/samsung/exynos/exynos5_mp.c
  user/ngie/make_check/sys/arm/ti/omap4/omap4_mp.c
  user/ngie/make_check/sys/arm/ti/omap4/pandaboard/pandaboard.c
  user/ngie/make_check/sys/arm/ti/ti_cpuid.c
  user/ngie/make_check/sys/arm/versatile/versatile_machdep.c
  user/ngie/make_check/sys/arm/xilinx/zy7_mp.c
  user/ngie/make_check/sys/arm/xscale/i8134x/crb_machdep.c
  user/ngie/make_check/sys/arm/xscale/i8134x/files.i81342
  user/ngie/make_check/sys/arm/xscale/ixp425/avila_machdep.c
  user/ngie/make_check/sys/arm/xscale/pxa/pxa_machdep.c
  user/ngie/make_check/sys/arm64/arm64/copystr.c
  user/ngie/make_check/sys/arm64/arm64/genassym.c
  user/ngie/make_check/sys/arm64/arm64/gic_fdt.c
  user/ngie/make_check/sys/arm64/arm64/locore.S
  user/ngie/make_check/sys/arm64/arm64/machdep.c
  user/ngie/make_check/sys/arm64/arm64/mp_machdep.c
  user/ngie/make_check/sys/arm64/arm64/pmap.c
  user/ngie/make_check/sys/arm64/arm64/swtch.S
  user/ngie/make_check/sys/arm64/arm64/trap.c
  user/ngie/make_check/sys/arm64/arm64/uma_machdep.c
  user/ngie/make_check/sys/arm64/arm64/vm_machdep.c
  user/ngie/make_check/sys/arm64/include/armreg.h
  user/ngie/make_check/sys/arm64/include/kdb.h
  user/ngie/make_check/sys/arm64/include/pcb.h
  user/ngie/make_check/sys/arm64/include/pmap.h
  user/ngie/make_check/sys/boot/common/load_elf.c
  user/ngie/make_check/sys/boot/efi/boot1/boot1.c
  user/ngie/make_check/sys/boot/efi/boot1/boot_module.h
  user/ngie/make_check/sys/boot/efi/boot1/ufs_module.c
  user/ngie/make_check/sys/boot/efi/boot1/zfs_module.c
  user/ngie/make_check/sys/boot/efi/include/efidevp.h
  user/ngie/make_check/sys/boot/efi/libefi/efinet.c
  user/ngie/make_check/sys/boot/zfs/zfs.c
  user/ngie/make_check/sys/cam/ata/ata_all.c
  user/ngie/make_check/sys/cam/scsi/scsi_pass.c
  user/ngie/make_check/sys/cam/scsi/scsi_sa.c
  user/ngie/make_check/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
  user/ngie/make_check/sys/cddl/dev/fbt/arm/fbt_isa.c
  user/ngie/make_check/sys/compat/cloudabi/cloudabi_proc.c
  user/ngie/make_check/sys/compat/linux/linux_fork.c
  user/ngie/make_check/sys/conf/Makefile.arm
  user/ngie/make_check/sys/conf/NOTES
  user/ngie/make_check/sys/conf/files.arm
  user/ngie/make_check/sys/conf/kern.post.mk
  user/ngie/make_check/sys/conf/kern.pre.mk
  user/ngie/make_check/sys/conf/options
  user/ngie/make_check/sys/conf/options.arm
  user/ngie/make_check/sys/conf/options.mips
  user/ngie/make_check/sys/contrib/ipfilter/netinet/ip_compat.h
  user/ngie/make_check/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c   (contents, props changed)
  user/ngie/make_check/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
  user/ngie/make_check/sys/dev/ata/ata-all.c
  user/ngie/make_check/sys/dev/bwn/if_bwn.c
  user/ngie/make_check/sys/dev/cfi/cfi_core.c
  user/ngie/make_check/sys/dev/cxgb/cxgb_sge.c
  user/ngie/make_check/sys/dev/e1000/e1000_80003es2lan.c
  user/ngie/make_check/sys/dev/e1000/e1000_82540.c
  user/ngie/make_check/sys/dev/e1000/e1000_82541.c
  user/ngie/make_check/sys/dev/e1000/e1000_82542.c
  user/ngie/make_check/sys/dev/e1000/e1000_82543.c
  user/ngie/make_check/sys/dev/e1000/e1000_82571.h
  user/ngie/make_check/sys/dev/e1000/e1000_82575.c
  user/ngie/make_check/sys/dev/e1000/e1000_82575.h
  user/ngie/make_check/sys/dev/e1000/e1000_api.c
  user/ngie/make_check/sys/dev/e1000/e1000_defines.h
  user/ngie/make_check/sys/dev/e1000/e1000_hw.h
  user/ngie/make_check/sys/dev/e1000/e1000_i210.c
  user/ngie/make_check/sys/dev/e1000/e1000_ich8lan.c
  user/ngie/make_check/sys/dev/e1000/e1000_ich8lan.h
  user/ngie/make_check/sys/dev/e1000/e1000_mac.h
  user/ngie/make_check/sys/dev/e1000/e1000_mbx.c
  user/ngie/make_check/sys/dev/e1000/e1000_nvm.h
  user/ngie/make_check/sys/dev/e1000/e1000_osdep.h
  user/ngie/make_check/sys/dev/e1000/e1000_phy.c
  user/ngie/make_check/sys/dev/e1000/e1000_regs.h
  user/ngie/make_check/sys/dev/e1000/if_em.c
  user/ngie/make_check/sys/dev/e1000/if_em.h
  user/ngie/make_check/sys/dev/e1000/if_igb.c
  user/ngie/make_check/sys/dev/ed/if_ed.c
  user/ngie/make_check/sys/dev/ep/if_ep.c
  user/ngie/make_check/sys/dev/fe/if_fe.c
  user/ngie/make_check/sys/dev/fxp/if_fxp.c
  user/ngie/make_check/sys/dev/hwpmc/hwpmc_mod.c
  user/ngie/make_check/sys/dev/hyperv/include/hyperv.h
  user/ngie/make_check/sys/dev/hyperv/netvsc/hv_net_vsc.c
  user/ngie/make_check/sys/dev/hyperv/netvsc/hv_net_vsc.h
  user/ngie/make_check/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  user/ngie/make_check/sys/dev/hyperv/netvsc/hv_rndis_filter.c
  user/ngie/make_check/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
  user/ngie/make_check/sys/dev/hyperv/utilities/hv_kvp.c
  user/ngie/make_check/sys/dev/hyperv/utilities/hv_util.c
  user/ngie/make_check/sys/dev/hyperv/vmbus/hv_channel.c
  user/ngie/make_check/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
  user/ngie/make_check/sys/dev/hyperv/vmbus/hv_connection.c
  user/ngie/make_check/sys/dev/hyperv/vmbus/hv_hv.c
  user/ngie/make_check/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
  user/ngie/make_check/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
  user/ngie/make_check/sys/dev/iscsi_initiator/isc_cam.c
  user/ngie/make_check/sys/dev/iscsi_initiator/isc_sm.c
  user/ngie/make_check/sys/dev/iscsi_initiator/isc_soc.c
  user/ngie/make_check/sys/dev/iscsi_initiator/isc_subr.c
  user/ngie/make_check/sys/dev/iscsi_initiator/iscsi_subr.c
  user/ngie/make_check/sys/dev/ixgbe/if_ix.c
  user/ngie/make_check/sys/dev/ixgbe/ixgbe_common.c
  user/ngie/make_check/sys/dev/ixgbe/ixgbe_phy.c
  user/ngie/make_check/sys/dev/ixgbe/ixgbe_type.h
  user/ngie/make_check/sys/dev/ixgbe/ixgbe_x540.c
  user/ngie/make_check/sys/dev/ixgbe/ixgbe_x550.c
  user/ngie/make_check/sys/dev/le/lance.c
  user/ngie/make_check/sys/dev/malo/if_malo.c
  user/ngie/make_check/sys/dev/md/md.c
  user/ngie/make_check/sys/dev/mps/mps.c
  user/ngie/make_check/sys/dev/mps/mps_mapping.c
  user/ngie/make_check/sys/dev/mps/mps_sas.c
  user/ngie/make_check/sys/dev/mps/mpsvar.h
  user/ngie/make_check/sys/dev/netmap/netmap_offloadings.c
  user/ngie/make_check/sys/dev/nvme/nvme.h
  user/ngie/make_check/sys/dev/oce/oce_if.h
  user/ngie/make_check/sys/dev/otus/if_otus.c
  user/ngie/make_check/sys/dev/sfxge/sfxge_rx.c
  user/ngie/make_check/sys/dev/sfxge/sfxge_tx.c
  user/ngie/make_check/sys/dev/sn/if_sn.c
  user/ngie/make_check/sys/dev/tx/if_tx.c
  user/ngie/make_check/sys/dev/usb/wlan/if_rsu.c
  user/ngie/make_check/sys/dev/wi/if_wi.c
  user/ngie/make_check/sys/dev/wi/if_wi_pci.c
  user/ngie/make_check/sys/dev/xe/if_xe.c
  user/ngie/make_check/sys/dev/xl/if_xl.c
  user/ngie/make_check/sys/fs/cd9660/cd9660_vfsops.c
  user/ngie/make_check/sys/fs/ext2fs/ext2_inode_cnv.c
  user/ngie/make_check/sys/fs/fdescfs/fdesc_vnops.c
  user/ngie/make_check/sys/fs/msdosfs/msdosfs_vnops.c
  user/ngie/make_check/sys/kern/imgact_elf.c
  user/ngie/make_check/sys/kern/init_main.c
  user/ngie/make_check/sys/kern/kern_fork.c
  user/ngie/make_check/sys/kern/kern_kthread.c
  user/ngie/make_check/sys/kern/kern_ktr.c
  user/ngie/make_check/sys/kern/kern_malloc.c
  user/ngie/make_check/sys/kern/kern_mbuf.c
  user/ngie/make_check/sys/kern/kern_racct.c
  user/ngie/make_check/sys/kern/subr_mchain.c
  user/ngie/make_check/sys/kern/uipc_debug.c
  user/ngie/make_check/sys/kern/uipc_sockbuf.c
  user/ngie/make_check/sys/kern/uipc_socket.c
  user/ngie/make_check/sys/kern/vfs_aio.c
  user/ngie/make_check/sys/kern/vfs_mount.c
  user/ngie/make_check/sys/kern/vfs_syscalls.c
  user/ngie/make_check/sys/kgssapi/krb5/kcrypto_aes.c
  user/ngie/make_check/sys/mips/conf/AR933X_BASE
  user/ngie/make_check/sys/mips/conf/AR934X_BASE
  user/ngie/make_check/sys/mips/conf/QCA955X_BASE
  user/ngie/make_check/sys/mips/include/asm.h
  user/ngie/make_check/sys/mips/include/cpufunc.h
  user/ngie/make_check/sys/mips/include/cpuregs.h
  user/ngie/make_check/sys/mips/mips/uma_machdep.c
  user/ngie/make_check/sys/mips/mips/vm_machdep.c
  user/ngie/make_check/sys/mips/rt305x/std.rt305x
  user/ngie/make_check/sys/net/bridgestp.c
  user/ngie/make_check/sys/net/if_epair.c
  user/ngie/make_check/sys/net/if_mib.c
  user/ngie/make_check/sys/net/netisr.c
  user/ngie/make_check/sys/net/pfvar.h
  user/ngie/make_check/sys/net80211/ieee80211.c
  user/ngie/make_check/sys/net80211/ieee80211_acl.c
  user/ngie/make_check/sys/net80211/ieee80211_action.c
  user/ngie/make_check/sys/net80211/ieee80211_ageq.c
  user/ngie/make_check/sys/net80211/ieee80211_amrr.c
  user/ngie/make_check/sys/net80211/ieee80211_crypto_none.c
  user/ngie/make_check/sys/net80211/ieee80211_ddb.c
  user/ngie/make_check/sys/net80211/ieee80211_freebsd.c
  user/ngie/make_check/sys/net80211/ieee80211_ht.c
  user/ngie/make_check/sys/net80211/ieee80211_ioctl.c
  user/ngie/make_check/sys/net80211/ieee80211_output.c
  user/ngie/make_check/sys/net80211/ieee80211_power.c
  user/ngie/make_check/sys/net80211/ieee80211_proto.c
  user/ngie/make_check/sys/net80211/ieee80211_scan.c
  user/ngie/make_check/sys/net80211/ieee80211_scan_sta.c
  user/ngie/make_check/sys/net80211/ieee80211_scan_sw.c
  user/ngie/make_check/sys/net80211/ieee80211_xauth.c
  user/ngie/make_check/sys/netgraph/netflow/netflow.c
  user/ngie/make_check/sys/netgraph/netflow/netflow_v9.c
  user/ngie/make_check/sys/netgraph/netflow/ng_netflow.c
  user/ngie/make_check/sys/netgraph/ng_base.c
  user/ngie/make_check/sys/netinet/in_proto.c
  user/ngie/make_check/sys/netinet/sctp_sysctl.c
  user/ngie/make_check/sys/netinet/sctp_uio.h
  user/ngie/make_check/sys/netinet/tcp_lro.c
  user/ngie/make_check/sys/netinet/toecore.c
  user/ngie/make_check/sys/netinet6/in6_proto.c
  user/ngie/make_check/sys/netinet6/send.c
  user/ngie/make_check/sys/netipsec/ipsec_mbuf.c
  user/ngie/make_check/sys/netipsec/key_debug.c
  user/ngie/make_check/sys/netpfil/ipfw/ip_fw_log.c
  user/ngie/make_check/sys/powerpc/fpu/fpu_emu.c
  user/ngie/make_check/sys/powerpc/fpu/fpu_emu.h
  user/ngie/make_check/sys/powerpc/fpu/fpu_explode.c
  user/ngie/make_check/sys/powerpc/fpu/fpu_extern.h
  user/ngie/make_check/sys/powerpc/include/reg.h
  user/ngie/make_check/sys/powerpc/mpc85xx/lbc.c
  user/ngie/make_check/sys/powerpc/powerpc/exec_machdep.c
  user/ngie/make_check/sys/powerpc/powerpc/nexus.c
  user/ngie/make_check/sys/powerpc/powerpc/sigcode32.S
  user/ngie/make_check/sys/powerpc/powerpc/uma_machdep.c
  user/ngie/make_check/sys/riscv/include/asm.h
  user/ngie/make_check/sys/riscv/include/pcpu.h
  user/ngie/make_check/sys/riscv/riscv/exception.S
  user/ngie/make_check/sys/riscv/riscv/genassym.c
  user/ngie/make_check/sys/riscv/riscv/machdep.c
  user/ngie/make_check/sys/riscv/riscv/swtch.S
  user/ngie/make_check/sys/riscv/riscv/uma_machdep.c
  user/ngie/make_check/sys/riscv/riscv/vm_machdep.c
  user/ngie/make_check/sys/rpc/replay.c
  user/ngie/make_check/sys/sparc64/sparc64/vm_machdep.c
  user/ngie/make_check/sys/sys/ata.h
  user/ngie/make_check/sys/sys/event.h
  user/ngie/make_check/sys/sys/proc.h
  user/ngie/make_check/sys/sys/socketvar.h
  user/ngie/make_check/sys/tools/embed_mfs.sh
  user/ngie/make_check/sys/vm/memguard.c
  user/ngie/make_check/sys/vm/sg_pager.c
  user/ngie/make_check/sys/vm/uma.h
  user/ngie/make_check/sys/vm/uma_core.c
  user/ngie/make_check/sys/vm/uma_dbg.c
  user/ngie/make_check/sys/vm/uma_dbg.h
  user/ngie/make_check/sys/vm/uma_int.h
  user/ngie/make_check/sys/vm/vm_page.c
  user/ngie/make_check/tests/sys/acl/Makefile
  user/ngie/make_check/tests/sys/geom/class/gate/1_test.sh
  user/ngie/make_check/tools/tools/ath/athaggrstats/main.c
  user/ngie/make_check/tools/tools/ath/athdebug/athdebug.c
  user/ngie/make_check/tools/tools/ath/athradar/athradar.c
  user/ngie/make_check/tools/tools/ath/athratestats/main.c
  user/ngie/make_check/tools/tools/ath/athspectral/athspectral.c
  user/ngie/make_check/tools/tools/ath/athstats/main.c
  user/ngie/make_check/usr.bin/netstat/inet.c
  user/ngie/make_check/usr.bin/netstat/sctp.c
  user/ngie/make_check/usr.bin/netstat/unix.c
  user/ngie/make_check/usr.sbin/bsdconfig/bsdconfig
  user/ngie/make_check/usr.sbin/bsdconfig/networking/share/media.subr
  user/ngie/make_check/usr.sbin/bsdconfig/networking/share/resolv.subr
  user/ngie/make_check/usr.sbin/bsdconfig/share/common.subr
  user/ngie/make_check/usr.sbin/bsdconfig/share/device.subr
  user/ngie/make_check/usr.sbin/bsdconfig/share/strings.subr
  user/ngie/make_check/usr.sbin/ctld/Makefile
  user/ngie/make_check/usr.sbin/ctld/ctld.c
  user/ngie/make_check/usr.sbin/ctld/ctld.h
  user/ngie/make_check/usr.sbin/ctld/parse.y
  user/ngie/make_check/usr.sbin/devctl/devctl.8
  user/ngie/make_check/usr.sbin/freebsd-update/freebsd-update.sh
  user/ngie/make_check/usr.sbin/sysrc/sysrc
  user/ngie/make_check/usr.sbin/sysrc/sysrc.8
Directory Properties:
  user/ngie/make_check/   (props changed)
  user/ngie/make_check/contrib/elftoolchain/   (props changed)
  user/ngie/make_check/contrib/libucl/   (props changed)
  user/ngie/make_check/contrib/openresolv/   (props changed)
  user/ngie/make_check/contrib/unbound/   (props changed)
  user/ngie/make_check/crypto/openssh/   (props changed)
  user/ngie/make_check/lib/libc/   (props changed)
  user/ngie/make_check/sbin/   (props changed)
  user/ngie/make_check/share/   (props changed)
  user/ngie/make_check/share/man/man4/   (props changed)
  user/ngie/make_check/sys/   (props changed)
  user/ngie/make_check/sys/boot/   (props changed)
  user/ngie/make_check/sys/cddl/contrib/opensolaris/   (props changed)
  user/ngie/make_check/sys/conf/   (props changed)
  user/ngie/make_check/sys/contrib/ipfilter/   (props changed)
  user/ngie/make_check/sys/dev/hyperv/   (props changed)

Modified: user/ngie/make_check/Makefile
==============================================================================
--- user/ngie/make_check/Makefile	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/Makefile	Sun Feb  7 04:58:06 2016	(r295364)
@@ -137,6 +137,7 @@ TGTS+=	${BITGTS}
 .ORDER: buildworld installworld
 .ORDER: buildworld distributeworld
 .ORDER: buildworld buildkernel
+.ORDER: installworld distribution
 .ORDER: buildkernel installkernel
 .ORDER: buildkernel installkernel.debug
 .ORDER: buildkernel reinstallkernel
@@ -333,7 +334,7 @@ regress: .PHONY
 	@echo "'make regress' has been renamed 'make check'" | /usr/bin/fmt
 	@false
 
-tinderbox toolchains kernel-toolchains: upgrade_checks
+tinderbox toolchains kernel-toolchains kernels worlds: upgrade_checks
 
 tinderbox:
 	@cd ${.CURDIR}; ${SUB_MAKE} DOING_TINDERBOX=YES universe
@@ -344,6 +345,12 @@ toolchains:
 kernel-toolchains:
 	@cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe
 
+kernels:
+	@cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildkernel universe
+
+worlds:
+	@cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildworld universe
+
 #
 # universe
 #

Modified: user/ngie/make_check/Makefile.inc1
==============================================================================
--- user/ngie/make_check/Makefile.inc1	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/Makefile.inc1	Sun Feb  7 04:58:06 2016	(r295364)
@@ -73,7 +73,7 @@ SRCDIR?=	${.CURDIR}
 SUBDIR=	${SUBDIR_OVERRIDE}
 .else
 SUBDIR=	lib libexec
-.if make(install*)
+.if !defined(NO_ROOT) && (make(installworld) || make(install))
 # Ensure libraries are installed before progressing.
 SUBDIR+=.WAIT
 .endif
@@ -128,7 +128,7 @@ SUBDIR+=	${_DIR}
 # by calling 'makedb' in share/man.  This is only relevant for
 # install/distribute so they build the whatis file after every manpage is
 # installed.
-.if make(install*)
+.if make(installworld) || make(install)
 SUBDIR+=.WAIT
 .endif
 SUBDIR+=etc
@@ -1084,16 +1084,14 @@ redistribute: .MAKE .PHONY
 	    DISTRIBUTION=lib32
 .endif
 
-distrib-dirs: .MAKE .PHONY
-	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
-	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
-
-distribution: .MAKE .PHONY
+distrib-dirs distribution: .MAKE .PHONY
 	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
 	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
+.if make(distribution)
 	${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \
 		${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \
 		METALOG=${METALOG} installconfig
+.endif
 
 #
 # buildkernel and installkernel

Modified: user/ngie/make_check/bin/csh/Makefile
==============================================================================
--- user/ngie/make_check/bin/csh/Makefile	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/bin/csh/Makefile	Sun Feb  7 04:58:06 2016	(r295364)
@@ -51,41 +51,40 @@ FILESDIR= ${SHAREDIR}/examples/tcsh
 FILES= complete.tcsh csh-mode.el
 .endif
 
-CATALOGS=	et:et_EE.ISO8859-15 \
-		finnish:fi_FI.ISO8859-1 \
-		french:fr_FR.ISO8859-1 \
-		german:de_DE.ISO8859-1 \
-		greek:el_GR.ISO8859-7 \
-		italian:it_IT.ISO8859-1 \
-		ja:ja_JP.eucJP \
-		russian:ru_RU.KOI8-R \
-		spanish:es_ES.ISO8859-1 \
-		ukrainian:uk_UA.KOI8-U
-
-NLSLINKS_fi_FI.ISO8859-1= fi_FI.ISO8859-15
-NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
-		fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 \
-		fr_CH.ISO8859-15 fr_FR.ISO8859-15
-NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
-		de_CH.ISO8859-15 de_DE.ISO8859-15
-NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15
-NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15
+CATALOGS=	et:et_EE.UTF-8 \
+		finnish:fi_FI.UTF-8 \
+		french:fr_FR.UTF-8 \
+		german:de_DE.UTF-8 \
+		greek:el_GR.UTF-8 \
+		italian:it_IT.UTF-8 \
+		ja:ja_JP.UTF-8 \
+		russian:ru_RU.UTF-8 \
+		spanish:es_ES.UTF-8 \
+		ukrainian:uk_UA.UTF-8
+
+NLSLINKS_de_DE.UTF-8 = de_AT.UTF-8 de_CH.UTF-8
+NLSLINKS_fr_FR.UTF-8 = fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8
+NLSLINKS_it_IT.UTF-8 = it_CH.UTF-8
 
 .if ${MK_NLS_CATALOGS} == "no" || defined(RESCUE)
 CFLAGS+= -DNO_NLS_CATALOGS
 .else
 CFLAGS+= -DHAVE_ICONV
 .if ${MK_ICONV} != "no"
-NLSLINKS_de_DE.ISO8859-1 += de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8
-NLSLINKS_el_GR.ISO8859-7 = el_GR.UTF-8
-NLSLINKS_es_ES.ISO8859-1 += es_ES.UTF-8
-NLSLINKS_et_EE.ISO8859-15 = et_EE.UTF-8
-NLSLINKS_fi_FI.ISO8859-1 += fi_FI.UTF-8
-NLSLINKS_fr_FR.ISO8859-1 += fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8
-NLSLINKS_it_IT.ISO8859-1 += it_CH.UTF-8 it_IT.UTF-8
-NLSLINKS_ja_JP.eucJP = ja_JP.SJIS ja_JP.UTF-8
-NLSLINKS_ru_RU.KOI8-R = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.UTF-8
-NLSLINKS_uk_UA.KOI8-U = uk_UA.ISO8859-5 uk_UA.UTF-8
+NLSLINKS_de_DE.UTF-8 += de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
+		de_CH.ISO8859-15 de_DE.ISO8859-1 de_DE.ISO8859-15
+NLSLINKS_el_GR.UTF-8 = el_GR.ISO8859-7
+NLSLINKS_es_ES.UTF-8 = es_ES.ISO8859-1 es_ES.ISO8859-15
+NLSLINKS_et_EE.UTF-8 = et_EE.ISO8859-15
+NLSLINKS_fi_FI.UTF-8 = fi_FI.ISO8859-1 fi_FI.ISO8859-15
+NLSLINKS_fr_FR.UTF-8 += fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
+		fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 \
+		fr_CH.ISO8859-15 fr_FR.ISO8859-1 fr_FR.ISO8859-15
+NLSLINKS_it_IT.UTF-8 += it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-1 \
+		it_IT.ISO8859-15
+NLSLINKS_ja_JP.UTF-8 = ja_JP.SJIS ja_JP.eucJP
+NLSLINKS_ru_RU.UTF-8 = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.KOI8-R
+NLSLINKS_uk_UA.UTF-8 = uk_UA.ISO8859-5 uk_UA.KOI8-U
 .else
 # Above links can be installed from ports/shells/tcsh_nls
 

Modified: user/ngie/make_check/bin/csh/iconv_stub.c
==============================================================================
--- user/ngie/make_check/bin/csh/iconv_stub.c	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/bin/csh/iconv_stub.c	Sun Feb  7 04:58:06 2016	(r295364)
@@ -36,9 +36,9 @@
 #undef iconv_close
 
 #define ICONVLIB	"libiconv.so"
-#define ICONV_ENGINE	"iconv"
-#define ICONV_OPEN	"iconv_open"
-#define ICONV_CLOSE	"iconv_close"
+#define ICONV_ENGINE	"libiconv"
+#define ICONV_OPEN	"libiconv_open"
+#define ICONV_CLOSE	"libiconv_close"
 
 typedef iconv_t iconv_open_t(const char *, const char *);
 

Modified: user/ngie/make_check/bin/dd/args.c
==============================================================================
--- user/ngie/make_check/bin/dd/args.c	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/bin/dd/args.c	Sun Feb  7 04:58:06 2016	(r295364)
@@ -360,6 +360,46 @@ c_conv(const void *a, const void *b)
 	    ((const struct conv *)b)->name));
 }
 
+static uintmax_t
+postfix_to_mult(const char expr)
+{
+	uintmax_t mult;
+
+	mult = 0;
+	switch (expr) {
+	case 'B':
+	case 'b':
+		mult = 512;
+		break;
+	case 'K':
+	case 'k':
+		mult = 1 << 10;
+		break;
+	case 'M':
+	case 'm':
+		mult = 1 << 20;
+		break;
+	case 'G':
+	case 'g':
+		mult = 1 << 30;
+		break;
+	case 'T':
+	case 't':
+		mult = (uintmax_t)1 << 40;
+		break;
+	case 'P':
+	case 'p':
+		mult = (uintmax_t)1 << 50;
+		break;
+	case 'W':
+	case 'w':
+		mult = sizeof(int);
+		break;
+	}
+
+	return (mult);
+}
+
 /*
  * Convert an expression of the following forms to a uintmax_t.
  * 	1) A positive decimal number.
@@ -386,31 +426,7 @@ get_num(const char *val)
 	if (expr == val)			/* No valid digits. */
 		errx(1, "%s: illegal numeric value", oper);
 
-	mult = 0;
-	switch (*expr) {
-	case 'B':
-	case 'b':
-		mult = 512;
-		break;
-	case 'K':
-	case 'k':
-		mult = 1 << 10;
-		break;
-	case 'M':
-	case 'm':
-		mult = 1 << 20;
-		break;
-	case 'G':
-	case 'g':
-		mult = 1 << 30;
-		break;
-	case 'W':
-	case 'w':
-		mult = sizeof(int);
-		break;
-	default:
-		;
-	}
+	mult = postfix_to_mult(*expr);
 
 	if (mult != 0) {
 		prevnum = num;
@@ -460,29 +476,7 @@ get_off_t(const char *val)
 	if (expr == val)			/* No valid digits. */
 		errx(1, "%s: illegal numeric value", oper);
 
-	mult = 0;
-	switch (*expr) {
-	case 'B':
-	case 'b':
-		mult = 512;
-		break;
-	case 'K':
-	case 'k':
-		mult = 1 << 10;
-		break;
-	case 'M':
-	case 'm':
-		mult = 1 << 20;
-		break;
-	case 'G':
-	case 'g':
-		mult = 1 << 30;
-		break;
-	case 'W':
-	case 'w':
-		mult = sizeof(int);
-		break;
-	}
+	mult = postfix_to_mult(*expr);
 
 	if (mult != 0) {
 		prevnum = num;

Modified: user/ngie/make_check/bin/dd/dd.1
==============================================================================
--- user/ngie/make_check/bin/dd/dd.1	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/bin/dd/dd.1	Sun Feb  7 04:58:06 2016	(r295364)
@@ -32,7 +32,7 @@
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
 .\" $FreeBSD$
 .\"
-.Dd August 28, 2014
+.Dd February 4, 2016
 .Dt DD 1
 .Os
 .Sh NAME
@@ -332,10 +332,13 @@ If the number ends with a
 .Dq Li k ,
 .Dq Li m ,
 .Dq Li g ,
+.Dq Li t ,
+.Dq Li p ,
 or
 .Dq Li w ,
 the
-number is multiplied by 512, 1024 (1K), 1048576 (1M), 1073741824 (1G)
+number is multiplied by 512, 1024 (1K), 1048576 (1M), 1073741824 (1G),
+1099511627776 (1T), 1125899906842624 (1P)
 or the number of bytes in an integer, respectively.
 Two or more numbers may be separated by an
 .Dq Li x

Modified: user/ngie/make_check/bin/sh/redir.c
==============================================================================
--- user/ngie/make_check/bin/sh/redir.c	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/bin/sh/redir.c	Sun Feb  7 04:58:06 2016	(r295364)
@@ -70,6 +70,7 @@ struct redirtab {
 	struct redirtab *next;
 	int renamed[10];
 	int fd0_redirected;
+	unsigned int empty_redirs;
 };
 
 
@@ -82,6 +83,9 @@ static struct redirtab *redirlist;
 */
 static int fd0_redirected = 0;
 
+/* Number of redirtabs that have not been allocated. */
+static unsigned int empty_redirs = 0;
+
 static void openredirect(union node *, char[10 ]);
 static int openhere(union node *);
 
@@ -115,12 +119,17 @@ redirect(union node *redir, int flags)
 		memory[i] = 0;
 	memory[1] = flags & REDIR_BACKQ;
 	if (flags & REDIR_PUSH) {
-		sv = ckmalloc(sizeof (struct redirtab));
-		for (i = 0 ; i < 10 ; i++)
-			sv->renamed[i] = EMPTY;
-		sv->fd0_redirected = fd0_redirected;
-		sv->next = redirlist;
-		redirlist = sv;
+		empty_redirs++;
+		if (redir != NULL) {
+			sv = ckmalloc(sizeof (struct redirtab));
+			for (i = 0 ; i < 10 ; i++)
+				sv->renamed[i] = EMPTY;
+			sv->fd0_redirected = fd0_redirected;
+			sv->empty_redirs = empty_redirs - 1;
+			sv->next = redirlist;
+			redirlist = sv;
+			empty_redirs = 0;
+		}
 	}
 	for (n = redir ; n ; n = n->nfile.next) {
 		fd = n->nfile.fd;
@@ -303,6 +312,12 @@ popredir(void)
 	struct redirtab *rp = redirlist;
 	int i;
 
+	INTOFF;
+	if (empty_redirs > 0) {
+		empty_redirs--;
+		INTON;
+		return;
+	}
 	for (i = 0 ; i < 10 ; i++) {
 		if (rp->renamed[i] != EMPTY) {
 			if (rp->renamed[i] >= 0) {
@@ -313,8 +328,8 @@ popredir(void)
 			}
 		}
 	}
-	INTOFF;
 	fd0_redirected = rp->fd0_redirected;
+	empty_redirs = rp->empty_redirs;
 	redirlist = rp->next;
 	ckfree(rp);
 	INTON;

Modified: user/ngie/make_check/bin/sh/sh.1
==============================================================================
--- user/ngie/make_check/bin/sh/sh.1	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/bin/sh/sh.1	Sun Feb  7 04:58:06 2016	(r295364)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd August 29, 2015
+.Dd January 30, 2016
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1952,13 +1952,20 @@ Execute the specified built-in command,
 This is useful when the user wishes to override a shell function
 with the same name as a built-in command.
 .It Ic cd Oo Fl L | P Oc Oo Fl e Oc Op Ar directory
+.It Ic cd Fl
 Switch to the specified
 .Ar directory ,
-or to the directory specified in the
+to the directory specified in the
 .Va HOME
 environment variable if no
 .Ar directory
-is specified.
+is specified or
+to the directory specified in the
+.Va OLDPWD
+environment variable if
+.Ar directory
+is
+.Fl .
 If
 .Ar directory
 does not begin with
@@ -1982,10 +1989,12 @@ the
 .Ic cd
 command will print out the name of the directory
 that it actually switched to
-if this is different from the name that the user gave.
-These may be different either because the
+if the
 .Va CDPATH
-mechanism was used or because a symbolic link was crossed.
+mechanism was used or if
+.Ar directory
+was
+.Fl .
 .Pp
 If the
 .Fl P
@@ -2774,6 +2783,10 @@ Initialization file for interactive shel
 Locale settings.
 These are inherited by children of the shell,
 and is used in a limited manner by the shell itself.
+.It Ev OLDPWD
+The previous current directory.
+This is used and updated by
+.Ic cd .
 .It Ev PWD
 An absolute pathname for the current directory,
 possibly containing symbolic links.

Modified: user/ngie/make_check/bin/test/test.c
==============================================================================
--- user/ngie/make_check/bin/test/test.c	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/bin/test/test.c	Sun Feb  7 04:58:06 2016	(r295364)
@@ -120,51 +120,53 @@ enum token {
 
 #define TOKEN_TYPE(token) ((token) & 0xff00)
 
-static struct t_op {
-	char op_text[4];
+static const struct t_op {
+	char op_text[2];
 	short op_num;
-} const ops [] = {
-	{"-r",	FILRD},
-	{"-w",	FILWR},
-	{"-x",	FILEX},
-	{"-e",	FILEXIST},
-	{"-f",	FILREG},
-	{"-d",	FILDIR},
-	{"-c",	FILCDEV},
-	{"-b",	FILBDEV},
-	{"-p",	FILFIFO},
-	{"-u",	FILSUID},
-	{"-g",	FILSGID},
-	{"-k",	FILSTCK},
-	{"-s",	FILGZ},
-	{"-t",	FILTT},
-	{"-z",	STREZ},
-	{"-n",	STRNZ},
-	{"-h",	FILSYM},		/* for backwards compat */
-	{"-O",	FILUID},
-	{"-G",	FILGID},
-	{"-L",	FILSYM},
-	{"-S",	FILSOCK},
+} ops1[] = {
 	{"=",	STREQ},
-	{"==",	STREQ},
-	{"!=",	STRNE},
 	{"<",	STRLT},
 	{">",	STRGT},
-	{"-eq",	INTEQ},
-	{"-ne",	INTNE},
-	{"-ge",	INTGE},
-	{"-gt",	INTGT},
-	{"-le",	INTLE},
-	{"-lt",	INTLT},
-	{"-nt",	FILNT},
-	{"-ot",	FILOT},
-	{"-ef",	FILEQ},
 	{"!",	UNOT},
-	{"-a",	BAND},
-	{"-o",	BOR},
 	{"(",	LPAREN},
 	{")",	RPAREN},
-	{"",	0}
+}, opsm1[] = {
+	{"r",	FILRD},
+	{"w",	FILWR},
+	{"x",	FILEX},
+	{"e",	FILEXIST},
+	{"f",	FILREG},
+	{"d",	FILDIR},
+	{"c",	FILCDEV},
+	{"b",	FILBDEV},
+	{"p",	FILFIFO},
+	{"u",	FILSUID},
+	{"g",	FILSGID},
+	{"k",	FILSTCK},
+	{"s",	FILGZ},
+	{"t",	FILTT},
+	{"z",	STREZ},
+	{"n",	STRNZ},
+	{"h",	FILSYM},		/* for backwards compat */
+	{"O",	FILUID},
+	{"G",	FILGID},
+	{"L",	FILSYM},
+	{"S",	FILSOCK},
+	{"a",	BAND},
+	{"o",	BOR},
+}, ops2[] = {
+	{"==",	STREQ},
+	{"!=",	STRNE},
+}, opsm2[] = {
+	{"eq",	INTEQ},
+	{"ne",	INTNE},
+	{"ge",	INTGE},
+	{"gt",	INTGT},
+	{"le",	INTLE},
+	{"lt",	INTLT},
+	{"nt",	FILNT},
+	{"ot",	FILOT},
+	{"ef",	FILEQ},
 };
 
 static int nargc;
@@ -416,35 +418,71 @@ filstat(char *nm, enum token mode)
 	}
 }
 
-static enum token
-t_lex(char *s)
+static int
+find_op_1char(const struct t_op *op, const struct t_op *end, const char *s)
 {
-	struct t_op const *op = ops;
+	char c;
 
-	if (s == 0) {
-		return EOI;
+	c = s[0];
+	while (op != end) {
+		if (c == *op->op_text)
+			return op->op_num;
+		op++;
 	}
-	while (*op->op_text) {
-		if (strcmp(s, op->op_text) == 0) {
-			if (((TOKEN_TYPE(op->op_num) == UNOP ||
-			    TOKEN_TYPE(op->op_num) == BUNOP)
-						&& isunopoperand()) ||
-			    (op->op_num == LPAREN && islparenoperand()) ||
-			    (op->op_num == RPAREN && isrparenoperand()))
-				break;
+	return OPERAND;
+}
+
+static int
+find_op_2char(const struct t_op *op, const struct t_op *end, const char *s)
+{
+	while (op != end) {
+		if (s[0] == op->op_text[0] && s[1] == op->op_text[1])
 			return op->op_num;
-		}
 		op++;
 	}
 	return OPERAND;
 }
 
 static int
+find_op(const char *s)
+{
+	if (s[0] == '\0')
+		return OPERAND;
+	else if (s[1] == '\0')
+		return find_op_1char(ops1, (&ops1)[1], s);
+	else if (s[2] == '\0')
+		return s[0] == '-' ? find_op_1char(opsm1, (&opsm1)[1], s + 1) :
+		    find_op_2char(ops2, (&ops2)[1], s);
+	else if (s[3] == '\0')
+		return s[0] == '-' ? find_op_2char(opsm2, (&opsm2)[1], s + 1) :
+		    OPERAND;
+	else
+		return OPERAND;
+}
+
+static enum token
+t_lex(char *s)
+{
+	int num;
+
+	if (s == 0) {
+		return EOI;
+	}
+	num = find_op(s);
+	if (((TOKEN_TYPE(num) == UNOP || TOKEN_TYPE(num) == BUNOP)
+				&& isunopoperand()) ||
+	    (num == LPAREN && islparenoperand()) ||
+	    (num == RPAREN && isrparenoperand()))
+		return OPERAND;
+	return num;
+}
+
+static int
 isunopoperand(void)
 {
-	struct t_op const *op = ops;
 	char *s;
 	char *t;
+	int num;
 
 	if (nargc == 1)
 		return 1;
@@ -452,20 +490,16 @@ isunopoperand(void)
 	if (nargc == 2)
 		return parenlevel == 1 && strcmp(s, ")") == 0;
 	t = *(t_wp + 2);
-	while (*op->op_text) {
-		if (strcmp(s, op->op_text) == 0)
-			return TOKEN_TYPE(op->op_num) == BINOP &&
-			    (parenlevel == 0 || t[0] != ')' || t[1] != '\0');
-		op++;
-	}
-	return 0;
+	num = find_op(s);
+	return TOKEN_TYPE(num) == BINOP &&
+	    (parenlevel == 0 || t[0] != ')' || t[1] != '\0');
 }
 
 static int
 islparenoperand(void)
 {
-	struct t_op const *op = ops;
 	char *s;
+	int num;
 
 	if (nargc == 1)
 		return 1;
@@ -474,12 +508,8 @@ islparenoperand(void)
 		return parenlevel == 1 && strcmp(s, ")") == 0;
 	if (nargc != 3)
 		return 0;
-	while (*op->op_text) {
-		if (strcmp(s, op->op_text) == 0)
-			return TOKEN_TYPE(op->op_num) == BINOP;
-		op++;
-	}
-	return 0;
+	num = find_op(s);
+	return TOKEN_TYPE(num) == BINOP;
 }
 
 static int

Modified: user/ngie/make_check/contrib/bsnmp/snmp_mibII/mibII.c
==============================================================================
--- user/ngie/make_check/contrib/bsnmp/snmp_mibII/mibII.c	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/contrib/bsnmp/snmp_mibII/mibII.c	Sun Feb  7 04:58:06 2016	(r295364)
@@ -982,7 +982,7 @@ handle_rtmsg(struct rt_msghdr *rtm)
 {
 	struct sockaddr *addrs[RTAX_MAX];
 	struct if_msghdr *ifm;
-	struct ifa_msghdr ifam;
+	struct ifa_msghdr ifam, *ifamp;
 	struct ifma_msghdr *ifmam;
 #ifdef RTM_IFANNOUNCE
 	struct if_announcemsghdr *ifan;
@@ -1002,8 +1002,9 @@ handle_rtmsg(struct rt_msghdr *rtm)
 	switch (rtm->rtm_type) {
 
 	  case RTM_NEWADDR:
-		memcpy(&ifam, rtm, sizeof(ifam));
-		mib_extract_addrs(ifam.ifam_addrs, (u_char *)(&ifam + 1), addrs);
+		ifamp = (struct ifa_msghdr *)rtm;
+		memcpy(&ifam, ifamp, sizeof(ifam));
+		mib_extract_addrs(ifam.ifam_addrs, (u_char *)(ifamp + 1), addrs);
 		if (addrs[RTAX_IFA] == NULL || addrs[RTAX_NETMASK] == NULL)
 			break;
 
@@ -1029,8 +1030,9 @@ handle_rtmsg(struct rt_msghdr *rtm)
 		break;
 
 	  case RTM_DELADDR:
-		memcpy(&ifam, rtm, sizeof(ifam));
-		mib_extract_addrs(ifam.ifam_addrs, (u_char *)(&ifam + 1), addrs);
+		ifamp = (struct ifa_msghdr *)rtm;
+		memcpy(&ifam, ifamp, sizeof(ifam));
+		mib_extract_addrs(ifam.ifam_addrs, (u_char *)(ifamp + 1), addrs);
 		if (addrs[RTAX_IFA] == NULL)
 			break;
 

Modified: user/ngie/make_check/contrib/elftoolchain/readelf/readelf.c
==============================================================================
--- user/ngie/make_check/contrib/elftoolchain/readelf/readelf.c	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/contrib/elftoolchain/readelf/readelf.c	Sun Feb  7 04:58:06 2016	(r295364)
@@ -1053,8 +1053,9 @@ static struct {
 static const char *
 r_type(unsigned int mach, unsigned int type)
 {
+	static char s_type[32];
+
 	switch(mach) {
-	case EM_NONE: return "";
 	case EM_386:
 	case EM_IAMCU:
 		switch(type) {
@@ -1089,8 +1090,8 @@ r_type(unsigned int mach, unsigned int t
 		case 35: return "R_386_TLS_DTPMOD32";
 		case 36: return "R_386_TLS_DTPOFF32";
 		case 37: return "R_386_TLS_TPOFF32";
-		default: return "";
 		}
+		break;
 	case EM_AARCH64:
 		switch(type) {
 		case 0: return "R_AARCH64_NONE";
@@ -1145,6 +1146,16 @@ r_type(unsigned int mach, unsigned int t
 		case 311: return "R_AARCH64_ADR_GOT_PAGE";
 		case 312: return "R_AARCH64_LD64_GOT_LO12_NC";
 		case 313: return "R_AARCH64_LD64_GOTPAGE_LO15";
+		case 560: return "R_AARCH64_TLSDESC_LD_PREL19";
+		case 561: return "R_AARCH64_TLSDESC_ADR_PREL21";
+		case 562: return "R_AARCH64_TLSDESC_ADR_PAGE21";
+		case 563: return "R_AARCH64_TLSDESC_LD64_LO12";
+		case 564: return "R_AARCH64_TLSDESC_ADD_LO12";
+		case 565: return "R_AARCH64_TLSDESC_OFF_G1";
+		case 566: return "R_AARCH64_TLSDESC_OFF_G0_NC";
+		case 567: return "R_AARCH64_TLSDESC_LDR";
+		case 568: return "R_AARCH64_TLSDESC_ADD";
+		case 569: return "R_AARCH64_TLSDESC_CALL";
 		case 1024: return "R_AARCH64_COPY";
 		case 1025: return "R_AARCH64_GLOB_DAT";
 		case 1026: return "R_AARCH64_JUMP_SLOT";
@@ -1154,8 +1165,8 @@ r_type(unsigned int mach, unsigned int t
 		case 1030: return "R_AARCH64_TLS_TPREL64";
 		case 1031: return "R_AARCH64_TLSDESC";
 		case 1032: return "R_AARCH64_IRELATIVE";
-		default: return "";
 		}
+		break;
 	case EM_ARM:
 		switch(type) {
 		case 0: return "R_ARM_NONE";
@@ -1206,8 +1217,8 @@ r_type(unsigned int mach, unsigned int t
 		case 253: return "R_ARM_RABS32";
 		case 254: return "R_ARM_RPC24";
 		case 255: return "R_ARM_RBASE";
-		default: return "";
 		}
+		break;
 	case EM_IA_64:
 		switch(type) {
 		case 0: return "R_IA_64_NONE";
@@ -1290,8 +1301,8 @@ r_type(unsigned int mach, unsigned int t
 		case 182: return "R_IA_64_DTPREL64MSB";
 		case 183: return "R_IA_64_DTPREL64LSB";
 		case 186: return "R_IA_64_LTOFF_DTPREL22";
-		default: return "";
 		}
+		break;
 	case EM_MIPS:
 		switch(type) {
 		case 0: return "R_MIPS_NONE";
@@ -1324,9 +1335,8 @@ r_type(unsigned int mach, unsigned int t
 		case 48: return "R_MIPS_TLS_TPREL64";
 		case 49: return "R_MIPS_TLS_TPREL_HI16";
 		case 50: return "R_MIPS_TLS_TPREL_LO16";
-
-		default: return "";
 		}
+		break;
 	case EM_PPC:
 		switch(type) {
 		case 0: return "R_PPC_NONE";
@@ -1406,8 +1416,8 @@ r_type(unsigned int mach, unsigned int t
 		case 114: return "R_PPC_EMB_RELST_HA";
 		case 115: return "R_PPC_EMB_BIT_FLD";
 		case 116: return "R_PPC_EMB_RELSDA";
-		default: return "";
 		}
+		break;
 	case EM_RISCV:
 		switch(type) {
 		case 0: return "R_RISCV_NONE";
@@ -1453,6 +1463,7 @@ r_type(unsigned int mach, unsigned int t
 		case 44: return "R_RISCV_RVC_BRANCH";
 		case 45: return "R_RISCV_RVC_JUMP";
 		}
+		break;
 	case EM_SPARC:
 	case EM_SPARCV9:
 		switch(type) {
@@ -1536,8 +1547,8 @@ r_type(unsigned int mach, unsigned int t
 		case 77: return "R_SPARC_TLS_DTPOFF64";
 		case 78: return "R_SPARC_TLS_TPOFF32";
 		case 79: return "R_SPARC_TLS_TPOFF64";
-		default: return "";
 		}
+		break;
 	case EM_X86_64:
 		switch(type) {
 		case 0: return "R_X86_64_NONE";
@@ -1578,10 +1589,12 @@ r_type(unsigned int mach, unsigned int t
 		case 35: return "R_X86_64_TLSDESC_CALL";
 		case 36: return "R_X86_64_TLSDESC";
 		case 37: return "R_X86_64_IRELATIVE";
-		default: return "";
 		}
-	default: return "";
+		break;
 	}
+
+	snprintf(s_type, sizeof(s_type), "<unknown: %#x>", type);
+	return (s_type);
 }
 
 static const char *

Modified: user/ngie/make_check/contrib/ofed/librdmacm/examples/build/cmatose/Makefile
==============================================================================
--- user/ngie/make_check/contrib/ofed/librdmacm/examples/build/cmatose/Makefile	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/contrib/ofed/librdmacm/examples/build/cmatose/Makefile	Sun Feb  7 04:58:06 2016	(r295364)
@@ -5,7 +5,6 @@
 PROG=	cmatose
 MAN=
 SRCS=	cmatose.c
-LDADD+= -libverbs -lrdmacm -lpthread
-LDADD+= -lmlx4
+LIBADD=	ibverbs rdmacm pthread mlx4
 
 .include <bsd.prog.mk>

Modified: user/ngie/make_check/contrib/ofed/librdmacm/examples/build/mckey/Makefile
==============================================================================
--- user/ngie/make_check/contrib/ofed/librdmacm/examples/build/mckey/Makefile	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/contrib/ofed/librdmacm/examples/build/mckey/Makefile	Sun Feb  7 04:58:06 2016	(r295364)
@@ -5,7 +5,6 @@
 PROG=	mckey
 MAN=
 SRCS=	mckey.c
-LDADD+= -libverbs -lrdmacm -lpthread
-LDADD+= -lmlx4
+LIBADD=	ibverbs rdmacm pthread mlx4
 
 .include <bsd.prog.mk>

Modified: user/ngie/make_check/contrib/ofed/librdmacm/examples/build/udaddy/Makefile
==============================================================================
--- user/ngie/make_check/contrib/ofed/librdmacm/examples/build/udaddy/Makefile	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/contrib/ofed/librdmacm/examples/build/udaddy/Makefile	Sun Feb  7 04:58:06 2016	(r295364)
@@ -5,7 +5,6 @@
 PROG=	udaddy
 MAN=
 SRCS=	udaddy.c
-LDADD+= -libverbs -lrdmacm -lpthread
-LDADD+= -lmlx4
+LIBADD=	ibverbs rdmacm pthread mlx4
 
 .include <bsd.prog.mk>

Modified: user/ngie/make_check/contrib/openresolv/Makefile
==============================================================================
--- user/ngie/make_check/contrib/openresolv/Makefile	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/contrib/openresolv/Makefile	Sun Feb  7 04:58:06 2016	(r295364)
@@ -1,5 +1,5 @@
 PKG=		openresolv
-VERSION=	3.7.0
+VERSION=	3.7.1
 
 # Nasty hack so that make clean works without configure being run
 _CONFIG_MK!=	test -e config.mk && echo config.mk || echo config-null.mk
@@ -37,7 +37,7 @@ SED_RESTARTCMD=		-e 's:@RESTARTCMD \(.*\
 
 DISTPREFIX?=	${PKG}-${VERSION}
 DISTFILEGZ?=	${DISTPREFIX}.tar.gz
-DISTFILE?=	${DISTPREFIX}.tar.bz2
+DISTFILE?=	${DISTPREFIX}.tar.xz
 FOSSILID?=	current
 
 .SUFFIXES: .in
@@ -77,9 +77,9 @@ install: proginstall maninstall
 import:
 	rm -rf /tmp/${DISTPREFIX}
 	${INSTALL} -d /tmp/${DISTPREFIX}
-	cp README ${SRCS} /tmp/${DISPREFIX}
+	cp README ${SRCS} /tmp/${DISTPREFIX}
 
 dist:
 	fossil tarball --name ${DISTPREFIX} ${FOSSILID} ${DISTFILEGZ}
-	gunzip -c ${DISTFILEGZ} |  bzip2 >${DISTFILE}
+	gunzip -c ${DISTFILEGZ} | xz >${DISTFILE}
 	rm ${DISTFILEGZ}

Modified: user/ngie/make_check/contrib/openresolv/resolvconf.8.in
==============================================================================
--- user/ngie/make_check/contrib/openresolv/resolvconf.8.in	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/contrib/openresolv/resolvconf.8.in	Sun Feb  7 04:58:06 2016	(r295364)
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd April 27, 2014
+.Dd April 27, 2015
 .Dt RESOLVCONF 8
 .Os
 .Sh NAME

Modified: user/ngie/make_check/contrib/openresolv/resolvconf.conf.5.in
==============================================================================
--- user/ngie/make_check/contrib/openresolv/resolvconf.conf.5.in	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/contrib/openresolv/resolvconf.conf.5.in	Sun Feb  7 04:58:06 2016	(r295364)
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd March 20, 2015
+.Dd May 14, 2015
 .Dt RESOLVCONF.CONF 5
 .Os
 .Sh NAME
@@ -91,6 +91,11 @@ To remove a block, you can use 192.168.*
 These interfaces name servers will only be queried for the domains listed
 in their resolv.conf.
 Useful for VPN domains.
+Setting
+.Sy private_interfaces Ns ="*"
+will stop the forwarding of the root zone and allows the local resolver to
+recursively query the root servers directly.
+Requires a local nameserver other than libc.
 This is equivalent to the
 .Nm resolvconf -p
 option.
@@ -149,7 +154,7 @@ When set to /dev/null or NULL,
 .Sy resolv_conf_local_only
 is defaulted to NO,
 .Sy local_nameservers
-is unset unless overriden and only the information set in
+is unset unless overridden and only the information set in
 .Nm
 is written to
 .Sy resolv_conf .
@@ -271,7 +276,7 @@ Each subscriber attempts to automaticall
 distribution has been catered for.
 Also, users could equally want to use a different version from the one
 installed by default, such as bind8 and bind9.
-To accomodate this, the subscribers have these files in configurable
+To accommodate this, the subscribers have these files in configurable
 variables, documented below.
 .Pp
 .Bl -tag -width indent

Modified: user/ngie/make_check/contrib/openresolv/resolvconf.in
==============================================================================
--- user/ngie/make_check/contrib/openresolv/resolvconf.in	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/contrib/openresolv/resolvconf.in	Sun Feb  7 04:58:06 2016	(r295364)
@@ -50,7 +50,6 @@ elif [ -d "$SYSCONFDIR/resolvconf" ]; th
 		interface_order="$(cat "$SYSCONFDIR"/interface-order)"
 	fi
 fi
-TMPDIR="$VARDIR/tmp"
 IFACEDIR="$VARDIR/interfaces"
 METRICDIR="$VARDIR/metrics"
 PRIVATEDIR="$VARDIR/private"

Modified: user/ngie/make_check/contrib/openresolv/unbound.in
==============================================================================
--- user/ngie/make_check/contrib/openresolv/unbound.in	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/contrib/openresolv/unbound.in	Sun Feb  7 04:58:06 2016	(r295364)
@@ -45,7 +45,8 @@ for d in $DOMAINS; do
 	ns="${d#*:}"
 	case "$unbound_insecure" in
 	[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
-		newconf="$newconf${NL}domain-insecure: \"$dn\""
+		newconf="$newconf${NL}server:$NL"
+		newconf="$newconf	domain-insecure: \"$dn\"$NL"
 		;;
 	esac
 	newconf="$newconf${NL}forward-zone:$NL	name: \"$dn\"$NL"

Modified: user/ngie/make_check/contrib/smbfs/smbutil/print.c
==============================================================================
--- user/ngie/make_check/contrib/smbfs/smbutil/print.c	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/contrib/smbfs/smbutil/print.c	Sun Feb  7 04:58:06 2016	(r295364)
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <string.h>
 #include <strings.h>
 #include <stdlib.h>
 #include <sysexits.h>

Modified: user/ngie/make_check/crypto/openssh/sshd_config
==============================================================================
--- user/ngie/make_check/crypto/openssh/sshd_config	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/crypto/openssh/sshd_config	Sun Feb  7 04:58:06 2016	(r295364)
@@ -45,7 +45,7 @@
 # Authentication:
 
 #LoginGraceTime 2m
-#PermitRootLogin prohibit-password
+#PermitRootLogin no
 #StrictModes yes
 #MaxAuthTries 6
 #MaxSessions 10

Modified: user/ngie/make_check/crypto/openssh/sshd_config.5
==============================================================================
--- user/ngie/make_check/crypto/openssh/sshd_config.5	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/crypto/openssh/sshd_config.5	Sun Feb  7 04:58:06 2016	(r295364)
@@ -1217,7 +1217,7 @@ The argument must be
 or
 .Dq no .
 The default is
-.Dq prohibit-password .
+.Dq no .
 Note that if
 .Cm ChallengeResponseAuthentication
 is

Modified: user/ngie/make_check/etc/defaults/rc.conf
==============================================================================
--- user/ngie/make_check/etc/defaults/rc.conf	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/etc/defaults/rc.conf	Sun Feb  7 04:58:06 2016	(r295364)
@@ -716,5 +716,18 @@ if [ -z "${source_rc_confs_defined}" ]; 
 				;;
 			esac
 		done
+		# Re-do process to pick up [possibly] redefined $rc_conf_files
+		for i in ${rc_conf_files}; do
+			case ${sourced_files} in
+			*:$i:*)
+				;;
+			*)
+				sourced_files="${sourced_files}:$i:"
+				if [ -r $i ]; then
+					. $i
+				fi
+				;;
+			esac
+		done
 	}
 fi

Modified: user/ngie/make_check/etc/periodic/daily/800.scrub-zfs
==============================================================================
--- user/ngie/make_check/etc/periodic/daily/800.scrub-zfs	Sun Feb  7 04:28:03 2016	(r295363)
+++ user/ngie/make_check/etc/periodic/daily/800.scrub-zfs	Sun Feb  7 04:58:06 2016	(r295364)
@@ -63,6 +63,11 @@ case "$daily_scrub_zfs_enable" in
 			_last_scrub=$(zpool history ${pool} | \

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

More information about the svn-src-user mailing list