svn commit: r287401 - in projects/ifnet: . bin/df bin/rm bin/sh bin/sh/tests/builtins cddl/contrib/opensolaris/lib/libzpool/common/sys cddl/contrib/opensolaris/tools/ctf/cvt contrib/ncurses/ncurses...

Gleb Smirnoff glebius at FreeBSD.org
Wed Sep 2 16:06:37 UTC 2015 

Author: glebius
Date: Wed Sep  2 16:06:25 2015
New Revision: 287401
URL: https://svnweb.freebsd.org/changeset/base/287401

Log:
  Merge head r257698 through r287400.

Added:
  projects/ifnet/bin/sh/tests/builtins/read9.0
     - copied unchanged from r287400, head/bin/sh/tests/builtins/read9.0
  projects/ifnet/share/doc/papers/bsdreferences.bib
     - copied unchanged from r287400, head/share/doc/papers/bsdreferences.bib
  projects/ifnet/share/man/man4/ow.4
     - copied unchanged from r287400, head/share/man/man4/ow.4
  projects/ifnet/share/man/man4/ow_temp.4
     - copied unchanged from r287400, head/share/man/man4/ow_temp.4
  projects/ifnet/share/man/man4/owc.4
     - copied unchanged from r287400, head/share/man/man4/owc.4
  projects/ifnet/share/man/man9/owll.9
     - copied unchanged from r287400, head/share/man/man9/owll.9
  projects/ifnet/share/man/man9/own.9
     - copied unchanged from r287400, head/share/man/man9/own.9
  projects/ifnet/share/mk/bsd.stand.mk
     - copied unchanged from r287400, head/share/mk/bsd.stand.mk
  projects/ifnet/sys/arm/conf/A20
     - copied unchanged from r287400, head/sys/arm/conf/A20
  projects/ifnet/sys/boot/efi/include/efipciio.h
     - copied unchanged from r287400, head/sys/boot/efi/include/efipciio.h
  projects/ifnet/sys/boot/efi/include/efiuga.h
     - copied unchanged from r287400, head/sys/boot/efi/include/efiuga.h
  projects/ifnet/sys/dev/mmc/host/dwmmc_hisi.c
     - copied unchanged from r287400, head/sys/dev/mmc/host/dwmmc_hisi.c
  projects/ifnet/sys/dev/mmc/host/dwmmc_reg.h
     - copied unchanged from r287400, head/sys/dev/mmc/host/dwmmc_reg.h
  projects/ifnet/sys/dev/mmc/host/dwmmc_var.h
     - copied unchanged from r287400, head/sys/dev/mmc/host/dwmmc_var.h
  projects/ifnet/sys/dev/ow/
     - copied from r287400, head/sys/dev/ow/
  projects/ifnet/sys/dev/usb/controller/dwc_otg_hisi.c
     - copied unchanged from r287400, head/sys/dev/usb/controller/dwc_otg_hisi.c
  projects/ifnet/sys/modules/ow/
     - copied from r287400, head/sys/modules/ow/
  projects/ifnet/sys/pc98/include/ofw_machdep.h
     - copied unchanged from r287400, head/sys/pc98/include/ofw_machdep.h
Deleted:
  projects/ifnet/sys/arm/conf/CUBIEBOARD2
  projects/ifnet/sys/dev/mmc/host/dwmmc.h
