svn commit: r287495 - in projects/routing: . bin/setfacl bin/sh bin/sh/tests/builtins bin/sh/tests/parser cddl/contrib/opensolaris/lib/libzpool/common/sys contrib/file contrib/file/magic/Magdir con...

Alexander V. Chernikov melifaro at FreeBSD.org
Sat Sep 5 22:54:13 UTC 2015 

Author: melifaro
Date: Sat Sep  5 22:54:02 2015
New Revision: 287495
URL: https://svnweb.freebsd.org/changeset/base/287495

Log:
  Merge HEAD r276578 through r287493

Added:
  projects/routing/bin/sh/tests/builtins/read9.0
     - copied unchanged from r287493, head/bin/sh/tests/builtins/read9.0
  projects/routing/bin/sh/tests/parser/heredoc13.0
     - copied unchanged from r287493, head/bin/sh/tests/parser/heredoc13.0
  projects/routing/share/doc/papers/bsdreferences.bib
     - copied unchanged from r287493, head/share/doc/papers/bsdreferences.bib
  projects/routing/sys/arm/conf/A20
     - copied unchanged from r287493, head/sys/arm/conf/A20
  projects/routing/sys/boot/efi/include/efipciio.h
     - copied unchanged from r287493, head/sys/boot/efi/include/efipciio.h
  projects/routing/sys/boot/efi/include/efiuga.h
     - copied unchanged from r287493, head/sys/boot/efi/include/efiuga.h
  projects/routing/sys/dev/mmc/host/dwmmc_hisi.c
     - copied unchanged from r287493, head/sys/dev/mmc/host/dwmmc_hisi.c
  projects/routing/sys/dev/mmc/host/dwmmc_reg.h
     - copied unchanged from r287493, head/sys/dev/mmc/host/dwmmc_reg.h
  projects/routing/sys/dev/mmc/host/dwmmc_var.h
     - copied unchanged from r287493, head/sys/dev/mmc/host/dwmmc_var.h
  projects/routing/sys/dev/usb/controller/dwc_otg_hisi.c
     - copied unchanged from r287493, head/sys/dev/usb/controller/dwc_otg_hisi.c
  projects/routing/sys/pc98/include/ofw_machdep.h
     - copied unchanged from r287493, head/sys/pc98/include/ofw_machdep.h
  projects/routing/usr.bin/netstat/nlist_symbols
     - copied unchanged from r287493, head/usr.bin/netstat/nlist_symbols
  projects/routing/usr.sbin/sesutil/
     - copied from r287493, head/usr.sbin/sesutil/
Deleted:
  projects/routing/sys/arm/conf/CUBIEBOARD2
  projects/routing/sys/cam/ctl/ctl_backend_block.h
  projects/routing/sys/dev/mmc/host/dwmmc.h
  projects/routing/sys/mips/rmi/dev/xlr/rge.c
  projects/routing/sys/mips/rmi/dev/xlr/rge.h