Modified:
  projects/ifnet/Makefile.inc1
  projects/ifnet/UPDATING
  projects/ifnet/bin/df/df.c
  projects/ifnet/bin/rm/rm.c
  projects/ifnet/bin/sh/expand.c
  projects/ifnet/bin/sh/miscbltin.c
  projects/ifnet/bin/sh/options.c
  projects/ifnet/bin/sh/options.h
  projects/ifnet/bin/sh/sh.1
  projects/ifnet/bin/sh/tests/builtins/Makefile
  projects/ifnet/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  projects/ifnet/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
  projects/ifnet/contrib/ncurses/ncurses/base/MKlib_gen.sh
  projects/ifnet/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawnattr.c
  projects/ifnet/etc/devd.conf
  projects/ifnet/etc/pccard_ether
  projects/ifnet/etc/rc.d/jail
  projects/ifnet/gnu/usr.bin/binutils/Makefile
  projects/ifnet/kerberos5/Makefile.inc
  projects/ifnet/kerberos5/lib/libhdb/Makefile
  projects/ifnet/kerberos5/libexec/digest-service/Makefile
  projects/ifnet/kerberos5/libexec/kdc/Makefile
  projects/ifnet/kerberos5/usr.bin/kpasswd/Makefile
  projects/ifnet/kerberos5/usr.sbin/iprop-log/Makefile
  projects/ifnet/lib/libc/amd64/gen/setjmp.S
  projects/ifnet/lib/libc/amd64/gen/sigsetjmp.S
  projects/ifnet/lib/libc/compat-43/sigcompat.c
  projects/ifnet/lib/libc/db/btree/bt_open.c
  projects/ifnet/lib/libc/db/hash/hash_page.c
  projects/ifnet/lib/libc/gen/daemon.c
  projects/ifnet/lib/libc/gen/devname.c
  projects/ifnet/lib/libc/gen/posix_spawn.c
  projects/ifnet/lib/libc/gen/readpassphrase.c
  projects/ifnet/lib/libc/gen/setmode.c
  projects/ifnet/lib/libc/gen/siginterrupt.c
  projects/ifnet/lib/libc/gen/signal.c
  projects/ifnet/lib/libc/gen/wordexp.c
  projects/ifnet/lib/libc/i386/gen/setjmp.S
  projects/ifnet/lib/libc/i386/gen/sigsetjmp.S
  projects/ifnet/lib/libc/include/libc_private.h
  projects/ifnet/lib/libc/net/getnameinfo.c
  projects/ifnet/lib/libc/net/rcmd.c
  projects/ifnet/lib/libc/rpc/auth_des.c
  projects/ifnet/lib/libc/rpc/auth_none.c
  projects/ifnet/lib/libc/rpc/auth_time.c
  projects/ifnet/lib/libc/rpc/clnt_bcast.c
  projects/ifnet/lib/libc/rpc/clnt_dg.c
  projects/ifnet/lib/libc/rpc/crypt_client.c
  projects/ifnet/lib/libc/rpc/des_crypt.c
  projects/ifnet/lib/libc/rpc/des_soft.c
  projects/ifnet/lib/libc/rpc/getpublickey.c
  projects/ifnet/lib/libc/rpc/key_call.c
  projects/ifnet/lib/libc/rpc/rpc_prot.c
  projects/ifnet/lib/libc/rpc/rpc_soc.c
  projects/ifnet/lib/libc/rpc/rpcb_clnt.c
  projects/ifnet/lib/libc/rpc/rpcdname.c
  projects/ifnet/lib/libc/rpc/rtime.c
  projects/ifnet/lib/libc/rpc/svc_auth.c
  projects/ifnet/lib/libc/rpc/svc_auth_des.c
  projects/ifnet/lib/libc/rpc/svc_dg.c
  projects/ifnet/lib/libc/rpc/svc_vc.c
  projects/ifnet/lib/libc/stdio/tmpfile.c
  projects/ifnet/lib/libc/stdlib/abort.c
  projects/ifnet/lib/libc/stdlib/system.c
  projects/ifnet/lib/libc/sys/sigaction.c
  projects/ifnet/lib/libc/sys/sigprocmask.c
  projects/ifnet/lib/libc/sys/sigsuspend.c
  projects/ifnet/lib/libc/tests/gen/posix_spawn/Makefile
  projects/ifnet/lib/libgeom/geom_xml2tree.c
  projects/ifnet/lib/libproc/tests/proc_test.c
  projects/ifnet/lib/libstand/Makefile
  projects/ifnet/libexec/rtld-elf/aarch64/reloc.c
  projects/ifnet/libexec/rtld-elf/aarch64/rtld_machdep.h
  projects/ifnet/libexec/rtld-elf/rtld.c
  projects/ifnet/libexec/talkd/table.c
  projects/ifnet/release/Makefile.vagrant
  projects/ifnet/sbin/bsdlabel/bsdlabel.8
  projects/ifnet/sbin/dumpfs/dumpfs.8
  projects/ifnet/sbin/fdisk/fdisk.8
  projects/ifnet/sbin/ffsinfo/ffsinfo.8
  projects/ifnet/sbin/mdconfig/mdconfig.8
  projects/ifnet/sbin/mount_unionfs/mount_unionfs.8
  projects/ifnet/sbin/newfs/newfs.8
  projects/ifnet/sbin/newfs_msdos/newfs_msdos.8
  projects/ifnet/sbin/newfs_nandfs/newfs_nandfs.8
  projects/ifnet/sbin/pfctl/parse.y
  projects/ifnet/sbin/pfctl/pfctl_parser.c
  projects/ifnet/sbin/reboot/boot_i386.8
  projects/ifnet/share/man/man4/Makefile
  projects/ifnet/share/man/man4/da.4
  projects/ifnet/share/man/man4/md.4
  projects/ifnet/share/man/man4/rights.4
  projects/ifnet/share/man/man4/vpo.4
  projects/ifnet/share/man/man5/pf.conf.5
  projects/ifnet/share/man/man7/tuning.7
  projects/ifnet/share/man/man8/picobsd.8
  projects/ifnet/share/man/man9/Makefile
  projects/ifnet/share/man/man9/nv.9
  projects/ifnet/share/mk/bsd.README
  projects/ifnet/sys/amd64/amd64/exception.S
  projects/ifnet/sys/arm/allwinner/a10_gpio.c
  projects/ifnet/sys/arm/arm/locore-v6.S
  projects/ifnet/sys/arm64/conf/GENERIC
  projects/ifnet/sys/boot/efi/Makefile.inc
  projects/ifnet/sys/boot/efi/loader/Makefile
  projects/ifnet/sys/boot/efi/loader/arch/amd64/framebuffer.c
  projects/ifnet/sys/boot/efi/loader/arch/arm64/Makefile.inc
  projects/ifnet/sys/boot/fdt/dts/arm/bananapi.dts
  projects/ifnet/sys/boot/fdt/dts/arm/cubieboard2.dts
  projects/ifnet/sys/boot/fdt/dts/arm/sun7i-a20.dtsi
  projects/ifnet/sys/boot/ficl/Makefile
  projects/ifnet/sys/boot/i386/Makefile.inc
  projects/ifnet/sys/boot/libstand32/Makefile
  projects/ifnet/sys/boot/pc98/Makefile.inc
  projects/ifnet/sys/boot/userboot/ficl/Makefile
  projects/ifnet/sys/boot/userboot/libstand/Makefile
  projects/ifnet/sys/boot/zfs/Makefile
  projects/ifnet/sys/cam/ata/ata_xpt.c
  projects/ifnet/sys/cam/ctl/ctl.c
  projects/ifnet/sys/cam/ctl/ctl_backend_block.c
  projects/ifnet/sys/cam/ctl/ctl_frontend.c
  projects/ifnet/sys/cam/ctl/ctl_frontend_cam_sim.c
  projects/ifnet/sys/cam/ctl/ctl_frontend_ioctl.c
  projects/ifnet/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/ifnet/sys/cam/ctl/ctl_io.h
  projects/ifnet/sys/cam/ctl/ctl_tpc_local.c
  projects/ifnet/sys/cam/ctl/scsi_ctl.c
  projects/ifnet/sys/cam/scsi/scsi_cd.c
  projects/ifnet/sys/cam/scsi/scsi_ch.c
  projects/ifnet/sys/cam/scsi/scsi_da.c
  projects/ifnet/sys/cam/scsi/scsi_pt.c
  projects/ifnet/sys/cam/scsi/scsi_sa.c
  projects/ifnet/sys/cam/scsi/scsi_xpt.c
  projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  projects/ifnet/sys/compat/cloudabi/cloudabi_fd.c
  projects/ifnet/sys/compat/linux/linux_fork.c
  projects/ifnet/sys/conf/files
  projects/ifnet/sys/conf/files.arm64
  projects/ifnet/sys/conf/kmod.mk
  projects/ifnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_ani.c
  projects/ifnet/sys/dev/drm2/i915/i915_drv.c
  projects/ifnet/sys/dev/e1000/if_em.c
  projects/ifnet/sys/dev/ipmi/ipmi_smbios.c
  projects/ifnet/sys/dev/ipmi/ipmivars.h
  projects/ifnet/sys/dev/iwn/if_iwn.c
  projects/ifnet/sys/dev/iwn/if_iwn_ioctl.h
  projects/ifnet/sys/dev/iwn/if_iwnvar.h
  projects/ifnet/sys/dev/mmc/host/dwmmc.c
  projects/ifnet/sys/dev/msk/if_mskreg.h
  projects/ifnet/sys/dev/usb/controller/uhci_pci.c
  projects/ifnet/sys/dev/usb/quirk/usb_quirk.c
  projects/ifnet/sys/dev/usb/serial/u3g.c
  projects/ifnet/sys/dev/usb/usbdevs
  projects/ifnet/sys/fs/nfs/nfs_commonacl.c
  projects/ifnet/sys/kern/init_main.c
  projects/ifnet/sys/kern/kern_event.c
  projects/ifnet/sys/kern/kern_timeout.c
  projects/ifnet/sys/kern/ksched.c
  projects/ifnet/sys/kern/subr_syscall.c
  projects/ifnet/sys/kern/sys_process.c
  projects/ifnet/sys/kern/vfs_syscalls.c
  projects/ifnet/sys/modules/Makefile
  projects/ifnet/sys/net/if_llatbl.c
  projects/ifnet/sys/net/pfvar.h
  projects/ifnet/sys/net/rss_config.c
  projects/ifnet/sys/net/rss_config.h
  projects/ifnet/sys/netinet/in_rss.c
  projects/ifnet/sys/netinet/in_rss.h
  projects/ifnet/sys/netinet/ip_input.c
  projects/ifnet/sys/netinet/sctp_constants.h
  projects/ifnet/sys/netinet/sctp_sysctl.c
  projects/ifnet/sys/netinet/sctp_sysctl.h
  projects/ifnet/sys/netinet/sctp_usrreq.c
  projects/ifnet/sys/netinet/sctputil.c
  projects/ifnet/sys/netinet/sctputil.h
  projects/ifnet/sys/netinet/tcp_timer.c
  projects/ifnet/sys/netinet/tcp_timer.h
  projects/ifnet/sys/netinet/udp_usrreq.c
  projects/ifnet/sys/netinet/udp_var.h
  projects/ifnet/sys/netinet6/in6.c
  projects/ifnet/sys/netinet6/in6_rss.c
  projects/ifnet/sys/netinet6/in6_rss.h
  projects/ifnet/sys/netinet6/ip6_input.c
  projects/ifnet/sys/netinet6/ip6_var.h
  projects/ifnet/sys/netinet6/nd6.c
  projects/ifnet/sys/netinet6/udp6_usrreq.c
  projects/ifnet/sys/netpfil/pf/pf.c
  projects/ifnet/sys/netpfil/pf/pf_norm.c
  projects/ifnet/sys/powerpc/booke/pmap.c
  projects/ifnet/sys/powerpc/booke/trap_subr.S
  projects/ifnet/sys/powerpc/include/tlb.h
  projects/ifnet/sys/powerpc/powerpc/trap.c
  projects/ifnet/sys/sys/capsicum.h
  projects/ifnet/sys/sys/cdefs.h
  projects/ifnet/sys/sys/pcpu.h
  projects/ifnet/sys/sys/posix4.h
  projects/ifnet/sys/sys/proc.h
  projects/ifnet/sys/sys/ptrace.h
  projects/ifnet/sys/ufs/ffs/ffs_softdep.c
  projects/ifnet/sys/vm/vm_page.c
  projects/ifnet/sys/vm/vm_pageout.c
  projects/ifnet/sys/x86/include/ofw_machdep.h
  projects/ifnet/tools/regression/lib/msun/test-cexp.c
  projects/ifnet/tools/regression/lib/msun/test-csqrt.c
  projects/ifnet/tools/regression/lib/msun/test-invtrig.c
  projects/ifnet/tools/regression/lib/msun/test-trig.c
  projects/ifnet/tools/regression/p1003_1b/main.c
  projects/ifnet/tools/tools/ath/athaggrstats/athaggrstats.c
  projects/ifnet/tools/tools/ath/athaggrstats/main.c
  projects/ifnet/tools/tools/ath/athdebug/athdebug.c
  projects/ifnet/tools/tools/ath/athrd/athrd.c
  projects/ifnet/tools/tools/ath/athstats/athstats.c
  projects/ifnet/tools/tools/ath/athstats/main.c
  projects/ifnet/tools/tools/ath/common/ah_osdep.h
  projects/ifnet/tools/tools/ath/common/dumpregs_5210.c
  projects/ifnet/tools/tools/ath/common/dumpregs_5211.c
  projects/ifnet/tools/tools/ath/common/dumpregs_5212.c
  projects/ifnet/tools/tools/ath/common/dumpregs_5416.c
  projects/ifnet/tools/tools/crypto/cryptostats.c
  projects/ifnet/tools/tools/crypto/cryptotest.c
  projects/ifnet/tools/tools/crypto/hifnstats.c
  projects/ifnet/tools/tools/crypto/ipsecstats.c
  projects/ifnet/tools/tools/crypto/safestats.c
  projects/ifnet/tools/tools/crypto/ubsecstats.c
  projects/ifnet/tools/tools/cxgbetool/cxgbetool.c
  projects/ifnet/tools/tools/iwn/iwnstats/iwn_ioctl.c
  projects/ifnet/tools/tools/iwn/iwnstats/iwn_ioctl.h
  projects/ifnet/tools/tools/iwn/iwnstats/iwnstats.h
  projects/ifnet/tools/tools/iwn/iwnstats/main.c
  projects/ifnet/tools/tools/mwl/mwldebug/mwldebug.c
  projects/ifnet/tools/tools/mwl/mwlstats/mwlstats.c
  projects/ifnet/tools/tools/net80211/wlanstats/main.c
  projects/ifnet/tools/tools/net80211/wlanstats/wlanstats.c
  projects/ifnet/tools/tools/net80211/wlantxtime/wlantxtime.c
  projects/ifnet/tools/tools/npe/npestats/main.c
  projects/ifnet/tools/tools/npe/npestats/npestats.c
  projects/ifnet/usr.bin/ar/ar.c
  projects/ifnet/usr.bin/bluetooth/btsockstat/btsockstat.c
  projects/ifnet/usr.bin/iconv/iconv.c
  projects/ifnet/usr.bin/netstat/if.c
  projects/ifnet/usr.bin/netstat/inet.c
  projects/ifnet/usr.bin/netstat/inet6.c
  projects/ifnet/usr.bin/netstat/main.c
  projects/ifnet/usr.bin/netstat/mroute.c
  projects/ifnet/usr.bin/netstat/mroute6.c
  projects/ifnet/usr.bin/netstat/netstat.1
  projects/ifnet/usr.bin/netstat/netstat.h
  projects/ifnet/usr.bin/netstat/route.c
  projects/ifnet/usr.bin/netstat/sctp.c
  projects/ifnet/usr.bin/procstat/procstat_files.c
  projects/ifnet/usr.bin/sockstat/sockstat.c
  projects/ifnet/usr.bin/tftp/main.c
  projects/ifnet/usr.bin/vi/catalog/Makefile
  projects/ifnet/usr.bin/vtfontcvt/vtfontcvt.c
  projects/ifnet/usr.sbin/boot0cfg/boot0cfg.8
  projects/ifnet/usr.sbin/pmcstat/pmcstat.c
  projects/ifnet/usr.sbin/syslogd/syslogd.c
  projects/ifnet/usr.sbin/sysrc/sysrc
  projects/ifnet/usr.sbin/trpt/trpt.c
Directory Properties:
  projects/ifnet/   (props changed)
  projects/ifnet/cddl/   (props changed)
  projects/ifnet/cddl/contrib/opensolaris/   (props changed)
  projects/ifnet/contrib/ncurses/   (props changed)
  projects/ifnet/etc/   (props changed)
  projects/ifnet/gnu/usr.bin/binutils/   (props changed)
  projects/ifnet/lib/libc/   (props changed)
  projects/ifnet/sbin/   (props changed)
  projects/ifnet/share/   (props changed)
  projects/ifnet/share/man/man4/   (props changed)
  projects/ifnet/sys/   (props changed)
  projects/ifnet/sys/boot/   (props changed)
  projects/ifnet/sys/cddl/contrib/opensolaris/   (props changed)
  projects/ifnet/sys/conf/   (props changed)
  projects/ifnet/usr.bin/procstat/   (props changed)

Modified: projects/ifnet/Makefile.inc1
==============================================================================
--- projects/ifnet/Makefile.inc1	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/Makefile.inc1	Wed Sep  2 16:06:25 2015	(r287401)
@@ -1127,6 +1127,16 @@ reinstallkernel reinstallkernel.debug: _
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
 	    ${CROSSENV} PATH=${TMPPATH} \
 	    ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
+.if ${BUILDKERNELS:[#]} > 1
+.for _kernel in ${BUILDKERNELS:[2..-1]}
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Installing kernel ${_kernel}"
+	@echo "--------------------------------------------------------------"
+	cd ${KRNLOBJDIR}/${_kernel}; \
+	    ${CROSSENV} PATH=${TMPPATH} \
+	    ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME}.${_kernel} ${.TARGET:S/kernel//}
+.endfor
+.endif
 
 distributekernel distributekernel.debug:
 .if empty(INSTALLKERNEL)
@@ -1146,7 +1156,8 @@ distributekernel distributekernel.debug:
 	sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
 	    ${DESTDIR}/${DISTDIR}/kernel.meta
 .endif
-.for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
+.if ${BUILDKERNELS:[#]} > 1
+.for _kernel in ${BUILDKERNELS:[2..-1]}
 .if defined(NO_ROOT)
 	echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
 .endif
@@ -1162,27 +1173,32 @@ distributekernel distributekernel.debug:
 	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
 .endif
 .endfor
+.endif
 
 packagekernel:
 .if defined(NO_ROOT)
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
 	    tar cvf - @${DESTDIR}/${DISTDIR}/kernel.meta | \
 	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz
-.for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
+.if ${BUILDKERNELS:[#]} > 1
+.for _kernel in ${BUILDKERNELS:[2..-1]}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvf - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \
 	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz
 .endfor
+.endif
 .else
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
 	    tar cvf - . | \
 	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz
-.for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
+.if ${BUILDKERNELS:[#]} > 1
+.for _kernel in ${BUILDKERNELS:[2..-1]}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvf - . | \
 	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz
 .endfor
 .endif
+.endif
 
 #
 # doxygen

Modified: projects/ifnet/UPDATING
==============================================================================
--- projects/ifnet/UPDATING	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/UPDATING	Wed Sep  2 16:06:25 2015	(r287401)
@@ -31,6 +31,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20150827:
+	The wireless drivers had undergone changes that remove the 'parent
+	interface' from the ifconfig -l output. The rc.d network scripts
+	used to check presence of a parent interface in the list, so old
+	scripts would fail to start wireless networking. Thus, etcupdate(3)
+	or mergemaster(8) run is required after kernel update, to update your
+	rc.d scripts in /etc.
+
+20150827:
+	pf no longer supports 'scrub fragment crop' or 'scrub fragment drop-ovl'
+	These configurations are now automatically interpreted as
+	'scrub fragment reassemble'.
+
 20150817:
 	Kernel-loadable modules for the random(4) device are back. To use
 	them, the kernel must have

Modified: projects/ifnet/bin/df/df.c
==============================================================================
--- projects/ifnet/bin/df/df.c	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/bin/df/df.c	Wed Sep  2 16:06:25 2015	(r287401)
@@ -311,7 +311,7 @@ main(int argc, char *argv[])
 
 	xo_close_container("storage-system-information");
 	xo_finish();
-	return (rv);
+	exit(rv);
 }
 
 static char *

Modified: projects/ifnet/bin/rm/rm.c
==============================================================================
--- projects/ifnet/bin/rm/rm.c	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/bin/rm/rm.c	Wed Sep  2 16:06:25 2015	(r287401)
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <fcntl.h>
 #include <fts.h>
 #include <grp.h>
+#include <locale.h>
 #include <pwd.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -86,6 +87,8 @@ main(int argc, char *argv[])
 	int ch;
 	char *p;
 
+	(void)setlocale(LC_ALL, "");
+
 	/*
 	 * Test for the special case where the utility is called as
 	 * "unlink", for which the functionality provided is greatly

Modified: projects/ifnet/bin/sh/expand.c
==============================================================================
--- projects/ifnet/bin/sh/expand.c	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/bin/sh/expand.c	Wed Sep  2 16:06:25 2015	(r287401)
@@ -886,7 +886,7 @@ varvalue(const char *name, int quoted, i
 		num = backgndpidval();
 		break;
 	case '-':
-		for (i = 0 ; i < NOPTS ; i++) {
+		for (i = 0 ; i < NSHORTOPTS ; i++) {
 			if (optlist[i].val)
 				STPUTC(optlist[i].letter, expdest);
 		}

Modified: projects/ifnet/bin/sh/miscbltin.c
==============================================================================
--- projects/ifnet/bin/sh/miscbltin.c	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/bin/sh/miscbltin.c	Wed Sep  2 16:06:25 2015	(r287401)
@@ -100,6 +100,7 @@ readcmd(int argc __unused, char **argv _
 	int i;
 	int is_ifs;
 	int saveall = 0;
+	ptrdiff_t lastnonifs, lastnonifsws;
 	struct timeval tv;
 	char *tvptr;
 	fd_set ifds;
@@ -169,6 +170,7 @@ readcmd(int argc __unused, char **argv _
 	startword = 2;
 	backslash = 0;
 	STARTSTACKSTR(p);
+	lastnonifs = lastnonifsws = -1;
 	for (;;) {
 		nread = read(STDIN_FILENO, &c, 1);
 		if (nread == -1) {
@@ -193,6 +195,7 @@ readcmd(int argc __unused, char **argv _
 			backslash = 0;
 			if (c != '\n') {
 				startword = 0;
+				lastnonifs = lastnonifsws = p - stackblock();
 				USTPUTC(c, p);
 			}
 			continue;
@@ -218,8 +221,10 @@ readcmd(int argc __unused, char **argv _
 			if (is_ifs == 2 && startword == 1) {
 				/* Only one non-whitespace IFS per word */
 				startword = 2;
-				if (saveall)
+				if (saveall) {
+					lastnonifsws = p - stackblock();
 					USTPUTC(c, p);
+				}
 				continue;
 			}
 		}
@@ -230,6 +235,7 @@ readcmd(int argc __unused, char **argv _
 			if (saveall)
 				/* Not just a spare terminator */
 				saveall++;
+			lastnonifs = lastnonifsws = p - stackblock();
 			USTPUTC(c, p);
 			continue;
 		}
@@ -240,6 +246,8 @@ readcmd(int argc __unused, char **argv _
 		if (ap[1] == NULL) {
 			/* Last variable needs all IFS chars */
 			saveall++;
+			if (is_ifs == 2)
+				lastnonifsws = p - stackblock();
 			USTPUTC(c, p);
 			continue;
 		}
@@ -248,20 +256,17 @@ readcmd(int argc __unused, char **argv _
 		setvar(*ap, stackblock(), 0);
 		ap++;
 		STARTSTACKSTR(p);
+		lastnonifs = lastnonifsws = -1;
 	}
 	STACKSTRNUL(p);
 
-	/* Remove trailing IFS chars */
-	for (; stackblock() <= --p; *p = 0) {
-		if (!strchr(ifs, *p))
-			break;
-		if (strchr(" \t\n", *p))
-			/* Always remove whitespace */
-			continue;
-		if (saveall > 1)
-			/* Don't remove non-whitespace unless it was naked */
-			break;
-	}
+	/*
+	 * Remove trailing IFS chars: always remove whitespace, don't remove
+	 * non-whitespace unless it was naked
+	 */
+	if (saveall <= 1)
+		lastnonifsws = lastnonifs;
+	stackblock()[lastnonifsws + 1] = '\0';
 	setvar(*ap, stackblock(), 0);
 
 	/* Set any remaining args to "" */

Modified: projects/ifnet/bin/sh/options.c
==============================================================================
--- projects/ifnet/bin/sh/options.c	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/bin/sh/options.c	Wed Sep  2 16:06:25 2015	(r287401)
@@ -302,7 +302,7 @@ setoption(int flag, int val)
 {
 	int i;
 
-	for (i = 0; i < NOPTS; i++)
+	for (i = 0; i < NSHORTOPTS; i++)
 		if (optlist[i].letter == flag) {
 			setoptionbyindex(i, val);
 			return;

Modified: projects/ifnet/bin/sh/options.h
==============================================================================
--- projects/ifnet/bin/sh/options.h	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/bin/sh/options.h	Wed Sep  2 16:06:25 2015	(r287401)
@@ -64,8 +64,10 @@ struct shparam {
 #define	Tflag optlist[16].val
 #define	Pflag optlist[17].val
 #define	hflag optlist[18].val
+#define	nologflag optlist[19].val
 
-#define NOPTS	19
+#define NSHORTOPTS	19
+#define NOPTS		20
 
 struct optent {
 	const char *name;
@@ -95,6 +97,7 @@ struct optent optlist[NOPTS] = {
 	{ "trapsasync",	'T',	0 },
 	{ "physical",	'P',	0 },
 	{ "trackall",	'h',	0 },
+	{ "nolog",	'\0',	0 },
 };
 #endif
 

Modified: projects/ifnet/bin/sh/sh.1
==============================================================================
--- projects/ifnet/bin/sh/sh.1	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/bin/sh/sh.1	Wed Sep  2 16:06:25 2015	(r287401)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd July 11, 2015
+.Dd August 29, 2015
 .Dt SH 1
 .Os
 .Sh NAME
@@ -343,6 +343,11 @@ Write each command
 variable subjected to parameter expansion and arithmetic expansion)
 to standard error before it is executed.
 Useful for debugging.
+.It nolog
+Another do-nothing option for
+.Tn POSIX
+compliance.
+It only has a long name.
 .El
 .Pp
 The
@@ -1173,7 +1178,9 @@ The only special parameter that can be m
 .Ql - .
 Making
 .Ql -
-local causes any shell options that are
+local causes any shell options
+(including those that only have long names)
+that are
 changed via the
 .Ic set
 command inside the function to be

Modified: projects/ifnet/bin/sh/tests/builtins/Makefile
==============================================================================
--- projects/ifnet/bin/sh/tests/builtins/Makefile	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/bin/sh/tests/builtins/Makefile	Wed Sep  2 16:06:25 2015	(r287401)
@@ -123,6 +123,7 @@ FILES+=		read5.0
 FILES+=		read6.0
 FILES+=		read7.0
 FILES+=		read8.0
+FILES+=		read9.0
 FILES+=		return1.0
 FILES+=		return2.1
 FILES+=		return3.1

Copied: projects/ifnet/bin/sh/tests/builtins/read9.0 (from r287400, head/bin/sh/tests/builtins/read9.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/ifnet/bin/sh/tests/builtins/read9.0	Wed Sep  2 16:06:25 2015	(r287401, copy of r287400, head/bin/sh/tests/builtins/read9.0)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+empty=''
+read a b c <<EOF
+\ \ A B\ \ B C\ \ $empty
+EOF
+read d e <<EOF
+D\ $empty
+EOF
+[ "$a.$b.$c.$d.$e" = "  A.B  B.C  .D ." ]

Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
==============================================================================
--- projects/ifnet/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h	Wed Sep  2 16:06:25 2015	(r287401)
@@ -655,13 +655,6 @@ extern int zfs_secpolicy_rename_perms(co
 extern int zfs_secpolicy_destroy_perms(const char *name, cred_t *cr);
 extern zoneid_t getzoneid(void);
 /* Random compatibility stuff. */
-#define	lbolt	(gethrtime() >> 23)
-#define	lbolt64	(gethrtime() >> 23)
-
-extern uint64_t physmem;
-
-#define	gethrestime_sec()	time(NULL)
-
 #define	pwrite64(d, p, n, o)	pwrite(d, p, n, o)
 #define	readdir64(d)		readdir(d)
 #define	SIGPENDING(td)		(0)

Modified: projects/ifnet/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
==============================================================================
--- projects/ifnet/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c	Wed Sep  2 16:06:25 2015	(r287401)
@@ -349,7 +349,7 @@ equiv_node(tdesc_t *ctdp, tdesc_t *mtdp,
 	int (*equiv)(tdesc_t *, tdesc_t *, equiv_data_t *);
 	int mapping;
 
-	if (ctdp->t_emark > ed->ed_clear_mark ||
+	if (ctdp->t_emark > ed->ed_clear_mark &&
 	    mtdp->t_emark > ed->ed_clear_mark)
 		return (ctdp->t_emark == mtdp->t_emark);
 

Modified: projects/ifnet/contrib/ncurses/ncurses/base/MKlib_gen.sh
==============================================================================
--- projects/ifnet/contrib/ncurses/ncurses/base/MKlib_gen.sh	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/contrib/ncurses/ncurses/base/MKlib_gen.sh	Wed Sep  2 16:06:25 2015	(r287401)
@@ -2,10 +2,10 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
-# ($Id: MKlib_gen.sh,v 1.46 2011/06/04 19:14:08 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.50 2015/08/07 00:48:24 tom Exp $)
 #
 ##############################################################################
-# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -66,6 +66,23 @@ preprocessor="$1 -DNCURSES_INTERNALS -I.
 AWK="$2"
 USE="$3"
 
+# A patch discussed here:
+#	https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
+# introduces spurious #line markers into the preprocessor output.  The result
+# appears in gcc 5.0 and (with modification) in 5.1, making it necessary to
+# determine if we are using gcc, and if so, what version because the proposed
+# solution uses a nonstandard option.
+PRG=`echo "$1" | $AWK '{ sub(/^[[:space:]]*/,""); sub(/[[:space:]].*$/, ""); print; }' || exit 0`
+FSF=`"$PRG" --version 2>/dev/null || exit 0 | fgrep "Free Software Foundation" | head -n 1`
+ALL=`"$PRG" -dumpversion 2>/dev/null || exit 0`
+ONE=`echo "$ALL" | sed -e 's/\..*$//'`
+if test -n "$FSF" && test -n "$ALL" && test -n "$ONE" ; then
+	if test $ONE -ge 5 ; then
+		echo ".. adding -P option to work around $PRG $ALL" >&2
+		preprocessor="$preprocessor -P"
+	fi
+fi
+
 PID=$$
 ED1=sed1_${PID}.sed
 ED2=sed2_${PID}.sed

Modified: projects/ifnet/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawnattr.c
==============================================================================
--- projects/ifnet/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawnattr.c	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawnattr.c	Wed Sep  2 16:06:25 2015	(r287401)
@@ -30,6 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/param.h>
 #include <atf-c.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -42,51 +43,56 @@
 #include <unistd.h>
 #include <sys/wait.h>
 
-#define MAX(a, b)	(a) > (b) ? (a) : (b)
-#define MIN(a, b)	(a) > (b) ? (b) : (a)
-
 static int get_different_scheduler(void);
-static int get_different_priority(void);
+static int get_different_priority(int scheduler);
+
+static const int schedulers[] = {
+	SCHED_OTHER,
+	SCHED_FIFO,
+	SCHED_RR
+};
 
 static int
-get_different_scheduler()
+get_different_scheduler(void)
 {
-	int scheduler, max, min, new;
-
-	max = MAX(MAX(SCHED_FIFO, SCHED_OTHER), SCHED_RR);
-	min = MIN(MIN(SCHED_FIFO, SCHED_OTHER), SCHED_RR);
+	u_int i;
+	int scheduler;
 
 	/* get current schedule policy */
 	scheduler = sched_getscheduler(0);
+	for (i = 0; i < nitems(schedulers); i++) {
+		if (schedulers[i] == scheduler)
+			break;
+	}
+	ATF_REQUIRE_MSG(i < nitems(schedulers),
+	    "Unknown current scheduler %d", scheduler);
 					
 	/* new scheduler */
-	new = (scheduler + 1);
-	if (new > max)
-		new = min;
-								
-	return new;
+	i++;
+	if (i >= nitems(schedulers))
+		i = 0;
+	return schedulers[i];
 }
 
 static int
-get_different_priority()
+get_different_priority(int scheduler)
 {
-	int scheduler, max, min, new, priority;
+	int max, min, new, priority;
 	struct sched_param param;
 
-	/* get current schedule policy */
-	scheduler = sched_getscheduler(0);
-
 	max = sched_get_priority_max(scheduler);
 	min = sched_get_priority_min(scheduler);
 
 	sched_getparam(0, &param);
 	priority = param.sched_priority;
 	
-	/* new schedule policy */
-	new = (priority + 1);
+	/*
+	 * Change numerical value of the priority, to ensure that it
+	 * was set for the spawned child.
+	 */
+	new = priority + 1;
 	if (new > max)
 		new = min;
-	
 	return new;
 }
 
@@ -119,16 +125,15 @@ ATF_TC_BODY(t_spawnattr, tc)
 	posix_spawnattr_init(&attr);
 
 	scheduler = get_different_scheduler();
-	priority = get_different_priority();
+	priority = get_different_priority(scheduler);
 	sp.sched_priority = priority;
 	
 	sigemptyset(&sig);
 	sigaddset(&sig, SIGUSR1);
 
-	posix_spawnattr_setflags(&attr, POSIX_SPAWN_SETSCHEDULER | 
-		POSIX_SPAWN_SETSCHEDPARAM | POSIX_SPAWN_SETPGROUP |
-		POSIX_SPAWN_SETSIGMASK | POSIX_SPAWN_SETSIGDEF |
-		POSIX_SPAWN_SETSIGDEF); 
+	posix_spawnattr_setflags(&attr, POSIX_SPAWN_SETSCHEDULER |
+	    POSIX_SPAWN_SETSCHEDPARAM | POSIX_SPAWN_SETPGROUP |
+	    POSIX_SPAWN_SETSIGMASK | POSIX_SPAWN_SETSIGDEF);
 	posix_spawnattr_setpgroup(&attr, 0);
 	posix_spawnattr_setschedparam(&attr, &sp);
 	posix_spawnattr_setschedpolicy(&attr, scheduler);

Modified: projects/ifnet/etc/devd.conf
==============================================================================
--- projects/ifnet/etc/devd.conf	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/etc/devd.conf	Wed Sep  2 16:06:25 2015	(r287401)
@@ -22,6 +22,9 @@ options {
 		"(aac|adv|adw|aha|ahb|ahc|ahd|aic|amd|amr|asr|bt|ciss|ct|dpt|\
 		esp|ida|iir|ips|isp|mlx|mly|mpt|ncr|ncv|nsp|stg|sym|trm|wds)\
 		[0-9]+";
+	set wifi-driver-regex
+		"(ath|bwi|bwn|ipw|iwi|iwm|iwn|malo|mwl|ral|rsu|rum|run|uath|\
+		upgt|ural|urtw|urtwn|wi|wpi|wtap|zyd)[0-9]+";
 };
 
 # Note that the attach/detach with the highest value wins, so that one can
@@ -57,17 +60,16 @@ notify 0 {
 };
 
 #
-# Like Ethernet devices, but separate because
-# they have a different media type.  We may want
-# to exploit this later.
+# Like Ethernet devices, but separate because 802.11 require spawning
+# wlan(4) interface.
 #
-detach 0 {
-	media-type "802.11";
-	action "/etc/pccard_ether $device-name stop";
-};
 attach 0 {
-	media-type "802.11";
-	action "/etc/pccard_ether $device-name start";
+	device-name "$wifi-driver-regex";
+	action "/etc/pccard_ether $device-name startchildren";
+};
+detach 0 {
+	device-name "$wifi-driver-regex";
+	action "/etc/pccard_ether $device-name stopchildren";
 };
 notify 0 {
 	match "system"		"IFNET";

Modified: projects/ifnet/etc/pccard_ether
==============================================================================
--- projects/ifnet/etc/pccard_ether	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/etc/pccard_ether	Wed Sep  2 16:06:25 2015	(r287401)
@@ -17,6 +17,9 @@ stop_precmd="checkauto"
 stop_cmd="pccard_ether_stop"
 restart_precmd="checkauto"
 restart_cmd="pccard_ether_restart"
+startchildren_cmd="pccard_ether_startchildren"
+stopchildren_cmd="pccard_ether_stopchildren"
+extra_commands="startchildren stopchildren"
 
 setup_routes()
 {
@@ -114,6 +117,20 @@ pccard_ether_restart()
 	pccard_ether_start
 }
 
+pccard_ether_startchildren()
+{
+	for child in `get_if_var $ifn wlans_IF`; do
+		/etc/rc.d/netif quietstart $child
+	done
+}
+
+pccard_ether_stopchildren()
+{
+	for child in `get_if_var $ifn wlans_IF`; do
+		/etc/rc.d/netif quietstop $child
+	done
+}
+
 ifn=$1
 shift
 if [ -z "$*" ]; then

Modified: projects/ifnet/etc/rc.d/jail
==============================================================================
--- projects/ifnet/etc/rc.d/jail	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/etc/rc.d/jail	Wed Sep  2 16:06:25 2015	(r287401)
@@ -238,7 +238,7 @@ parse_options()
 
 		eval : \${jail_${_j}_mount_enable:=${jail_mount_enable:-NO}}
 		if checkyesno jail_${_j}_mount_enable; then
-			echo "	allow.mount;" >> $_conf
+			echo "	allow.mount;"
 		fi
 
 		extract_var $_j set_hostname_allow allow.set_hostname YN NO

Modified: projects/ifnet/gnu/usr.bin/binutils/Makefile
==============================================================================
--- projects/ifnet/gnu/usr.bin/binutils/Makefile	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/gnu/usr.bin/binutils/Makefile	Wed Sep  2 16:06:25 2015	(r287401)
@@ -7,7 +7,6 @@ SUBDIR=	doc\
 	libbfd \
 	libopcodes \
 	libbinutils \
-	.WAIT \
 	as \
 	ld \
 	${_objcopy} \
@@ -17,6 +16,11 @@ SUBDIR=	doc\
 _objcopy=	objcopy
 .endif
 
+SUBDIR_DEPEND_libbinutils=libbfd		# for bfdver.h
+SUBDIR_DEPEND_as=libbfd libiberty libopcodes
+SUBDIR_DEPEND_ld=libbfd libiberty
+SUBDIR_DEPEND_objcopy=libbfd libiberty libbinutils
+SUBDIR_DEPEND_objdump=libbfd libiberty libbinutils libopcodes
 
 .if !make(install)
 SUBDIR_PARALLEL=

Modified: projects/ifnet/kerberos5/Makefile.inc
==============================================================================
--- projects/ifnet/kerberos5/Makefile.inc	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/kerberos5/Makefile.inc	Wed Sep  2 16:06:25 2015	(r287401)
@@ -13,7 +13,7 @@ OPENLDAPBASE?=	/usr/local
 LDAPLDADD=	-lldap -llber
 LDAPDPADD=	${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;}
 LDAPCFLAGS=	-I${OPENLDAPBASE}/include -DOPENLDAP=1 -DLDAP_DEPRECATED=1
-LDAPLDFLAGS=	-L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib
+LDAPLDFLAGS=	-L${OPENLDAPBASE}/lib -rpath ${OPENLDAPBASE}/lib
 .endif
 
 .if defined(SRCS)

Modified: projects/ifnet/kerberos5/lib/libhdb/Makefile
==============================================================================
--- projects/ifnet/kerberos5/lib/libhdb/Makefile	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/kerberos5/lib/libhdb/Makefile	Wed Sep  2 16:06:25 2015	(r287401)
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
 LIB=	hdb
-LDFLAGS=	-Wl,--no-undefined
+LDFLAGS=	-Wl,--no-undefined ${LDAPLDFLAGS}
 VERSION_MAP=	${KRB5DIR}/lib/hdb/version-script.map
 LIBADD=	asn1 com_err krb5 roken sqlite3
+LDADD=	${LDAPLDADD}
 DPADD=	${LDAPDPADD}
 
 MAN=	HDB.3 hdb_entry_ex.3

Modified: projects/ifnet/kerberos5/libexec/digest-service/Makefile
==============================================================================
--- projects/ifnet/kerberos5/libexec/digest-service/Makefile	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/kerberos5/libexec/digest-service/Makefile	Wed Sep  2 16:06:25 2015	(r287401)
@@ -9,6 +9,7 @@ CFLAGS+=	-I${KRB5DIR}/kdc \
 		-I${KRB5DIR}/lib/wind \
 		-I${KRB5DIR}/lib/roken
 LIBADD=	hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 

Modified: projects/ifnet/kerberos5/libexec/kdc/Makefile
==============================================================================
--- projects/ifnet/kerberos5/libexec/kdc/Makefile	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/kerberos5/libexec/kdc/Makefile	Wed Sep  2 16:06:25 2015	(r287401)
@@ -11,6 +11,7 @@ SRCS=	config.c \
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	-I${KRB5DIR}/kdc ${LDAPCFLAGS}
 LIBADD=	kdc hdb krb5 roken crypt vers
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 

Modified: projects/ifnet/kerberos5/usr.bin/kpasswd/Makefile
==============================================================================
--- projects/ifnet/kerberos5/usr.bin/kpasswd/Makefile	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/kerberos5/usr.bin/kpasswd/Makefile	Wed Sep  2 16:06:25 2015	(r287401)
@@ -3,6 +3,7 @@
 PROG=	kpasswd
 CFLAGS+=-I${KRB5DIR}/lib/roken
 LIBADD=	hdb krb5 roken vers crypto
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 

Modified: projects/ifnet/kerberos5/usr.sbin/iprop-log/Makefile
==============================================================================
--- projects/ifnet/kerberos5/usr.sbin/iprop-log/Makefile	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/kerberos5/usr.sbin/iprop-log/Makefile	Wed Sep  2 16:06:25 2015	(r287401)
@@ -9,6 +9,7 @@ CFLAGS+=	-I${KRB5DIR}/lib/kadm5 \
 		-I${KRB5DIR}/lib/sl \
 		-I.
 LIBADD=	kadm5srv hdb krb5 roken edit sl vers
+LDFLAGS=${LDAPLDFLAGS}
 
 iprop-commands.h: iprop-commands.in
 	${SLC} ${.ALLSRC:M*.in}

Modified: projects/ifnet/lib/libc/amd64/gen/setjmp.S
==============================================================================
--- projects/ifnet/lib/libc/amd64/gen/setjmp.S	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/lib/libc/amd64/gen/setjmp.S	Wed Sep  2 16:06:25 2015	(r287401)
@@ -55,7 +55,7 @@ ENTRY(setjmp)
 	movq	$0,%rsi			/* (sigset_t*)set  */
 	leaq	72(%rcx),%rdx		/* 9,10; (sigset_t*)oset */
 	/* stack is 16-byte aligned */
-	call	PIC_PLT(CNAME(_sigprocmask))
+	call	__libc_sigprocmask
 	popq	%rdi
 	movq	%rdi,%rcx
 	movq	0(%rsp),%rdx		/* retval */
@@ -82,7 +82,7 @@ ENTRY(__longjmp)
 	leaq	72(%rdx),%rsi		/* (sigset_t*)set  */
 	movq	$0,%rdx			/* (sigset_t*)oset */
 	subq	$0x8,%rsp		/* make the stack 16-byte aligned */
-	call	PIC_PLT(CNAME(_sigprocmask))
+	call	__libc_sigprocmask
 	addq	$0x8,%rsp
 	popq	%rsi
 	popq	%rdi			/* jmpbuf */

Modified: projects/ifnet/lib/libc/amd64/gen/sigsetjmp.S
==============================================================================
--- projects/ifnet/lib/libc/amd64/gen/sigsetjmp.S	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/lib/libc/amd64/gen/sigsetjmp.S	Wed Sep  2 16:06:25 2015	(r287401)
@@ -63,7 +63,7 @@ ENTRY(sigsetjmp)
 	movq	$0,%rsi			/* (sigset_t*)set  */
 	leaq	72(%rcx),%rdx		/* 9,10 (sigset_t*)oset */
 	/* stack is 16-byte aligned */
-	call	PIC_PLT(CNAME(_sigprocmask))
+	call	__libc_sigprocmask
 	popq	%rdi
 2:	movq	%rdi,%rcx
 	movq	0(%rsp),%rdx		/* retval */
@@ -91,7 +91,7 @@ ENTRY(__siglongjmp)
 	leaq	72(%rdx),%rsi		/* (sigset_t*)set  */
 	movq	$0,%rdx			/* (sigset_t*)oset */
 	subq	$0x8,%rsp		/* make the stack 16-byte aligned */
-	call	PIC_PLT(CNAME(_sigprocmask))
+	call	__libc_sigprocmask
 	addq	$0x8,%rsp
 	popq	%rsi
 	popq	%rdi			/* jmpbuf */

Modified: projects/ifnet/lib/libc/compat-43/sigcompat.c
==============================================================================
--- projects/ifnet/lib/libc/compat-43/sigcompat.c	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/lib/libc/compat-43/sigcompat.c	Wed Sep  2 16:06:25 2015	(r287401)
@@ -59,7 +59,7 @@ sigvec(signo, sv, osv)
 	} else
 		sap = NULL;
 	osap = osv != NULL ? &osa : NULL;
-	ret = _sigaction(signo, sap, osap);
+	ret = __libc_sigaction(signo, sap, osap);
 	if (ret == 0 && osv != NULL) {
 		osv->sv_handler = osa.sa_handler;
 		osv->sv_flags = osa.sa_flags ^ SV_INTERRUPT;
@@ -77,7 +77,7 @@ sigsetmask(mask)
 
 	sigemptyset(&set);
 	set.__bits[0] = mask;
-	n = _sigprocmask(SIG_SETMASK, &set, &oset);
+	n = __libc_sigprocmask(SIG_SETMASK, &set, &oset);
 	if (n)
 		return (n);
 	return (oset.__bits[0]);
@@ -92,7 +92,7 @@ sigblock(mask)
 
 	sigemptyset(&set);
 	set.__bits[0] = mask;
-	n = _sigprocmask(SIG_BLOCK, &set, &oset);
+	n = __libc_sigprocmask(SIG_BLOCK, &set, &oset);
 	if (n)
 		return (n);
 	return (oset.__bits[0]);
@@ -105,7 +105,7 @@ sigpause(int mask)
 
 	sigemptyset(&set);
 	set.__bits[0] = mask;
-	return (_sigsuspend(&set));
+	return (__libc_sigsuspend(&set));
 }
 
 int
@@ -113,11 +113,11 @@ xsi_sigpause(int sig)
 {
 	sigset_t set;
 
-	if (_sigprocmask(SIG_BLOCK, NULL, &set) == -1)
+	if (__libc_sigprocmask(SIG_BLOCK, NULL, &set) == -1)
 		return (-1);
 	if (sigdelset(&set, sig) == -1)
 		return (-1);
-	return (_sigsuspend(&set));
+	return (__libc_sigsuspend(&set));
 }
 
 int
@@ -128,7 +128,7 @@ sighold(int sig)
 	sigemptyset(&set);
 	if (sigaddset(&set, sig) == -1)
 		return (-1);
-	return (_sigprocmask(SIG_BLOCK, &set, NULL));
+	return (__libc_sigprocmask(SIG_BLOCK, &set, NULL));
 }
 
 int
@@ -138,7 +138,7 @@ sigignore(int sig)
 
 	bzero(&sa, sizeof(sa));
 	sa.sa_handler = SIG_IGN;
-	return (_sigaction(sig, &sa, NULL));
+	return (__libc_sigaction(sig, &sa, NULL));
 }
 
 int
@@ -149,7 +149,7 @@ sigrelse(int sig)
 	sigemptyset(&set);
 	if (sigaddset(&set, sig) == -1)
 		return (-1);
-	return (_sigprocmask(SIG_UNBLOCK, &set, NULL));
+	return (__libc_sigprocmask(SIG_UNBLOCK, &set, NULL));
 }
 
 void
@@ -161,26 +161,26 @@ void
 	sigemptyset(&set);
 	if (sigaddset(&set, sig) == -1)
 		return (SIG_ERR);
-	if (_sigprocmask(SIG_BLOCK, NULL, &pset) == -1)
+	if (__libc_sigprocmask(SIG_BLOCK, NULL, &pset) == -1)
 		return (SIG_ERR);
 	if ((__sighandler_t *)disp == SIG_HOLD) {
-		if (_sigprocmask(SIG_BLOCK, &set, &pset) == -1)
+		if (__libc_sigprocmask(SIG_BLOCK, &set, &pset) == -1)
 			return (SIG_ERR);
 		if (sigismember(&pset, sig))
 			return (SIG_HOLD);
 		else {
-			if (_sigaction(sig, NULL, &psa) == -1)
+			if (__libc_sigaction(sig, NULL, &psa) == -1)
 				return (SIG_ERR);
 			return (psa.sa_handler);
 		}
 	} else {
-		if (_sigprocmask(SIG_UNBLOCK, &set, &pset) == -1)
+		if (__libc_sigprocmask(SIG_UNBLOCK, &set, &pset) == -1)
 			return (SIG_ERR);
 	}
 
 	bzero(&sa, sizeof(sa));
 	sa.sa_handler = disp;
-	if (_sigaction(sig, &sa, &psa) == -1)
+	if (__libc_sigaction(sig, &sa, &psa) == -1)
 		return (SIG_ERR);
 	if (sigismember(&pset, sig))
 		return (SIG_HOLD);

Modified: projects/ifnet/lib/libc/db/btree/bt_open.c
==============================================================================
--- projects/ifnet/lib/libc/db/btree/bt_open.c	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/lib/libc/db/btree/bt_open.c	Wed Sep  2 16:06:25 2015	(r287401)
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 #include "un-namespace.h"
+#include "libc_private.h"
 
 #include <db.h>
 #include "btree.h"
@@ -401,10 +402,10 @@ tmp(void)
 	}
 
 	(void)sigfillset(&set);
-	(void)_sigprocmask(SIG_BLOCK, &set, &oset);
+	(void)__libc_sigprocmask(SIG_BLOCK, &set, &oset);
 	if ((fd = mkostemp(path, O_CLOEXEC)) != -1)
 		(void)unlink(path);
-	(void)_sigprocmask(SIG_SETMASK, &oset, NULL);
+	(void)__libc_sigprocmask(SIG_SETMASK, &oset, NULL);
 	return(fd);
 }
 

Modified: projects/ifnet/lib/libc/db/hash/hash_page.c
==============================================================================
--- projects/ifnet/lib/libc/db/hash/hash_page.c	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/lib/libc/db/hash/hash_page.c	Wed Sep  2 16:06:25 2015	(r287401)
@@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$");
 #include <assert.h>
 #endif
 #include "un-namespace.h"
+#include "libc_private.h"
 
 #include <db.h>
 #include "hash.h"
@@ -861,10 +862,10 @@ open_temp(HTAB *hashp)
 
 	/* Block signals; make sure file goes away at process exit. */
 	(void)sigfillset(&set);
-	(void)_sigprocmask(SIG_BLOCK, &set, &oset);
+	(void)__libc_sigprocmask(SIG_BLOCK, &set, &oset);
 	if ((hashp->fp = mkostemp(path, O_CLOEXEC)) != -1)
 		(void)unlink(path);
-	(void)_sigprocmask(SIG_SETMASK, &oset, (sigset_t *)NULL);
+	(void)__libc_sigprocmask(SIG_SETMASK, &oset, (sigset_t *)NULL);
 	return (hashp->fp != -1 ? 0 : -1);
 }
 

Modified: projects/ifnet/lib/libc/gen/daemon.c
==============================================================================
--- projects/ifnet/lib/libc/gen/daemon.c	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/lib/libc/gen/daemon.c	Wed Sep  2 16:06:25 2015	(r287401)
@@ -41,10 +41,10 @@ __FBSDID("$FreeBSD$");
 #include <signal.h>
 #include <unistd.h>
 #include "un-namespace.h"
+#include "libc_private.h"
 
 int
-daemon(nochdir, noclose)
-	int nochdir, noclose;
+daemon(int nochdir, int noclose)
 {
 	struct sigaction osa, sa;
 	int fd;
@@ -56,7 +56,7 @@ daemon(nochdir, noclose)
 	sigemptyset(&sa.sa_mask);
 	sa.sa_handler = SIG_IGN;
 	sa.sa_flags = 0;
-	osa_ok = _sigaction(SIGHUP, &sa, &osa);
+	osa_ok = __libc_sigaction(SIGHUP, &sa, &osa);
 
 	switch (fork()) {
 	case -1:
@@ -74,7 +74,7 @@ daemon(nochdir, noclose)
 	newgrp = setsid();
 	oerrno = errno;
 	if (osa_ok != -1)
-		_sigaction(SIGHUP, &osa, NULL);
+		__libc_sigaction(SIGHUP, &osa, NULL);
 
 	if (newgrp == -1) {
 		errno = oerrno;

Modified: projects/ifnet/lib/libc/gen/devname.c
==============================================================================
--- projects/ifnet/lib/libc/gen/devname.c	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/lib/libc/gen/devname.c	Wed Sep  2 16:06:25 2015	(r287401)
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 
 #include <stdio.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/param.h>
 #include <sys/stat.h>

Modified: projects/ifnet/lib/libc/gen/posix_spawn.c
==============================================================================
--- projects/ifnet/lib/libc/gen/posix_spawn.c	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/lib/libc/gen/posix_spawn.c	Wed Sep  2 16:06:25 2015	(r287401)
@@ -118,15 +118,18 @@ process_spawnattr(const posix_spawnattr_
 			return (errno);
 	}
 
-	/* Set signal masks/defaults */
+	/*
+	 * Set signal masks/defaults.
+	 * Use unwrapped syscall, libthr is in undefined state after vfork().
+	 */
 	if (sa->sa_flags & POSIX_SPAWN_SETSIGMASK) {
-		_sigprocmask(SIG_SETMASK, &sa->sa_sigmask, NULL);
+		__sys_sigprocmask(SIG_SETMASK, &sa->sa_sigmask, NULL);
 	}
 
 	if (sa->sa_flags & POSIX_SPAWN_SETSIGDEF) {
 		for (i = 1; i <= _SIG_MAXSIG; i++) {
 			if (sigismember(&sa->sa_sigdefault, i))
-				if (_sigaction(i, &sigact, NULL) != 0)
+				if (__sys_sigaction(i, &sigact, NULL) != 0)
 					return (errno);
 		}
 	}

Modified: projects/ifnet/lib/libc/gen/readpassphrase.c
==============================================================================
--- projects/ifnet/lib/libc/gen/readpassphrase.c	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/lib/libc/gen/readpassphrase.c	Wed Sep  2 16:06:25 2015	(r287401)
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 #include <readpassphrase.h>
 #include "un-namespace.h"
+#include "libc_private.h"
 
 static volatile sig_atomic_t signo[NSIG];
 
@@ -104,15 +105,15 @@ restart:
 	sigemptyset(&sa.sa_mask);
 	sa.sa_flags = 0;		/* don't restart system calls */
 	sa.sa_handler = handler;
-	(void)_sigaction(SIGALRM, &sa, &savealrm);
-	(void)_sigaction(SIGHUP, &sa, &savehup);
-	(void)_sigaction(SIGINT, &sa, &saveint);
-	(void)_sigaction(SIGPIPE, &sa, &savepipe);
-	(void)_sigaction(SIGQUIT, &sa, &savequit);
-	(void)_sigaction(SIGTERM, &sa, &saveterm);
-	(void)_sigaction(SIGTSTP, &sa, &savetstp);
-	(void)_sigaction(SIGTTIN, &sa, &savettin);
-	(void)_sigaction(SIGTTOU, &sa, &savettou);
+	(void)__libc_sigaction(SIGALRM, &sa, &savealrm);
+	(void)__libc_sigaction(SIGHUP, &sa, &savehup);
+	(void)__libc_sigaction(SIGINT, &sa, &saveint);
+	(void)__libc_sigaction(SIGPIPE, &sa, &savepipe);
+	(void)__libc_sigaction(SIGQUIT, &sa, &savequit);
+	(void)__libc_sigaction(SIGTERM, &sa, &saveterm);
+	(void)__libc_sigaction(SIGTSTP, &sa, &savetstp);
+	(void)__libc_sigaction(SIGTTIN, &sa, &savettin);
+	(void)__libc_sigaction(SIGTTOU, &sa, &savettou);
 
 	if (!(flags & RPP_STDIN))
 		(void)_write(output, prompt, strlen(prompt));
@@ -142,15 +143,15 @@ restart:
 		    errno == EINTR && !signo[SIGTTOU])
 			continue;
 	}
-	(void)_sigaction(SIGALRM, &savealrm, NULL);
-	(void)_sigaction(SIGHUP, &savehup, NULL);
-	(void)_sigaction(SIGINT, &saveint, NULL);
-	(void)_sigaction(SIGQUIT, &savequit, NULL);
-	(void)_sigaction(SIGPIPE, &savepipe, NULL);
-	(void)_sigaction(SIGTERM, &saveterm, NULL);
-	(void)_sigaction(SIGTSTP, &savetstp, NULL);
-	(void)_sigaction(SIGTTIN, &savettin, NULL);
-	(void)_sigaction(SIGTTOU, &savettou, NULL);
+	(void)__libc_sigaction(SIGALRM, &savealrm, NULL);
+	(void)__libc_sigaction(SIGHUP, &savehup, NULL);
+	(void)__libc_sigaction(SIGINT, &saveint, NULL);
+	(void)__libc_sigaction(SIGQUIT, &savequit, NULL);
+	(void)__libc_sigaction(SIGPIPE, &savepipe, NULL);
+	(void)__libc_sigaction(SIGTERM, &saveterm, NULL);
+	(void)__libc_sigaction(SIGTSTP, &savetstp, NULL);
+	(void)__libc_sigaction(SIGTTIN, &savettin, NULL);
+	(void)__libc_sigaction(SIGTTOU, &savettou, NULL);
 	if (input != STDIN_FILENO)
 		(void)_close(input);
 

Modified: projects/ifnet/lib/libc/gen/setmode.c
==============================================================================
--- projects/ifnet/lib/libc/gen/setmode.c	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/lib/libc/gen/setmode.c	Wed Sep  2 16:06:25 2015	(r287401)
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #endif
 #include "un-namespace.h"
+#include "libc_private.h"
 
 #define	SET_LEN	6		/* initial # of bitcmd struct to malloc */
 #define	SET_LEN_INCR 4		/* # of bitcmd structs to add as needed */
@@ -364,9 +365,9 @@ getumask(void)
 	 * handler, protect them as best we can.
 	 */
 	sigfillset(&sigset);
-	(void)_sigprocmask(SIG_BLOCK, &sigset, &sigoset);
+	(void)__libc_sigprocmask(SIG_BLOCK, &sigset, &sigoset);
 	(void)umask(mask = umask(0));
-	(void)_sigprocmask(SIG_SETMASK, &sigoset, NULL);
+	(void)__libc_sigprocmask(SIG_SETMASK, &sigoset, NULL);
 	return (mask);
 }
 

Modified: projects/ifnet/lib/libc/gen/siginterrupt.c
==============================================================================
--- projects/ifnet/lib/libc/gen/siginterrupt.c	Wed Sep  2 15:42:14 2015	(r287400)
+++ projects/ifnet/lib/libc/gen/siginterrupt.c	Wed Sep  2 16:06:25 2015	(r287401)
@@ -43,14 +43,13 @@ __FBSDID("$FreeBSD$");
  * after an instance of the indicated signal.
  */
 int
-siginterrupt(sig, flag)
-	int sig, flag;

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

More information about the svn-src-projects mailing list