Modified:
  projects/routing/Makefile.inc1
  projects/routing/UPDATING
  projects/routing/bin/setfacl/setfacl.1
  projects/routing/bin/sh/expand.c
  projects/routing/bin/sh/miscbltin.c
  projects/routing/bin/sh/options.c
  projects/routing/bin/sh/options.h
  projects/routing/bin/sh/parser.c
  projects/routing/bin/sh/sh.1
  projects/routing/bin/sh/tests/builtins/Makefile
  projects/routing/bin/sh/tests/parser/Makefile
  projects/routing/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  projects/routing/contrib/file/ChangeLog
  projects/routing/contrib/file/configure
  projects/routing/contrib/file/configure.ac
  projects/routing/contrib/file/magic/Magdir/database
  projects/routing/contrib/file/magic/Magdir/elf
  projects/routing/contrib/file/magic/Magdir/fortran
  projects/routing/contrib/file/magic/Magdir/mail.news
  projects/routing/contrib/file/magic/Magdir/make
  projects/routing/contrib/file/magic/Magdir/map
  projects/routing/contrib/file/src/file.c
  projects/routing/contrib/file/src/funcs.c
  projects/routing/contrib/file/src/readelf.c
  projects/routing/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawnattr.c
  projects/routing/etc/devd.conf
  projects/routing/etc/pccard_ether
  projects/routing/gnu/usr.bin/binutils/Makefile
  projects/routing/lib/libc/amd64/gen/setjmp.S
  projects/routing/lib/libc/amd64/gen/sigsetjmp.S
  projects/routing/lib/libc/compat-43/sigcompat.c
  projects/routing/lib/libc/db/btree/bt_open.c
  projects/routing/lib/libc/db/hash/hash_page.c
  projects/routing/lib/libc/gen/daemon.c
  projects/routing/lib/libc/gen/devname.c
  projects/routing/lib/libc/gen/posix_spawn.c
  projects/routing/lib/libc/gen/readpassphrase.c
  projects/routing/lib/libc/gen/setmode.c
  projects/routing/lib/libc/gen/siginterrupt.c
  projects/routing/lib/libc/gen/signal.c
  projects/routing/lib/libc/gen/wordexp.c
  projects/routing/lib/libc/i386/gen/setjmp.S
  projects/routing/lib/libc/i386/gen/sigsetjmp.S
  projects/routing/lib/libc/include/libc_private.h
  projects/routing/lib/libc/net/getnameinfo.c
  projects/routing/lib/libc/net/rcmd.c
  projects/routing/lib/libc/posix1e/acl_add_flag_np.3
  projects/routing/lib/libc/posix1e/acl_init.c
  projects/routing/lib/libc/posix1e/acl_strip.c
  projects/routing/lib/libc/posix1e/acl_support_nfs4.c
  projects/routing/lib/libc/rpc/auth_des.c
  projects/routing/lib/libc/rpc/auth_none.c
  projects/routing/lib/libc/rpc/auth_time.c
  projects/routing/lib/libc/rpc/clnt_bcast.c
  projects/routing/lib/libc/rpc/clnt_dg.c
  projects/routing/lib/libc/rpc/crypt_client.c
  projects/routing/lib/libc/rpc/des_crypt.c
  projects/routing/lib/libc/rpc/des_soft.c
  projects/routing/lib/libc/rpc/getpublickey.c
  projects/routing/lib/libc/rpc/key_call.c
  projects/routing/lib/libc/rpc/rpc_prot.c
  projects/routing/lib/libc/rpc/rpc_soc.c
  projects/routing/lib/libc/rpc/rpcb_clnt.c
  projects/routing/lib/libc/rpc/rpcdname.c
  projects/routing/lib/libc/rpc/rtime.c
  projects/routing/lib/libc/rpc/svc_auth.c
  projects/routing/lib/libc/rpc/svc_auth_des.c
  projects/routing/lib/libc/rpc/svc_dg.c
  projects/routing/lib/libc/rpc/svc_vc.c
  projects/routing/lib/libc/stdio/tmpfile.c
  projects/routing/lib/libc/stdlib/abort.c
  projects/routing/lib/libc/stdlib/system.c
  projects/routing/lib/libc/sys/sigaction.c
  projects/routing/lib/libc/sys/sigprocmask.c
  projects/routing/lib/libc/sys/sigsuspend.c
  projects/routing/lib/libc/tests/gen/posix_spawn/Makefile
  projects/routing/lib/libgeom/geom_xml2tree.c
  projects/routing/lib/libmagic/config.h
  projects/routing/lib/libproc/tests/proc_test.c
  projects/routing/lib/libprocstat/libprocstat.c
  projects/routing/lib/libutil/kinfo_getfile.c
  projects/routing/libexec/rtld-elf/aarch64/reloc.c
  projects/routing/libexec/rtld-elf/aarch64/rtld_machdep.h
  projects/routing/libexec/rtld-elf/rtld.c
  projects/routing/libexec/talkd/table.c
  projects/routing/release/Makefile.vagrant
  projects/routing/sbin/bsdlabel/bsdlabel.8
  projects/routing/sbin/dumpfs/dumpfs.8
  projects/routing/sbin/fdisk/fdisk.8
  projects/routing/sbin/ffsinfo/ffsinfo.8
  projects/routing/sbin/mdconfig/mdconfig.8
  projects/routing/sbin/mount_unionfs/mount_unionfs.8
  projects/routing/sbin/newfs/newfs.8
  projects/routing/sbin/newfs_msdos/newfs_msdos.8
  projects/routing/sbin/newfs_nandfs/newfs_nandfs.8
  projects/routing/sbin/reboot/boot_i386.8
  projects/routing/secure/libexec/sftp-server/Makefile
  projects/routing/secure/libexec/ssh-keysign/Makefile
  projects/routing/secure/libexec/ssh-pkcs11-helper/Makefile
  projects/routing/secure/usr.bin/scp/Makefile
  projects/routing/secure/usr.bin/sftp/Makefile
  projects/routing/secure/usr.bin/ssh-add/Makefile
  projects/routing/secure/usr.bin/ssh-agent/Makefile
  projects/routing/secure/usr.bin/ssh-keyscan/Makefile
  projects/routing/secure/usr.sbin/sshd/Makefile
  projects/routing/share/man/man4/da.4
  projects/routing/share/man/man4/md.4
  projects/routing/share/man/man4/ses.4
  projects/routing/share/man/man4/vpo.4
  projects/routing/share/man/man5/core.5
  projects/routing/share/man/man7/tuning.7
  projects/routing/share/man/man8/picobsd.8
  projects/routing/share/man/man9/acl.9
  projects/routing/share/misc/organization.dot
  projects/routing/share/mk/bsd.port.mk
  projects/routing/share/mk/bsd.port.subdir.mk
  projects/routing/sys/arm/allwinner/a10_gpio.c
  projects/routing/sys/arm/arm/locore-v6.S
  projects/routing/sys/arm64/arm64/machdep.c
  projects/routing/sys/arm64/conf/GENERIC
  projects/routing/sys/boot/efi/loader/Makefile
  projects/routing/sys/boot/efi/loader/arch/amd64/framebuffer.c
  projects/routing/sys/boot/efi/loader/arch/arm64/Makefile.inc
  projects/routing/sys/boot/fdt/dts/arm/bananapi.dts
  projects/routing/sys/boot/fdt/dts/arm/beaglebone-black.dts
  projects/routing/sys/boot/fdt/dts/arm/cubieboard2.dts
  projects/routing/sys/boot/fdt/dts/arm/sun7i-a20.dtsi
  projects/routing/sys/boot/libstand32/Makefile
  projects/routing/sys/cam/ata/ata_xpt.c
  projects/routing/sys/cam/ctl/README.ctl.txt
  projects/routing/sys/cam/ctl/ctl.c
  projects/routing/sys/cam/ctl/ctl.h
  projects/routing/sys/cam/ctl/ctl_backend_block.c
  projects/routing/sys/cam/ctl/ctl_error.c
  projects/routing/sys/cam/ctl/ctl_frontend.c
  projects/routing/sys/cam/ctl/ctl_frontend_cam_sim.c
  projects/routing/sys/cam/ctl/ctl_frontend_ioctl.c
  projects/routing/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/routing/sys/cam/ctl/ctl_io.h
  projects/routing/sys/cam/ctl/ctl_tpc_local.c
  projects/routing/sys/cam/ctl/scsi_ctl.c
  projects/routing/sys/cam/scsi/scsi_cd.c
  projects/routing/sys/cam/scsi/scsi_ch.c
  projects/routing/sys/cam/scsi/scsi_da.c
  projects/routing/sys/cam/scsi/scsi_pt.c
  projects/routing/sys/cam/scsi/scsi_sa.c
  projects/routing/sys/cam/scsi/scsi_xpt.c
  projects/routing/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c
  projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  projects/routing/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h
  projects/routing/sys/compat/linux/linux_fork.c
  projects/routing/sys/conf/files.arm64
  projects/routing/sys/conf/kmod.mk
  projects/routing/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_ani.c
  projects/routing/sys/dev/ciss/ciss.c
  projects/routing/sys/dev/drm2/i915/i915_drv.c
  projects/routing/sys/dev/e1000/if_em.c
  projects/routing/sys/dev/e1000/if_igb.c
  projects/routing/sys/dev/e1000/if_igb.h
  projects/routing/sys/dev/ioat/ioat.c
  projects/routing/sys/dev/ipmi/ipmi_smbios.c
  projects/routing/sys/dev/ipmi/ipmivars.h
  projects/routing/sys/dev/iwn/if_iwn.c
  projects/routing/sys/dev/iwn/if_iwn_ioctl.h
  projects/routing/sys/dev/iwn/if_iwnvar.h
  projects/routing/sys/dev/mii/brgphy.c
  projects/routing/sys/dev/mii/miidevs
  projects/routing/sys/dev/mmc/host/dwmmc.c
  projects/routing/sys/dev/usb/controller/uhci_pci.c
  projects/routing/sys/dev/usb/quirk/usb_quirk.c
  projects/routing/sys/dev/usb/serial/u3g.c
  projects/routing/sys/dev/usb/usbdevs
  projects/routing/sys/dev/virtio/network/if_vtnet.c
  projects/routing/sys/fs/nfs/nfs_commonacl.c
  projects/routing/sys/geom/geom_io.c
  projects/routing/sys/kern/imgact_elf.c
  projects/routing/sys/kern/init_main.c
  projects/routing/sys/kern/kern_descrip.c
  projects/routing/sys/kern/kern_event.c
  projects/routing/sys/kern/kern_timeout.c
  projects/routing/sys/kern/ksched.c
  projects/routing/sys/kern/subr_acl_nfs4.c
  projects/routing/sys/kern/subr_syscall.c
  projects/routing/sys/kern/sys_process.c
  projects/routing/sys/kern/vfs_vnops.c
  projects/routing/sys/mips/rmi/dev/nlge/if_nlge.c
  projects/routing/sys/mips/rmi/files.xlr
  projects/routing/sys/mips/rmi/iodi.c
  projects/routing/sys/net/if.c
  projects/routing/sys/net/if_dl.h
  projects/routing/sys/net/if_epair.c
  projects/routing/sys/net/if_llatbl.c
  projects/routing/sys/net/if_var.h
  projects/routing/sys/net/route.c
  projects/routing/sys/net/route.h
  projects/routing/sys/net/rss_config.c
  projects/routing/sys/net/rss_config.h
  projects/routing/sys/netinet/in_pcb.h
  projects/routing/sys/netinet/in_rss.c
  projects/routing/sys/netinet/in_rss.h
  projects/routing/sys/netinet/ip_input.c
  projects/routing/sys/netinet/sctp_constants.h
  projects/routing/sys/netinet/sctp_input.c
  projects/routing/sys/netinet/sctp_output.c
  projects/routing/sys/netinet/sctp_sysctl.c
  projects/routing/sys/netinet/sctp_sysctl.h
  projects/routing/sys/netinet/sctp_usrreq.c
  projects/routing/sys/netinet/sctputil.c
  projects/routing/sys/netinet/sctputil.h
  projects/routing/sys/netinet/tcp_subr.c
  projects/routing/sys/netinet/tcp_syncache.c
  projects/routing/sys/netinet/tcp_syncache.h
  projects/routing/sys/netinet/tcp_timer.c
  projects/routing/sys/netinet/tcp_timer.h
  projects/routing/sys/netinet/tcp_var.h
  projects/routing/sys/netinet/toecore.c
  projects/routing/sys/netinet6/in6.c
  projects/routing/sys/netinet6/in6_rss.c
  projects/routing/sys/netinet6/in6_rss.h
  projects/routing/sys/netinet6/in6_var.h
  projects/routing/sys/netinet6/ip6_input.c
  projects/routing/sys/netinet6/ip6_var.h
  projects/routing/sys/netinet6/nd6.c
  projects/routing/sys/netinet6/nd6.h
  projects/routing/sys/netinet6/nd6_nbr.c
  projects/routing/sys/netinet6/udp6_usrreq.c
  projects/routing/sys/netpfil/pf/pf.c
  projects/routing/sys/ofed/include/linux/linux_compat.c
  projects/routing/sys/ofed/include/linux/mm.h
  projects/routing/sys/powerpc/booke/pmap.c
  projects/routing/sys/powerpc/include/pmap.h
  projects/routing/sys/powerpc/powerpc/pmap_dispatch.c
  projects/routing/sys/sys/acl.h
  projects/routing/sys/sys/cdefs.h
  projects/routing/sys/sys/posix4.h
  projects/routing/sys/sys/proc.h
  projects/routing/sys/sys/ptrace.h
  projects/routing/sys/sys/user.h
  projects/routing/sys/ufs/ffs/ffs_softdep.c
  projects/routing/sys/vm/uma_core.c
  projects/routing/sys/vm/vm_pageout.c
  projects/routing/sys/x86/include/ofw_machdep.h
  projects/routing/tests/sys/vm/mmap_test.c
  projects/routing/tools/regression/acltools/tools-crossfs.test
  projects/routing/tools/regression/acltools/tools-nfs4-psarc.test
  projects/routing/tools/regression/acltools/tools-nfs4-trivial.test
  projects/routing/tools/regression/acltools/tools-nfs4.test
  projects/routing/tools/regression/lib/msun/test-cexp.c
  projects/routing/tools/regression/lib/msun/test-csqrt.c
  projects/routing/tools/regression/lib/msun/test-invtrig.c
  projects/routing/tools/regression/lib/msun/test-trig.c
  projects/routing/tools/regression/p1003_1b/main.c
  projects/routing/tools/tools/ath/athaggrstats/athaggrstats.c
  projects/routing/tools/tools/ath/athaggrstats/main.c
  projects/routing/tools/tools/ath/athdebug/athdebug.c
  projects/routing/tools/tools/ath/athrd/athrd.c
  projects/routing/tools/tools/ath/athstats/athstats.c
  projects/routing/tools/tools/ath/athstats/main.c
  projects/routing/tools/tools/ath/common/ah_osdep.h
  projects/routing/tools/tools/ath/common/dumpregs_5210.c
  projects/routing/tools/tools/ath/common/dumpregs_5211.c
  projects/routing/tools/tools/ath/common/dumpregs_5212.c
  projects/routing/tools/tools/ath/common/dumpregs_5416.c
  projects/routing/tools/tools/crypto/cryptostats.c
  projects/routing/tools/tools/crypto/cryptotest.c
  projects/routing/tools/tools/crypto/hifnstats.c
  projects/routing/tools/tools/crypto/ipsecstats.c
  projects/routing/tools/tools/crypto/safestats.c
  projects/routing/tools/tools/crypto/ubsecstats.c
  projects/routing/tools/tools/cxgbetool/cxgbetool.c
  projects/routing/tools/tools/iwn/iwnstats/iwn_ioctl.c
  projects/routing/tools/tools/iwn/iwnstats/iwn_ioctl.h
  projects/routing/tools/tools/iwn/iwnstats/iwnstats.h
  projects/routing/tools/tools/iwn/iwnstats/main.c
  projects/routing/tools/tools/mwl/mwldebug/mwldebug.c
  projects/routing/tools/tools/mwl/mwlstats/mwlstats.c
  projects/routing/tools/tools/net80211/wlanstats/main.c
  projects/routing/tools/tools/net80211/wlanstats/wlanstats.c
  projects/routing/tools/tools/net80211/wlantxtime/wlantxtime.c
  projects/routing/tools/tools/npe/npestats/main.c
  projects/routing/tools/tools/npe/npestats/npestats.c
  projects/routing/usr.bin/ar/ar.c
  projects/routing/usr.bin/bluetooth/btsockstat/btsockstat.c
  projects/routing/usr.bin/iconv/iconv.c
  projects/routing/usr.bin/netstat/Makefile
  projects/routing/usr.bin/netstat/if.c
  projects/routing/usr.bin/netstat/inet.c
  projects/routing/usr.bin/netstat/inet6.c
  projects/routing/usr.bin/netstat/main.c
  projects/routing/usr.bin/netstat/mroute.c
  projects/routing/usr.bin/netstat/mroute6.c
  projects/routing/usr.bin/netstat/netgraph.c
  projects/routing/usr.bin/netstat/netisr.c
  projects/routing/usr.bin/netstat/netstat.h
  projects/routing/usr.bin/netstat/route.c
  projects/routing/usr.bin/netstat/sctp.c
  projects/routing/usr.bin/procstat/Makefile
  projects/routing/usr.bin/procstat/procstat.1
  projects/routing/usr.bin/procstat/procstat.c
  projects/routing/usr.bin/procstat/procstat.h
  projects/routing/usr.bin/procstat/procstat_args.c
  projects/routing/usr.bin/procstat/procstat_auxv.c
  projects/routing/usr.bin/procstat/procstat_basic.c
  projects/routing/usr.bin/procstat/procstat_bin.c
  projects/routing/usr.bin/procstat/procstat_cred.c
  projects/routing/usr.bin/procstat/procstat_cs.c
  projects/routing/usr.bin/procstat/procstat_files.c
  projects/routing/usr.bin/procstat/procstat_kstack.c
  projects/routing/usr.bin/procstat/procstat_rlimit.c
  projects/routing/usr.bin/procstat/procstat_rusage.c
  projects/routing/usr.bin/procstat/procstat_sigs.c
  projects/routing/usr.bin/procstat/procstat_threads.c
  projects/routing/usr.bin/procstat/procstat_vm.c
  projects/routing/usr.bin/sockstat/sockstat.c
  projects/routing/usr.bin/tftp/main.c
  projects/routing/usr.bin/vtfontcvt/vtfontcvt.c
  projects/routing/usr.bin/ypcat/ypcat.1
  projects/routing/usr.bin/ypmatch/ypmatch.1
  projects/routing/usr.bin/ypwhich/ypwhich.1
  projects/routing/usr.sbin/Makefile
  projects/routing/usr.sbin/boot0cfg/boot0cfg.8
  projects/routing/usr.sbin/ctladm/ctladm.c
  projects/routing/usr.sbin/ctld/ctl.conf.5
  projects/routing/usr.sbin/ctld/ctld.8
  projects/routing/usr.sbin/ctld/kernel.c
  projects/routing/usr.sbin/iscsid/iscsid.8
  projects/routing/usr.sbin/makefs/mtree.c
  projects/routing/usr.sbin/ntp/config.h
  projects/routing/usr.sbin/pmcstat/pmcstat.c
  projects/routing/usr.sbin/sysrc/sysrc
  projects/routing/usr.sbin/sysrc/sysrc.8
  projects/routing/usr.sbin/trpt/trpt.c
  projects/routing/usr.sbin/yppoll/yppoll.8
  projects/routing/usr.sbin/yppoll/yppoll.c
  projects/routing/usr.sbin/ypset/ypset.8
Directory Properties:
  projects/routing/   (props changed)
  projects/routing/cddl/   (props changed)
  projects/routing/cddl/contrib/opensolaris/   (props changed)
  projects/routing/contrib/file/   (props changed)
  projects/routing/etc/   (props changed)
  projects/routing/gnu/usr.bin/binutils/   (props changed)
  projects/routing/lib/libc/   (props changed)
  projects/routing/lib/libutil/   (props changed)
  projects/routing/sbin/   (props changed)
  projects/routing/share/   (props changed)
  projects/routing/share/man/man4/   (props changed)
  projects/routing/sys/   (props changed)
  projects/routing/sys/boot/   (props changed)
  projects/routing/sys/cddl/contrib/opensolaris/   (props changed)
  projects/routing/sys/conf/   (props changed)
  projects/routing/usr.bin/procstat/   (props changed)

Modified: projects/routing/Makefile.inc1
==============================================================================
--- projects/routing/Makefile.inc1	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/Makefile.inc1	Sat Sep  5 22:54:02 2015	(r287495)
@@ -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/routing/UPDATING
==============================================================================
--- projects/routing/UPDATING	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/UPDATING	Sat Sep  5 22:54:02 2015	(r287495)
@@ -32,6 +32,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	"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'.

Modified: projects/routing/bin/setfacl/setfacl.1
==============================================================================
--- projects/routing/bin/setfacl/setfacl.1	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/bin/setfacl/setfacl.1	Sat Sep  5 22:54:02 2015	(r287495)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 1, 2013
+.Dd September 4, 2015
 .Dt SETFACL 1
 .Os
 .Sh NAME
@@ -378,9 +378,11 @@ dir_inherit
 inherit_only
 .It n
 no_propagate
+.It I
+inherited
 .El
 .Pp
-Inheritance flags may be only set on directories.
+Other than the "inherited" flag, inheritance flags may be only set on directories.
 .It Ar "ACL type"
 The ACL type field is either
 .Dq Li allow

Modified: projects/routing/bin/sh/expand.c
==============================================================================
--- projects/routing/bin/sh/expand.c	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/bin/sh/expand.c	Sat Sep  5 22:54:02 2015	(r287495)
@@ -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/routing/bin/sh/miscbltin.c
==============================================================================
--- projects/routing/bin/sh/miscbltin.c	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/bin/sh/miscbltin.c	Sat Sep  5 22:54:02 2015	(r287495)
@@ -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/routing/bin/sh/options.c
==============================================================================
--- projects/routing/bin/sh/options.c	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/bin/sh/options.c	Sat Sep  5 22:54:02 2015	(r287495)
@@ -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/routing/bin/sh/options.h
==============================================================================
--- projects/routing/bin/sh/options.h	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/bin/sh/options.h	Sat Sep  5 22:54:02 2015	(r287495)
@@ -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/routing/bin/sh/parser.c
==============================================================================
--- projects/routing/bin/sh/parser.c	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/bin/sh/parser.c	Sat Sep  5 22:54:02 2015	(r287495)
@@ -106,6 +106,8 @@ static int startlinno;		/* line # where 
 static int funclinno;		/* line # where the current function started */
 static struct parser_temp *parser_temp;
 
+#define NOEOFMARK ((const char *)&heredoclist)
+
 
 static union node *list(int);
 static union node *andor(void);
@@ -972,6 +974,10 @@ checkend(int c, const char *eofmark, int
 			pungetc();
 			pushstring(eofmark + 1, q - (eofmark + 1), NULL);
 		}
+	} else if (c == '\n' && *eofmark == '\0') {
+		c = PEOF;
+		plinno++;
+		needprompt = doprompt;
 	}
 	return (c);
 }
@@ -1383,7 +1389,7 @@ readtoken1(int firstc, char const *initi
 
 	STARTSTACKSTR(out);
 	loop: {	/* for each line, until end of word */
-		if (eofmark)
+		if (eofmark && eofmark != NOEOFMARK)
 			/* set c to PEOF if at end of here document */
 			c = checkend(c, eofmark, striptabs);
 		for (;;) {	/* until end of line or end of word */
@@ -2046,7 +2052,7 @@ expandstr(const char *ps)
 		parser_temp = NULL;
 		setinputstring(ps, 1);
 		doprompt = 0;
-		readtoken1(pgetc(), DQSYNTAX, "", 0);
+		readtoken1(pgetc(), DQSYNTAX, NOEOFMARK, 0);
 		if (backquotelist != NULL)
 			error("Command substitution not allowed here");
 

Modified: projects/routing/bin/sh/sh.1
==============================================================================
--- projects/routing/bin/sh/sh.1	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/bin/sh/sh.1	Sat Sep  5 22:54:02 2015	(r287495)
@@ -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/routing/bin/sh/tests/builtins/Makefile
==============================================================================
--- projects/routing/bin/sh/tests/builtins/Makefile	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/bin/sh/tests/builtins/Makefile	Sat Sep  5 22:54:02 2015	(r287495)
@@ -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/routing/bin/sh/tests/builtins/read9.0 (from r287493, head/bin/sh/tests/builtins/read9.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/routing/bin/sh/tests/builtins/read9.0	Sat Sep  5 22:54:02 2015	(r287495, copy of r287493, 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/routing/bin/sh/tests/parser/Makefile
==============================================================================
--- projects/routing/bin/sh/tests/parser/Makefile	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/bin/sh/tests/parser/Makefile	Sat Sep  5 22:54:02 2015	(r287495)
@@ -57,6 +57,7 @@ FILES+=		heredoc9.0
 FILES+=		heredoc10.0
 FILES+=		heredoc11.0
 FILES+=		heredoc12.0
+FILES+=		heredoc13.0
 FILES+=		line-cont1.0
 FILES+=		line-cont2.0
 FILES+=		line-cont3.0

Copied: projects/routing/bin/sh/tests/parser/heredoc13.0 (from r287493, head/bin/sh/tests/parser/heredoc13.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/routing/bin/sh/tests/parser/heredoc13.0	Sat Sep  5 22:54:02 2015	(r287495, copy of r287493, head/bin/sh/tests/parser/heredoc13.0)
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+failures=0
+
+check() {
+	if ! eval "[ $* ]"; then
+		echo "Failed: $*"
+		: $((failures += 1))
+	fi
+}
+
+check '"$(cat <<""
+
+echo yes)" = "yes"'
+
+check '"$(cat <<""
+yes
+
+)" = "yes"'
+
+exit $((failures != 0))

Modified: projects/routing/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
==============================================================================
--- projects/routing/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h	Sat Sep  5 22:54:02 2015	(r287495)
@@ -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/routing/contrib/file/ChangeLog
==============================================================================
--- projects/routing/contrib/file/ChangeLog	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/contrib/file/ChangeLog	Sat Sep  5 22:54:02 2015	(r287495)
@@ -1,3 +1,7 @@
+2015-07-09  10:35  Christos Zoulas <christos at zoulas.com>
+
+	* release 5.24
+
 2015-06-11   8:52  Christos Zoulas <christos at zoulas.com>
 
 	* redo long option encoding to fix off-by-one in 5.23

Modified: projects/routing/contrib/file/configure
==============================================================================
--- projects/routing/contrib/file/configure	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/contrib/file/configure	Sat Sep  5 22:54:02 2015	(r287495)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for file 5.23.
+# Generated by GNU Autoconf 2.69 for file 5.24.
 #
 # Report bugs to <christos at astron.com>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='file'
 PACKAGE_TARNAME='file'
-PACKAGE_VERSION='5.23'
-PACKAGE_STRING='file 5.23'
+PACKAGE_VERSION='5.24'
+PACKAGE_STRING='file 5.24'
 PACKAGE_BUGREPORT='christos at astron.com'
 PACKAGE_URL=''
 
@@ -1327,7 +1327,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures file 5.23 to adapt to many kinds of systems.
+\`configure' configures file 5.24 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1397,7 +1397,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of file 5.23:";;
+     short | recursive ) echo "Configuration of file 5.24:";;
    esac
   cat <<\_ACEOF
 
@@ -1507,7 +1507,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-file configure 5.23
+file configure 5.24
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2163,7 +2163,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by file $as_me 5.23, which was
+It was created by file $as_me 5.24, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3029,7 +3029,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='file'
- VERSION='5.23'
+ VERSION='5.24'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15036,7 +15036,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by file $as_me 5.23, which was
+This file was extended by file $as_me 5.24, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15102,7 +15102,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-file config.status 5.23
+file config.status 5.24
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: projects/routing/contrib/file/configure.ac
==============================================================================
--- projects/routing/contrib/file/configure.ac	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/contrib/file/configure.ac	Sat Sep  5 22:54:02 2015	(r287495)
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([file],[5.23],[christos at astron.com])
+AC_INIT([file],[5.24],[christos at astron.com])
 AM_INIT_AUTOMAKE([subdir-objects foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 

Modified: projects/routing/contrib/file/magic/Magdir/database
==============================================================================
--- projects/routing/contrib/file/magic/Magdir/database	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/contrib/file/magic/Magdir/database	Sat Sep  5 22:54:02 2015	(r287495)
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: database,v 1.43 2014/10/28 15:47:39 christos Exp $
+# $File: database,v 1.44 2015/07/02 18:25:57 christos Exp $
 # database:  file(1) magic for various databases
 #
 # extracted from header/code files by Graeme Wilford (eep2gw at ee.surrey.ac.uk)
@@ -533,7 +533,9 @@
 
 # From:  Stephane Blondon http://www.yaal.fr
 # Database file for Zope (done by FileStorage)
-0	string		FS21	Zope Object Database File Storage (data)
+0	string	FS21	Zope Object Database File Storage v3 (data)
+0	string	FS30	Zope Object Database File Storage v4 (data)
+
 # Cache file for the database of Zope (done by ClientStorage)
 0	string		ZEC3	Zope Object Database Client Cache File (data)
 

Modified: projects/routing/contrib/file/magic/Magdir/elf
==============================================================================
--- projects/routing/contrib/file/magic/Magdir/elf	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/contrib/file/magic/Magdir/elf	Sat Sep  5 22:54:02 2015	(r287495)
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: elf,v 1.68 2014/09/19 19:05:57 christos Exp $
+# $File: elf,v 1.69 2015/06/16 17:23:08 christos Exp $
 # elf:  file(1) magic for ELF executables
 #
 # We have to check the byte order flag to see what byte order all the
@@ -15,6 +15,32 @@
 # Modified by (4): <gerardo.cacciari at gmail.com> (VMS Itanium)
 # Modified by (5): Matthias Urlichs <smurf at debian.org> (Listing of many architectures)
 
+0	name		elf-mips
+>0	lelong&0xf0000000	0x00000000	MIPS-I
+>0	lelong&0xf0000000	0x10000000	MIPS-II
+>0	lelong&0xf0000000	0x20000000	MIPS-III
+>0	lelong&0xf0000000	0x30000000	MIPS-IV
+>0	lelong&0xf0000000	0x40000000	MIPS-V
+>0	lelong&0xf0000000	0x50000000	MIPS32
+>0	lelong&0xf0000000	0x60000000	MIPS64
+>0	lelong&0xf0000000	0x70000000	MIPS32 rel2
+>0	lelong&0xf0000000	0x80000000	MIPS64 rel2
+>0	lelong&0xf0000000	0x90000000	MIPS32 rel6
+>0	lelong&0xf0000000	0xa0000000	MIPS64 rel6
+
+0	name		elf-sparc
+>0	lelong&0x00ffff00	0x00000100	V8+ Required,
+>0	lelong&0x00ffff00	0x00000200	Sun UltraSPARC1 Extensions Required,
+>0	lelong&0x00ffff00	0x00000400	HaL R1 Extensions Required,
+>0	lelong&0x00ffff00	0x00000800	Sun UltraSPARC3 Extensions Required,
+>0	lelong&0x3		0		total store ordering,
+>0	lelong&0x3		1		partial store ordering,
+>0	lelong&0x3		2		relaxed memory ordering,
+
+0	name		elf-pa-risc
+>2	leshort		0x0214		2.0
+>0	leshort		&0x0008		(LP64)
+
 0	name		elf-le
 >16	leshort		0		no file type,
 !:mime	application/octet-stream
@@ -55,47 +81,26 @@
 >18	leshort		8
 # only for 32-bit
 >>4	byte		1
->>>36  lelong&0xf0000000	0x00000000	MIPS-I
->>>36  lelong&0xf0000000	0x10000000	MIPS-II
->>>36  lelong&0xf0000000	0x20000000	MIPS-III
->>>36  lelong&0xf0000000	0x30000000	MIPS-IV
->>>36  lelong&0xf0000000	0x40000000	MIPS-V
->>>36  lelong&0xf0000000	0x50000000	MIPS32
->>>36  lelong&0xf0000000	0x60000000	MIPS64
->>>36  lelong&0xf0000000	0x70000000	MIPS32 rel2
->>>36  lelong&0xf0000000	0x80000000	MIPS64 rel2
+>>>36	use		elf-mips
 # only for 64-bit
 >>4	byte		2
->>>48  lelong&0xf0000000	0x00000000	MIPS-I
->>>48  lelong&0xf0000000	0x10000000	MIPS-II
->>>48  lelong&0xf0000000	0x20000000	MIPS-III
->>>48  lelong&0xf0000000	0x30000000	MIPS-IV
->>>48  lelong&0xf0000000	0x40000000	MIPS-V
->>>48  lelong&0xf0000000	0x50000000	MIPS32
->>>48  lelong&0xf0000000	0x60000000	MIPS64
->>>48  lelong&0xf0000000	0x70000000	MIPS32 rel2
->>>48  lelong&0xf0000000	0x80000000	MIPS64 rel2
+>>>48	use		elf-mips
 >18	leshort		9		Amdahl,
 >18	leshort		10		MIPS (deprecated),
 >18	leshort		11		RS6000,
 >18	leshort		15		PA-RISC,
 # only for 32-bit
 >>4	byte		1
->>>38	leshort		0x0214		2.0
->>>36	leshort		&0x0008		(LP64)
+>>>36	use		elf-pa-risc
 # only for 64-bit
 >>4	byte		2
->>>50	leshort		0x0214		2.0
->>>48	leshort		&0x0008		(LP64)
+>>>48	use		elf-pa-risc
 >18	leshort		16		nCUBE,
 >18	leshort		17		Fujitsu VPP500,
 >18	leshort		18		SPARC32PLUS,
 # only for 32-bit
 >>4	byte		1
->>>36	lelong&0xffff00	0x000100	V8+ Required,
->>>36	lelong&0xffff00	0x000200	Sun UltraSPARC1 Extensions Required,
->>>36	lelong&0xffff00	0x000400	HaL R1 Extensions Required,
->>>36	lelong&0xffff00	0x000800	Sun UltraSPARC3 Extensions Required,
+>>>36	use		elf-sparc
 >18	leshort		19		Intel 80960,
 >18	leshort		20		PowerPC or cisco 4500,
 >18	leshort		21		64-bit PowerPC or cisco 7500,
@@ -117,12 +122,7 @@
 >18	leshort		42		Renesas SH,
 >18	leshort		43		SPARC V9,
 >>4	byte		2
->>>48	lelong&0xffff00	0x000200	Sun UltraSPARC1 Extensions Required,
->>>48	lelong&0xffff00	0x000400	HaL R1 Extensions Required,
->>>48	lelong&0xffff00	0x000800	Sun UltraSPARC3 Extensions Required,
->>>48	lelong&0x3	0		total store ordering,
->>>48	lelong&0x3	1		partial store ordering,
->>>48	lelong&0x3	2		relaxed memory ordering,
+>>>48	use		elf-sparc
 >18	leshort		44		Siemens Tricore Embedded Processor,
 >18	leshort		45		Argonaut RISC Core, Argonaut Technologies Inc.,
 >18	leshort		46		Renesas H8/300,

Modified: projects/routing/contrib/file/magic/Magdir/fortran
==============================================================================
--- projects/routing/contrib/file/magic/Magdir/fortran	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/contrib/file/magic/Magdir/fortran	Sat Sep  5 22:54:02 2015	(r287495)
@@ -1,7 +1,7 @@
 
 #------------------------------------------------------------------------------
-# $File: fortran,v 1.8 2014/06/03 19:01:34 christos Exp $
+# $File: fortran,v 1.9 2015/06/17 19:55:27 christos Exp $
 # FORTRAN source
-0	regex/100l	\^[Cc][\ \t]	FORTRAN program
+0	regex/100l	\^[Cc][\ \t]	FORTRAN program text
 !:mime	text/x-fortran
 !:strength - 5

Modified: projects/routing/contrib/file/magic/Magdir/mail.news
==============================================================================
--- projects/routing/contrib/file/magic/Magdir/mail.news	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/contrib/file/magic/Magdir/mail.news	Sat Sep  5 22:54:02 2015	(r287495)
@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# $File: mail.news,v 1.22 2013/01/04 14:22:07 christos Exp $
+# $File: mail.news,v 1.23 2015/06/29 14:44:26 christos Exp $
 # mail.news:  file(1) magic for mail and news
 #
 # Unfortunately, saved netnews also has From line added in some news software.
@@ -41,6 +41,7 @@
 
 # From: Simon Matter <simon.matter at invoca.ch>
 0	string		\241\002\213\015skiplist\ file\0\0\0	Cyrus skiplist DB
+0	string		\241\002\213\015twoskip\ file\0\0\0\0	Cyrus twoskip DB
 
 # JAM(mbp) Fidonet message area databases
 # JHR file

Modified: projects/routing/contrib/file/magic/Magdir/make
==============================================================================
--- projects/routing/contrib/file/magic/Magdir/make	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/contrib/file/magic/Magdir/make	Sat Sep  5 22:54:02 2015	(r287495)
@@ -2,14 +2,20 @@
 # $File: make,v 1.1 2011/12/08 12:12:46 rrt Exp $
 # make:  file(1) magic for makefiles
 #
-0	regex	\^CFLAGS	makefile script text
+0	regex/100l	\^CFLAGS	makefile script text
 !:mime	text/x-makefile
-0	regex	\^LDFLAGS	makefile script text
+0	regex/100l	\^VPATH		makefile script text
 !:mime	text/x-makefile
-0	regex	\^all:	makefile script text
+0	regex/100l	\^LDFLAGS	makefile script text
 !:mime	text/x-makefile
-0	regex	\^.PRECIOUS	makefile script text
+0	regex/100l	\^all:		makefile script text
+!:mime	text/x-makefile
+0	regex/100l	\^\.PRECIOUS	makefile script text
+!:mime	text/x-makefile
+0	regex/100l	\^\.BEGIN	BSD makefile script text
+!:mime	text/x-makefile
+0	regex/100l	\^\.include	BSD makefile script text
 !:mime	text/x-makefile
 
-0	regex	\^SUBDIRS	automake makefile script text
+0	regex/100l	\^SUBDIRS	automake makefile script text
 !:mime	text/x-makefile

Modified: projects/routing/contrib/file/magic/Magdir/map
==============================================================================
--- projects/routing/contrib/file/magic/Magdir/map	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/contrib/file/magic/Magdir/map	Sat Sep  5 22:54:02 2015	(r287495)
@@ -1,7 +1,7 @@
 
 
 #------------------------------------------------------------------------------
-# $File: map,v 1.1 2014/06/03 18:22:25 christos Exp $
+# $File: map,v 1.3 2015/07/09 15:16:41 christos Exp $
 # map:  file(1) magic for Map data
 #
 
@@ -9,9 +9,11 @@
 8	string	.FIT		FIT Map data
 >15	byte	0
 >>35	belong	x		\b, unit id %d
-# 20 years after unix epoch
 >>39	lelong	x		\b, serial %u
->>43	ledate/631152000 x	\b, %s
+# http://pub.ks-and-ks.ne.jp/cycling/edge500_fit.shtml
+# 20 years after unix epoch
+# TZ=GMT date -d '1989-12-31 0:00' +%s
+>>43	leldate+631065600	x	\b, %s
 
 >>47	leshort x		\b, manufacturer %d
 >>47	leshort	1		\b (garmin)

Modified: projects/routing/contrib/file/src/file.c
==============================================================================
--- projects/routing/contrib/file/src/file.c	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/contrib/file/src/file.c	Sat Sep  5 22:54:02 2015	(r287495)
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: file.c,v 1.164 2015/06/03 18:21:24 christos Exp $")
+FILE_RCSID("@(#)$File: file.c,v 1.165 2015/06/11 12:52:32 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"

Modified: projects/routing/contrib/file/src/funcs.c
==============================================================================
--- projects/routing/contrib/file/src/funcs.c	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/contrib/file/src/funcs.c	Sat Sep  5 22:54:02 2015	(r287495)
@@ -27,7 +27,7 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: funcs.c,v 1.82 2015/06/03 18:01:20 christos Exp $")
+FILE_RCSID("@(#)$File: funcs.c,v 1.83 2015/06/16 14:17:37 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
@@ -107,8 +107,10 @@ file_error_core(struct magic_set *ms, in
 	if (lineno != 0) {
 		free(ms->o.buf);
 		ms->o.buf = NULL;
-		file_printf(ms, "line %" SIZE_T_FORMAT "u: ", lineno);
+		file_printf(ms, "line %" SIZE_T_FORMAT "u:", lineno);
 	}
+	if (ms->o.buf && *ms->o.buf)
+		file_printf(ms, " ");
 	file_vprintf(ms, f, va);
 	if (error > 0)
 		file_printf(ms, " (%s)", strerror(error));

Modified: projects/routing/contrib/file/src/readelf.c
==============================================================================
--- projects/routing/contrib/file/src/readelf.c	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/contrib/file/src/readelf.c	Sat Sep  5 22:54:02 2015	(r287495)
@@ -27,7 +27,7 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: readelf.c,v 1.119 2015/04/09 20:01:41 christos Exp $")
+FILE_RCSID("@(#)$File: readelf.c,v 1.120 2015/06/16 14:18:07 christos Exp $")
 #endif
 
 #ifdef BUILTIN_ELF
@@ -1048,9 +1048,18 @@ doshn(struct magic_set *ms, int clazz, i
 			break;
 		}
 
+
 		/* Things we can determine when we seek */
 		switch (xsh_type) {
 		case SHT_NOTE:
+			if (xsh_size + (uintmax_t)xsh_offset > (uintmax_t)fsize)  {
+				if (file_printf(ms,
+				    ", note offset/size 0x%jx+0x%jx exceeds"
+				    " file size 0x%jx", (uintmax_t)xsh_offset,
+				    (uintmax_t)xsh_size, (uintmax_t)fsize) == -1)
+					return -1;
+				return 0; 
+			}
 			if ((nbuf = malloc(xsh_size)) == NULL) {
 				file_error(ms, errno, "Cannot allocate memory"
 				    " for note");

Modified: projects/routing/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawnattr.c
==============================================================================
--- projects/routing/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawnattr.c	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawnattr.c	Sat Sep  5 22:54:02 2015	(r287495)
@@ -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/routing/etc/devd.conf
==============================================================================
--- projects/routing/etc/devd.conf	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/etc/devd.conf	Sat Sep  5 22:54:02 2015	(r287495)
@@ -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/routing/etc/pccard_ether
==============================================================================
--- projects/routing/etc/pccard_ether	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/etc/pccard_ether	Sat Sep  5 22:54:02 2015	(r287495)
@@ -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/routing/gnu/usr.bin/binutils/Makefile
==============================================================================
--- projects/routing/gnu/usr.bin/binutils/Makefile	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/gnu/usr.bin/binutils/Makefile	Sat Sep  5 22:54:02 2015	(r287495)
@@ -5,10 +5,8 @@
 SUBDIR=	doc\
 	libiberty \
 	libbfd \
-	.WAIT \
 	libopcodes \
 	libbinutils \
-	.WAIT \
 	as \
 	ld \
 	${_objcopy} \
@@ -18,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/routing/lib/libc/amd64/gen/setjmp.S
==============================================================================
--- projects/routing/lib/libc/amd64/gen/setjmp.S	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/lib/libc/amd64/gen/setjmp.S	Sat Sep  5 22:54:02 2015	(r287495)
@@ -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/routing/lib/libc/amd64/gen/sigsetjmp.S
==============================================================================
--- projects/routing/lib/libc/amd64/gen/sigsetjmp.S	Sat Sep  5 22:33:40 2015	(r287494)
+++ projects/routing/lib/libc/amd64/gen/sigsetjmp.S	Sat Sep  5 22:54:02 2015	(r287495)
@@ -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 */

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

More information about the svn-src-projects mailing list