From owner-svn-src-projects@freebsd.org Wed Sep 2 16:06:37 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 86ECB9C8A20 for ; Wed, 2 Sep 2015 16:06:37 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 73FD0C64; Wed, 2 Sep 2015 16:06:37 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t82G6bE3095823; Wed, 2 Sep 2015 16:06:37 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t82G6Ql7095776; Wed, 2 Sep 2015 16:06:26 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201509021606.t82G6Ql7095776@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 2 Sep 2015 16:06:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: 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... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2015 16:06:37 -0000 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 #include #include +#include #include #include #include @@ -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 <> 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 #include #include #include @@ -42,51 +43,56 @@ #include #include -#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, ¶m); 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 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 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 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 #include #include "un-namespace.h" +#include "libc_private.h" #include #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 #endif #include "un-namespace.h" +#include "libc_private.h" #include #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 #include #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 #include +#include #include #include #include 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 #include #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 #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 *** From owner-svn-src-projects@freebsd.org Fri Sep 4 15:49:53 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C1AA39CA41C for ; Fri, 4 Sep 2015 15:49:53 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B17A7C29; Fri, 4 Sep 2015 15:49:53 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t84FnrGs020311; Fri, 4 Sep 2015 15:49:53 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t84Fnq40020304; Fri, 4 Sep 2015 15:49:52 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201509041549.t84Fnq40020304@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 4 Sep 2015 15:49:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r287464 - in projects/ifnet/sys: netinet netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2015 15:49:54 -0000 Author: glebius Date: Fri Sep 4 15:49:51 2015 New Revision: 287464 URL: https://svnweb.freebsd.org/changeset/base/287464 Log: Fix compilation failures after head/ merge. Modified: projects/ifnet/sys/netinet/if_ether.c projects/ifnet/sys/netinet/in.c projects/ifnet/sys/netinet6/in6.c projects/ifnet/sys/netinet6/nd6.c projects/ifnet/sys/netinet6/nd6_nbr.c Modified: projects/ifnet/sys/netinet/if_ether.c ============================================================================== --- projects/ifnet/sys/netinet/if_ether.c Fri Sep 4 15:45:42 2015 (r287463) +++ projects/ifnet/sys/netinet/if_ether.c Fri Sep 4 15:49:51 2015 (r287464) @@ -474,7 +474,7 @@ arpresolve(struct ifnet *ifp, int is_gw, if (m->m_flags & M_BCAST) { /* broadcast */ (void)memcpy(desten, - ifp->if_broadcastaddr, ifp->if_addrlen); + ifp->if_broadcastaddr, if_addrlen(ifp)); return (0); } if (m->m_flags & M_MCAST) { @@ -493,7 +493,7 @@ arpresolve(struct ifnet *ifp, int is_gw, if ((la->la_flags & LLE_VALID) && ((la->la_flags & LLE_STATIC) || la->la_expire > time_uptime)) { - bcopy(&la->ll_addr, desten, ifp->if_addrlen); + bcopy(&la->ll_addr, desten, if_addrlen(ifp)); renew = 0; /* * If entry has an expiry time and it is approaching, @@ -761,11 +761,11 @@ match: goto drop; } - if (ifp->if_addrlen != ah->ar_hln) { + if (if_addrlen(ifp) != ah->ar_hln) { ARP_LOG(LOG_WARNING, "from %*D: addr len: new %d, " - "i/f %d (ignored)\n", ifp->if_addrlen, + "i/f %d (ignored)\n", if_addrlen(ifp), (u_char *) ar_sha(ah), ":", ah->ar_hln, - ifp->if_addrlen); + if_addrlen(ifp)); goto drop; } @@ -973,20 +973,20 @@ arp_check_update_lle(struct arphdr *ah, "but got reply from %*D on %s\n", inet_ntoa(isaddr), la->lle_tbl->llt_ifp->if_xname, - ifp->if_addrlen, (u_char *)ar_sha(ah), ":", + if_addrlen(ifp), (u_char *)ar_sha(ah), ":", ifp->if_xname); LLE_WUNLOCK(la); return; } if ((la->la_flags & LLE_VALID) && - bcmp(ar_sha(ah), &la->ll_addr, ifp->if_addrlen)) { + bcmp(ar_sha(ah), &la->ll_addr, if_addrlen(ifp))) { if (la->la_flags & LLE_STATIC) { LLE_WUNLOCK(la); if (log_arp_permanent_modify) ARP_LOG(LOG_ERR, "%*D attempts to modify " "permanent entry for %s on %s\n", - ifp->if_addrlen, + if_addrlen(ifp), (u_char *)ar_sha(ah), ":", inet_ntoa(isaddr), ifp->if_xname); return; @@ -995,15 +995,15 @@ arp_check_update_lle(struct arphdr *ah, ARP_LOG(LOG_INFO, "%s moved from %*D " "to %*D on %s\n", inet_ntoa(isaddr), - ifp->if_addrlen, + if_addrlen(ifp), (u_char *)&la->ll_addr, ":", - ifp->if_addrlen, (u_char *)ar_sha(ah), ":", + if_addrlen(ifp), (u_char *)ar_sha(ah), ":", ifp->if_xname); } } /* Check if something has changed */ - if (memcmp(&la->ll_addr, ar_sha(ah), ifp->if_addrlen) != 0 || + if (memcmp(&la->ll_addr, ar_sha(ah), if_addrlen(ifp)) != 0 || (la->la_flags & LLE_VALID) == 0) { /* Perform real LLE update */ /* use afdata WLOCK to update fields */ @@ -1049,7 +1049,7 @@ arp_check_update_lle(struct arphdr *ah, m_hold->m_nextpkt = NULL; /* Avoid confusing lower layers. */ m_clrprotoflags(m_hold); - (*ifp->if_output)(ifp, m_hold, &sa, NULL); + if_output(ifp, m_hold, &sa, NULL); } } else LLE_WUNLOCK(la); @@ -1062,7 +1062,7 @@ static void arp_update_lle(struct arphdr *ah, struct ifnet *ifp, struct llentry *la) { - memcpy(&la->ll_addr, ar_sha(ah), ifp->if_addrlen); + memcpy(&la->ll_addr, ar_sha(ah), if_addrlen(ifp)); la->la_flags |= LLE_VALID; } @@ -1105,8 +1105,8 @@ arp_ifinit(struct ifnet *ifp, struct ifa if (ntohl(IA_SIN(ifa)->sin_addr.s_addr) == INADDR_ANY) return; - arprequest(ifp, &IA_SIN(ifa)->sin_addr, - &IA_SIN(ifa)->sin_addr, IF_LLADDR(ifp)); + arprequest(ifp, &IA_SIN(ifa)->sin_addr, &IA_SIN(ifa)->sin_addr, + if_lladdr(ifp)); /* * Interface address LLE record is considered static Modified: projects/ifnet/sys/netinet/in.c ============================================================================== --- projects/ifnet/sys/netinet/in.c Fri Sep 4 15:45:42 2015 (r287463) +++ projects/ifnet/sys/netinet/in.c Fri Sep 4 15:49:51 2015 (r287464) @@ -1233,7 +1233,7 @@ in_lltable_alloc(struct lltable *llt, u_ } lle->la_flags = flags; if ((flags & LLE_IFADDR) == LLE_IFADDR) { - bcopy(IF_LLADDR(ifp), &lle->ll_addr, ifp->if_addrlen); + bcopy(if_lladdr(ifp), &lle->ll_addr, if_addrlen(ifp)); lle->la_flags |= (LLE_VALID | LLE_STATIC); } Modified: projects/ifnet/sys/netinet6/in6.c ============================================================================== --- projects/ifnet/sys/netinet6/in6.c Fri Sep 4 15:45:42 2015 (r287463) +++ projects/ifnet/sys/netinet6/in6.c Fri Sep 4 15:49:51 2015 (r287464) @@ -2255,7 +2255,7 @@ in6_lltable_alloc(struct lltable *llt, u } lle->la_flags = flags; if ((flags & LLE_IFADDR) == LLE_IFADDR) { - bcopy(IF_LLADDR(ifp), &lle->ll_addr, ifp->if_addrlen); + bcopy(if_lladdr(ifp), &lle->ll_addr, if_addrlen(ifp)); lle->la_flags |= (LLE_VALID | LLE_STATIC); } Modified: projects/ifnet/sys/netinet6/nd6.c ============================================================================== --- projects/ifnet/sys/netinet6/nd6.c Fri Sep 4 15:45:42 2015 (r287463) +++ projects/ifnet/sys/netinet6/nd6.c Fri Sep 4 15:49:51 2015 (r287464) @@ -182,11 +182,11 @@ nd6_lle_event(void *arg __unused, struct in6_addrscope(&dst.sin6_addr)); gw.sdl_len = sizeof(struct sockaddr_dl); gw.sdl_family = AF_LINK; - gw.sdl_alen = ifp->if_addrlen; + gw.sdl_alen = if_addrlen(ifp); gw.sdl_index = ifp->if_index; - gw.sdl_type = ifp->if_type; + gw.sdl_type = if_type(ifp); if (evt == LLENTRY_RESOLVED) - bcopy(&lle->ll_addr, gw.sdl_data, ifp->if_addrlen); + bcopy(&lle->ll_addr, gw.sdl_data, if_addrlen(ifp)); rtinfo.rti_info[RTAX_DST] = (struct sockaddr *)&dst; rtinfo.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&gw; rtinfo.rti_addrs = RTA_DST | RTA_GATEWAY; Modified: projects/ifnet/sys/netinet6/nd6_nbr.c ============================================================================== --- projects/ifnet/sys/netinet6/nd6_nbr.c Fri Sep 4 15:45:42 2015 (r287463) +++ projects/ifnet/sys/netinet6/nd6_nbr.c Fri Sep 4 15:49:51 2015 (r287464) @@ -1308,7 +1308,6 @@ nd6_dad_start(struct ifaddr *ifa, int de return; } if (!(ifa->ifa_ifp->if_flags & IFF_UP) || - !(ifa->ifa_ifp->if_drv_flags & IFF_DRV_RUNNING) || (ND_IFINFO(ifa->ifa_ifp)->flags & ND6_IFF_IFDISABLED)) { ia->ia6_flags |= IN6_IFF_TENTATIVE; return; From owner-svn-src-projects@freebsd.org Sat Sep 5 18:36:36 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27BCA9CA862 for ; Sat, 5 Sep 2015 18:36:36 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 147AE118C; Sat, 5 Sep 2015 18:36:36 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t85IaaHp092895; Sat, 5 Sep 2015 18:36:36 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t85IaPan092858; Sat, 5 Sep 2015 18:36:25 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201509051836.t85IaPan092858@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 5 Sep 2015 18:36:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r287490 - in projects/clang-trunk: . bin/df bin/ls bin/pkill bin/pkill/tests bin/ps bin/rm bin/setfacl bin/sh bin/sh/tests/builtins bin/sh/tests/errors bin/sh/tests/parser cddl/contrib/... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2015 18:36:36 -0000 Author: dim Date: Sat Sep 5 18:36:23 2015 New Revision: 287490 URL: https://svnweb.freebsd.org/changeset/base/287490 Log: Merge ^/head r286858 through r287489. Added: projects/clang-trunk/bin/sh/tests/builtins/case20.0 - copied unchanged from r287489, head/bin/sh/tests/builtins/case20.0 projects/clang-trunk/bin/sh/tests/builtins/read9.0 - copied unchanged from r287489, head/bin/sh/tests/builtins/read9.0 projects/clang-trunk/bin/sh/tests/errors/bad-parm-exp7.0 - copied unchanged from r287489, head/bin/sh/tests/errors/bad-parm-exp7.0 projects/clang-trunk/bin/sh/tests/errors/bad-parm-exp8.0 - copied unchanged from r287489, head/bin/sh/tests/errors/bad-parm-exp8.0 projects/clang-trunk/bin/sh/tests/parser/dollar-quote12.0 - copied unchanged from r287489, head/bin/sh/tests/parser/dollar-quote12.0 projects/clang-trunk/bin/sh/tests/parser/dollar-quote13.0 - copied unchanged from r287489, head/bin/sh/tests/parser/dollar-quote13.0 projects/clang-trunk/bin/sh/tests/parser/heredoc13.0 - copied unchanged from r287489, head/bin/sh/tests/parser/heredoc13.0 projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h - copied unchanged from r287489, head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/pages.h - copied unchanged from r287489, head/contrib/jemalloc/include/jemalloc/internal/pages.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/valgrind.h - copied unchanged from r287489, head/contrib/jemalloc/include/jemalloc/internal/valgrind.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/jemalloc_typedefs.h - copied unchanged from r287489, head/contrib/jemalloc/include/jemalloc/jemalloc_typedefs.h projects/clang-trunk/contrib/jemalloc/src/pages.c - copied unchanged from r287489, head/contrib/jemalloc/src/pages.c projects/clang-trunk/contrib/libxo/INSTALL.md - copied unchanged from r287489, head/contrib/libxo/INSTALL.md projects/clang-trunk/contrib/libxo/encoder/ - copied from r287489, head/contrib/libxo/encoder/ projects/clang-trunk/contrib/libxo/libxo/add.man - copied unchanged from r287489, head/contrib/libxo/libxo/add.man projects/clang-trunk/contrib/libxo/libxo/add.man.in - copied unchanged from r287489, head/contrib/libxo/libxo/add.man.in projects/clang-trunk/contrib/libxo/libxo/xo_buf.h - copied unchanged from r287489, head/contrib/libxo/libxo/xo_buf.h projects/clang-trunk/contrib/libxo/libxo/xo_config.h - copied unchanged from r287489, head/contrib/libxo/libxo/xo_config.h projects/clang-trunk/contrib/libxo/libxo/xo_emit_err.3 - copied unchanged from r287489, head/contrib/libxo/libxo/xo_emit_err.3 projects/clang-trunk/contrib/libxo/libxo/xo_encoder.c - copied unchanged from r287489, head/contrib/libxo/libxo/xo_encoder.c projects/clang-trunk/contrib/libxo/libxo/xo_encoder.h - copied unchanged from r287489, head/contrib/libxo/libxo/xo_encoder.h projects/clang-trunk/contrib/libxo/libxo/xo_humanize.h - copied unchanged from r287489, head/contrib/libxo/libxo/xo_humanize.h projects/clang-trunk/contrib/libxo/libxo/xo_message.3 - copied unchanged from r287489, head/contrib/libxo/libxo/xo_message.3 projects/clang-trunk/contrib/libxo/libxo/xo_set_syslog_enterprise_id.3 - copied unchanged from r287489, head/contrib/libxo/libxo/xo_set_syslog_enterprise_id.3 projects/clang-trunk/contrib/libxo/libxo/xo_syslog.3 - copied unchanged from r287489, head/contrib/libxo/libxo/xo_syslog.3 projects/clang-trunk/contrib/libxo/libxo/xo_syslog.c - copied unchanged from r287489, head/contrib/libxo/libxo/xo_syslog.c projects/clang-trunk/contrib/libxo/libxo/xo_wcwidth.h - copied unchanged from r287489, head/contrib/libxo/libxo/xo_wcwidth.h projects/clang-trunk/contrib/libxo/tests/core/saved/test_01.E.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_01.E.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_01.E.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_01.E.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_02.E.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_02.E.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_02.E.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_02.E.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_03.E.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_03.E.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_03.E.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_03.E.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_04.E.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_04.E.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_04.E.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_04.E.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_05.E.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_05.E.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_05.E.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_05.E.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_06.E.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_06.E.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_06.E.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_06.E.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_07.E.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_07.E.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_07.E.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_07.E.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_08.E.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_08.E.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_08.E.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_08.E.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_09.E.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_09.E.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_09.E.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_09.E.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_10.E.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_10.E.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_10.E.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_10.E.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_11.E.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_11.E.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_11.E.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_11.E.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_11.H.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_11.H.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_11.H.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_11.H.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_11.HIPx.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_11.HIPx.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_11.HIPx.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_11.HIPx.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_11.HP.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_11.HP.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_11.HP.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_11.HP.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_11.J.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_11.J.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_11.J.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_11.J.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_11.JP.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_11.JP.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_11.JP.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_11.JP.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_11.T.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_11.T.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_11.T.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_11.T.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_11.X.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_11.X.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_11.X.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_11.X.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_11.XP.err - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_11.XP.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_11.XP.out - copied unchanged from r287489, head/contrib/libxo/tests/core/saved/test_11.XP.out projects/clang-trunk/contrib/libxo/tests/core/test_11.c - copied unchanged from r287489, head/contrib/libxo/tests/core/test_11.c projects/clang-trunk/contrib/libxo/tests/gettext/ - copied from r287489, head/contrib/libxo/tests/gettext/ projects/clang-trunk/contrib/libxo/xopo/ - copied from r287489, head/contrib/libxo/xopo/ projects/clang-trunk/lib/libc/aarch64/gen/infinity.c - copied unchanged from r287489, head/lib/libc/aarch64/gen/infinity.c projects/clang-trunk/lib/libkvm/kvm_minidump_aarch64.c - copied unchanged from r287489, head/lib/libkvm/kvm_minidump_aarch64.c projects/clang-trunk/share/doc/papers/bsdreferences.bib - copied unchanged from r287489, head/share/doc/papers/bsdreferences.bib projects/clang-trunk/share/man/man4/ioat.4 - copied unchanged from r287489, head/share/man/man4/ioat.4 projects/clang-trunk/share/man/man4/ow.4 - copied unchanged from r287489, head/share/man/man4/ow.4 projects/clang-trunk/share/man/man4/ow_temp.4 - copied unchanged from r287489, head/share/man/man4/ow_temp.4 projects/clang-trunk/share/man/man4/owc.4 - copied unchanged from r287489, head/share/man/man4/owc.4 projects/clang-trunk/share/man/man4/rccgpio.4 - copied unchanged from r287489, head/share/man/man4/rccgpio.4 projects/clang-trunk/share/man/man9/owll.9 - copied unchanged from r287489, head/share/man/man9/owll.9 projects/clang-trunk/share/man/man9/own.9 - copied unchanged from r287489, head/share/man/man9/own.9 projects/clang-trunk/share/mk/bsd.stand.mk - copied unchanged from r287489, head/share/mk/bsd.stand.mk projects/clang-trunk/sys/arm/conf/A20 - copied unchanged from r287489, head/sys/arm/conf/A20 projects/clang-trunk/sys/arm64/include/minidump.h - copied unchanged from r287489, head/sys/arm64/include/minidump.h projects/clang-trunk/sys/boot/efi/include/efipciio.h - copied unchanged from r287489, head/sys/boot/efi/include/efipciio.h projects/clang-trunk/sys/boot/efi/include/efiuga.h - copied unchanged from r287489, head/sys/boot/efi/include/efiuga.h projects/clang-trunk/sys/dev/ioat/ - copied from r287489, head/sys/dev/ioat/ projects/clang-trunk/sys/dev/mmc/host/dwmmc_hisi.c - copied unchanged from r287489, head/sys/dev/mmc/host/dwmmc_hisi.c projects/clang-trunk/sys/dev/mmc/host/dwmmc_reg.h - copied unchanged from r287489, head/sys/dev/mmc/host/dwmmc_reg.h projects/clang-trunk/sys/dev/mmc/host/dwmmc_var.h - copied unchanged from r287489, head/sys/dev/mmc/host/dwmmc_var.h projects/clang-trunk/sys/dev/ow/ - copied from r287489, head/sys/dev/ow/ projects/clang-trunk/sys/dev/rccgpio/ - copied from r287489, head/sys/dev/rccgpio/ projects/clang-trunk/sys/dev/usb/controller/dwc_otg_hisi.c - copied unchanged from r287489, head/sys/dev/usb/controller/dwc_otg_hisi.c projects/clang-trunk/sys/modules/ioat/ - copied from r287489, head/sys/modules/ioat/ projects/clang-trunk/sys/modules/ow/ - copied from r287489, head/sys/modules/ow/ projects/clang-trunk/sys/modules/rccgpio/ - copied from r287489, head/sys/modules/rccgpio/ projects/clang-trunk/sys/net/altq/altq_codel.c - copied unchanged from r287489, head/sys/net/altq/altq_codel.c projects/clang-trunk/sys/net/altq/altq_codel.h - copied unchanged from r287489, head/sys/net/altq/altq_codel.h projects/clang-trunk/sys/pc98/include/ofw_machdep.h - copied unchanged from r287489, head/sys/pc98/include/ofw_machdep.h projects/clang-trunk/sys/powerpc/mikrotik/ - copied from r287489, head/sys/powerpc/mikrotik/ projects/clang-trunk/tools/tools/ioat/ - copied from r287489, head/tools/tools/ioat/ projects/clang-trunk/usr.bin/netstat/nlist_symbols - copied unchanged from r287489, head/usr.bin/netstat/nlist_symbols projects/clang-trunk/usr.sbin/fstyp/tests/ - copied from r287489, head/usr.sbin/fstyp/tests/ projects/clang-trunk/usr.sbin/sesutil/ - copied from r287489, head/usr.sbin/sesutil/ projects/clang-trunk/usr.sbin/ypserv/common/ - copied from r287489, head/usr.sbin/ypserv/common/ Deleted: projects/clang-trunk/contrib/libxo/libxo/xoconfig.h projects/clang-trunk/contrib/libxo/libxo/xoconfig.h.in projects/clang-trunk/contrib/libxo/libxo/xoversion.h projects/clang-trunk/contrib/libxo/libxo/xoversion.h.in projects/clang-trunk/sys/arm/conf/CUBIEBOARD2 projects/clang-trunk/sys/cam/ctl/ctl_backend_block.h projects/clang-trunk/sys/dev/mmc/host/dwmmc.h projects/clang-trunk/sys/mips/rmi/dev/xlr/rge.c projects/clang-trunk/sys/mips/rmi/dev/xlr/rge.h Modified: projects/clang-trunk/Makefile.inc1 projects/clang-trunk/ObsoleteFiles.inc projects/clang-trunk/UPDATING projects/clang-trunk/bin/df/df.c projects/clang-trunk/bin/ls/Makefile projects/clang-trunk/bin/pkill/Makefile projects/clang-trunk/bin/pkill/Makefile.depend projects/clang-trunk/bin/pkill/pkill.1 projects/clang-trunk/bin/pkill/pkill.c projects/clang-trunk/bin/pkill/tests/pgrep-j_test.sh projects/clang-trunk/bin/pkill/tests/pkill-j_test.sh projects/clang-trunk/bin/ps/Makefile projects/clang-trunk/bin/rm/rm.c projects/clang-trunk/bin/setfacl/setfacl.1 projects/clang-trunk/bin/sh/expand.c projects/clang-trunk/bin/sh/miscbltin.c projects/clang-trunk/bin/sh/options.c projects/clang-trunk/bin/sh/options.h projects/clang-trunk/bin/sh/parser.c projects/clang-trunk/bin/sh/sh.1 projects/clang-trunk/bin/sh/tests/builtins/Makefile projects/clang-trunk/bin/sh/tests/errors/Makefile projects/clang-trunk/bin/sh/tests/parser/Makefile projects/clang-trunk/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h projects/clang-trunk/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c projects/clang-trunk/cddl/lib/Makefile projects/clang-trunk/contrib/compiler-rt/lib/builtins/multc3.c projects/clang-trunk/contrib/expat/lib/xmlparse.c projects/clang-trunk/contrib/file/ChangeLog projects/clang-trunk/contrib/file/configure projects/clang-trunk/contrib/file/configure.ac projects/clang-trunk/contrib/file/magic/Magdir/database projects/clang-trunk/contrib/file/magic/Magdir/elf projects/clang-trunk/contrib/file/magic/Magdir/fortran projects/clang-trunk/contrib/file/magic/Magdir/mail.news projects/clang-trunk/contrib/file/magic/Magdir/make projects/clang-trunk/contrib/file/magic/Magdir/map projects/clang-trunk/contrib/file/src/file.c projects/clang-trunk/contrib/file/src/funcs.c projects/clang-trunk/contrib/file/src/readelf.c projects/clang-trunk/contrib/hyperv/tools/hv_kvp_daemon.c projects/clang-trunk/contrib/jemalloc/COPYING projects/clang-trunk/contrib/jemalloc/ChangeLog projects/clang-trunk/contrib/jemalloc/FREEBSD-Xlist projects/clang-trunk/contrib/jemalloc/FREEBSD-diffs projects/clang-trunk/contrib/jemalloc/FREEBSD-upgrade projects/clang-trunk/contrib/jemalloc/VERSION projects/clang-trunk/contrib/jemalloc/doc/jemalloc.3 projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/arena.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/atomic.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/base.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/bitmap.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/chunk.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/chunk_dss.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/chunk_mmap.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/ckh.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/ctl.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/extent.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/hash.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/huge.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_macros.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/mutex.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/private_namespace.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/prng.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/prof.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/public_namespace.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/ql.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/qr.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/quarantine.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/rb.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/rtree.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/size_classes.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/stats.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/tcache.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/tsd.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/internal/util.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/jemalloc.h projects/clang-trunk/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h projects/clang-trunk/contrib/jemalloc/src/arena.c projects/clang-trunk/contrib/jemalloc/src/base.c projects/clang-trunk/contrib/jemalloc/src/bitmap.c projects/clang-trunk/contrib/jemalloc/src/chunk.c projects/clang-trunk/contrib/jemalloc/src/chunk_dss.c projects/clang-trunk/contrib/jemalloc/src/chunk_mmap.c projects/clang-trunk/contrib/jemalloc/src/ckh.c projects/clang-trunk/contrib/jemalloc/src/ctl.c projects/clang-trunk/contrib/jemalloc/src/extent.c projects/clang-trunk/contrib/jemalloc/src/huge.c projects/clang-trunk/contrib/jemalloc/src/jemalloc.c projects/clang-trunk/contrib/jemalloc/src/mutex.c projects/clang-trunk/contrib/jemalloc/src/prof.c projects/clang-trunk/contrib/jemalloc/src/quarantine.c projects/clang-trunk/contrib/jemalloc/src/rtree.c projects/clang-trunk/contrib/jemalloc/src/stats.c projects/clang-trunk/contrib/jemalloc/src/tcache.c projects/clang-trunk/contrib/jemalloc/src/tsd.c projects/clang-trunk/contrib/jemalloc/src/util.c projects/clang-trunk/contrib/libxo/.gitignore projects/clang-trunk/contrib/libxo/.travis.yml projects/clang-trunk/contrib/libxo/Makefile.am projects/clang-trunk/contrib/libxo/bin/Zaliases projects/clang-trunk/contrib/libxo/bin/setup.sh projects/clang-trunk/contrib/libxo/configure.ac projects/clang-trunk/contrib/libxo/doc/Makefile.am projects/clang-trunk/contrib/libxo/doc/libxo.txt projects/clang-trunk/contrib/libxo/libxo/Makefile.am projects/clang-trunk/contrib/libxo/libxo/libxo.3 projects/clang-trunk/contrib/libxo/libxo/libxo.c projects/clang-trunk/contrib/libxo/libxo/xo.h projects/clang-trunk/contrib/libxo/libxo/xo_attr.3 projects/clang-trunk/contrib/libxo/libxo/xo_create.3 projects/clang-trunk/contrib/libxo/libxo/xo_emit.3 projects/clang-trunk/contrib/libxo/libxo/xo_err.3 projects/clang-trunk/contrib/libxo/libxo/xo_error.3 projects/clang-trunk/contrib/libxo/libxo/xo_finish.3 projects/clang-trunk/contrib/libxo/libxo/xo_flush.3 projects/clang-trunk/contrib/libxo/libxo/xo_format.5 projects/clang-trunk/contrib/libxo/libxo/xo_no_setlocale.3 projects/clang-trunk/contrib/libxo/libxo/xo_open_container.3 projects/clang-trunk/contrib/libxo/libxo/xo_open_list.3 projects/clang-trunk/contrib/libxo/libxo/xo_open_marker.3 projects/clang-trunk/contrib/libxo/libxo/xo_parse_args.3 projects/clang-trunk/contrib/libxo/libxo/xo_set_allocator.3 projects/clang-trunk/contrib/libxo/libxo/xo_set_flags.3 projects/clang-trunk/contrib/libxo/libxo/xo_set_info.3 projects/clang-trunk/contrib/libxo/libxo/xo_set_options.3 projects/clang-trunk/contrib/libxo/libxo/xo_set_style.3 projects/clang-trunk/contrib/libxo/libxo/xo_set_version.3 projects/clang-trunk/contrib/libxo/libxo/xo_set_writer.3 projects/clang-trunk/contrib/libxo/tests/Makefile.am projects/clang-trunk/contrib/libxo/tests/core/Makefile.am projects/clang-trunk/contrib/libxo/tests/core/saved/test_01.H.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_01.HIPx.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_01.HP.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_01.J.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_01.JP.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_01.T.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_01.X.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_01.XP.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_02.H.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_02.HIPx.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_02.HP.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_02.J.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_02.JP.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_02.T.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_02.X.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_02.XP.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_05.H.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_05.HIPx.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_05.HP.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_05.J.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_05.JP.out (contents, props changed) projects/clang-trunk/contrib/libxo/tests/core/saved/test_05.T.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_05.X.out (contents, props changed) projects/clang-trunk/contrib/libxo/tests/core/saved/test_05.XP.out (contents, props changed) projects/clang-trunk/contrib/libxo/tests/core/saved/test_08.H.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_08.HIPx.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_08.HIPx.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_08.HP.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_08.J.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_08.J.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_08.JP.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_08.JP.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_08.T.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_08.X.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_08.X.out projects/clang-trunk/contrib/libxo/tests/core/saved/test_08.XP.err projects/clang-trunk/contrib/libxo/tests/core/saved/test_08.XP.out projects/clang-trunk/contrib/libxo/tests/core/test_01.c projects/clang-trunk/contrib/libxo/tests/core/test_02.c projects/clang-trunk/contrib/libxo/tests/core/test_05.c projects/clang-trunk/contrib/libxo/tests/core/test_08.c projects/clang-trunk/contrib/libxo/xo/Makefile.am projects/clang-trunk/contrib/libxo/xo/xo.1 projects/clang-trunk/contrib/libxo/xo/xo.c projects/clang-trunk/contrib/libxo/xohtml/Makefile.am projects/clang-trunk/contrib/libxo/xohtml/xohtml.1 projects/clang-trunk/contrib/libxo/xolint/Makefile.am projects/clang-trunk/contrib/libxo/xolint/xolint.1 projects/clang-trunk/contrib/libxo/xolint/xolint.pl projects/clang-trunk/contrib/ncurses/ncurses/base/MKlib_gen.sh projects/clang-trunk/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawnattr.c projects/clang-trunk/contrib/subversion/subversion/svn/util.c projects/clang-trunk/contrib/tzdata/leapseconds projects/clang-trunk/crypto/openssh/monitor.c projects/clang-trunk/crypto/openssh/monitor_wrap.c projects/clang-trunk/crypto/openssh/mux.c projects/clang-trunk/etc/devd.conf projects/clang-trunk/etc/mtree/BSD.tests.dist projects/clang-trunk/etc/mtree/BSD.usr.dist projects/clang-trunk/etc/network.subr projects/clang-trunk/etc/pccard_ether projects/clang-trunk/etc/rc.d/jail projects/clang-trunk/etc/rc.d/netif projects/clang-trunk/gnu/usr.bin/binutils/Makefile projects/clang-trunk/include/malloc_np.h projects/clang-trunk/kerberos5/Makefile.inc projects/clang-trunk/kerberos5/lib/libhdb/Makefile projects/clang-trunk/kerberos5/libexec/digest-service/Makefile projects/clang-trunk/kerberos5/libexec/kdc/Makefile projects/clang-trunk/kerberos5/usr.bin/kpasswd/Makefile projects/clang-trunk/kerberos5/usr.sbin/iprop-log/Makefile projects/clang-trunk/lib/libc/aarch64/Symbol.map projects/clang-trunk/lib/libc/aarch64/gen/Makefile.inc projects/clang-trunk/lib/libc/amd64/gen/setjmp.S projects/clang-trunk/lib/libc/amd64/gen/sigsetjmp.S projects/clang-trunk/lib/libc/compat-43/sigcompat.c projects/clang-trunk/lib/libc/db/btree/bt_open.c projects/clang-trunk/lib/libc/db/hash/hash_page.c projects/clang-trunk/lib/libc/gen/daemon.c projects/clang-trunk/lib/libc/gen/devname.c projects/clang-trunk/lib/libc/gen/posix_spawn.c projects/clang-trunk/lib/libc/gen/readpassphrase.c projects/clang-trunk/lib/libc/gen/setmode.c projects/clang-trunk/lib/libc/gen/siginterrupt.c projects/clang-trunk/lib/libc/gen/signal.c projects/clang-trunk/lib/libc/gen/tls.c projects/clang-trunk/lib/libc/gen/wordexp.3 projects/clang-trunk/lib/libc/gen/wordexp.c projects/clang-trunk/lib/libc/i386/gen/setjmp.S projects/clang-trunk/lib/libc/i386/gen/sigsetjmp.S projects/clang-trunk/lib/libc/include/libc_private.h projects/clang-trunk/lib/libc/locale/utf8.c projects/clang-trunk/lib/libc/net/getnameinfo.c projects/clang-trunk/lib/libc/net/rcmd.c projects/clang-trunk/lib/libc/net/rcmdsh.c projects/clang-trunk/lib/libc/posix1e/acl_add_flag_np.3 projects/clang-trunk/lib/libc/posix1e/acl_flag.c projects/clang-trunk/lib/libc/posix1e/acl_init.c projects/clang-trunk/lib/libc/posix1e/acl_strip.c projects/clang-trunk/lib/libc/posix1e/acl_support_nfs4.c projects/clang-trunk/lib/libc/rpc/auth_des.c projects/clang-trunk/lib/libc/rpc/auth_none.c projects/clang-trunk/lib/libc/rpc/auth_time.c projects/clang-trunk/lib/libc/rpc/clnt_bcast.c projects/clang-trunk/lib/libc/rpc/clnt_dg.c projects/clang-trunk/lib/libc/rpc/crypt_client.c projects/clang-trunk/lib/libc/rpc/des_crypt.c projects/clang-trunk/lib/libc/rpc/des_soft.c projects/clang-trunk/lib/libc/rpc/getpublickey.c projects/clang-trunk/lib/libc/rpc/key_call.c projects/clang-trunk/lib/libc/rpc/rpc_prot.c projects/clang-trunk/lib/libc/rpc/rpc_soc.c projects/clang-trunk/lib/libc/rpc/rpcb_clnt.c projects/clang-trunk/lib/libc/rpc/rpcdname.c projects/clang-trunk/lib/libc/rpc/rtime.c projects/clang-trunk/lib/libc/rpc/svc_auth.c projects/clang-trunk/lib/libc/rpc/svc_auth_des.c projects/clang-trunk/lib/libc/rpc/svc_dg.c projects/clang-trunk/lib/libc/rpc/svc_vc.c projects/clang-trunk/lib/libc/stdio/tmpfile.c projects/clang-trunk/lib/libc/stdlib/abort.c projects/clang-trunk/lib/libc/stdlib/jemalloc/Makefile.inc projects/clang-trunk/lib/libc/stdlib/jemalloc/Symbol.map projects/clang-trunk/lib/libc/stdlib/system.c projects/clang-trunk/lib/libc/string/bcopy.3 projects/clang-trunk/lib/libc/string/bzero.3 projects/clang-trunk/lib/libc/string/strndup.c projects/clang-trunk/lib/libc/sys/getrlimit.2 projects/clang-trunk/lib/libc/sys/procctl.2 projects/clang-trunk/lib/libc/sys/sigaction.c projects/clang-trunk/lib/libc/sys/sigprocmask.c projects/clang-trunk/lib/libc/sys/sigsuspend.c projects/clang-trunk/lib/libc/tests/gen/posix_spawn/Makefile projects/clang-trunk/lib/libc/tests/sys/Makefile projects/clang-trunk/lib/libgeom/geom_xml2tree.c projects/clang-trunk/lib/libkvm/kvm_aarch64.c projects/clang-trunk/lib/libkvm/kvm_private.h projects/clang-trunk/lib/libmagic/config.h projects/clang-trunk/lib/libproc/proc_bkpt.c projects/clang-trunk/lib/libprocstat/libprocstat.c projects/clang-trunk/lib/libstand/Makefile projects/clang-trunk/lib/libutil/kinfo_getfile.c projects/clang-trunk/lib/libutil/tests/Makefile projects/clang-trunk/lib/libxo/Makefile projects/clang-trunk/libexec/ftpd/Makefile projects/clang-trunk/libexec/rtld-elf/aarch64/reloc.c projects/clang-trunk/libexec/rtld-elf/aarch64/rtld_machdep.h projects/clang-trunk/libexec/rtld-elf/rtld.c projects/clang-trunk/libexec/talkd/table.c projects/clang-trunk/release/Makefile.vagrant projects/clang-trunk/release/doc/en_US.ISO8859-1/errata/article.xml projects/clang-trunk/sbin/bsdlabel/bsdlabel.8 projects/clang-trunk/sbin/camcontrol/camcontrol.8 projects/clang-trunk/sbin/camcontrol/camcontrol.c projects/clang-trunk/sbin/camcontrol/camcontrol.h projects/clang-trunk/sbin/camcontrol/fwdownload.c projects/clang-trunk/sbin/camcontrol/progress.c projects/clang-trunk/sbin/dumpfs/dumpfs.8 projects/clang-trunk/sbin/fdisk/fdisk.8 projects/clang-trunk/sbin/ffsinfo/ffsinfo.8 projects/clang-trunk/sbin/ipfw/ipfw2.c projects/clang-trunk/sbin/ipfw/nat.c projects/clang-trunk/sbin/ipfw/tables.c projects/clang-trunk/sbin/mdconfig/mdconfig.8 projects/clang-trunk/sbin/mount_unionfs/mount_unionfs.8 projects/clang-trunk/sbin/newfs/newfs.8 projects/clang-trunk/sbin/newfs/newfs.c projects/clang-trunk/sbin/newfs_msdos/newfs_msdos.8 projects/clang-trunk/sbin/newfs_nandfs/newfs_nandfs.8 projects/clang-trunk/sbin/pfctl/parse.y projects/clang-trunk/sbin/pfctl/pfctl_altq.c projects/clang-trunk/sbin/pfctl/pfctl_parser.c projects/clang-trunk/sbin/pfctl/pfctl_parser.h projects/clang-trunk/sbin/pfctl/pfctl_qstats.c projects/clang-trunk/sbin/reboot/boot_i386.8 projects/clang-trunk/sbin/savecore/Makefile projects/clang-trunk/secure/libexec/sftp-server/Makefile projects/clang-trunk/secure/libexec/ssh-keysign/Makefile projects/clang-trunk/secure/libexec/ssh-pkcs11-helper/Makefile projects/clang-trunk/secure/usr.bin/scp/Makefile projects/clang-trunk/secure/usr.bin/sftp/Makefile projects/clang-trunk/secure/usr.bin/ssh-add/Makefile projects/clang-trunk/secure/usr.bin/ssh-agent/Makefile projects/clang-trunk/secure/usr.bin/ssh-keyscan/Makefile projects/clang-trunk/secure/usr.sbin/sshd/Makefile projects/clang-trunk/share/man/man4/Makefile projects/clang-trunk/share/man/man4/altq.4 projects/clang-trunk/share/man/man4/da.4 projects/clang-trunk/share/man/man4/md.4 projects/clang-trunk/share/man/man4/random.4 projects/clang-trunk/share/man/man4/rights.4 projects/clang-trunk/share/man/man4/ses.4 projects/clang-trunk/share/man/man4/vpo.4 projects/clang-trunk/share/man/man5/core.5 projects/clang-trunk/share/man/man5/pf.conf.5 projects/clang-trunk/share/man/man5/rc.conf.5 projects/clang-trunk/share/man/man7/tuning.7 projects/clang-trunk/share/man/man8/picobsd.8 projects/clang-trunk/share/man/man9/Makefile projects/clang-trunk/share/man/man9/acl.9 projects/clang-trunk/share/man/man9/devfs_set_cdevpriv.9 projects/clang-trunk/share/man/man9/nv.9 projects/clang-trunk/share/misc/organization.dot projects/clang-trunk/share/mk/bsd.README projects/clang-trunk/share/mk/bsd.cpu.mk projects/clang-trunk/share/mk/bsd.files.mk projects/clang-trunk/share/mk/bsd.own.mk projects/clang-trunk/share/mk/bsd.port.mk projects/clang-trunk/share/mk/bsd.port.subdir.mk projects/clang-trunk/share/mk/bsd.subdir.mk projects/clang-trunk/share/mk/sys.mk projects/clang-trunk/share/zoneinfo/Makefile projects/clang-trunk/sys/amd64/amd64/exception.S projects/clang-trunk/sys/amd64/amd64/machdep.c projects/clang-trunk/sys/amd64/amd64/pmap.c projects/clang-trunk/sys/amd64/cloudabi64/cloudabi64_sysvec.c projects/clang-trunk/sys/amd64/conf/NOTES projects/clang-trunk/sys/arm/allwinner/a10_gpio.c projects/clang-trunk/sys/arm/arm/busdma_machdep-v6.c projects/clang-trunk/sys/arm/arm/locore-v6.S projects/clang-trunk/sys/arm/arm/machdep.c projects/clang-trunk/sys/arm/conf/BEAGLEBONE projects/clang-trunk/sys/arm/conf/IMX6 projects/clang-trunk/sys/arm/conf/std.armv6 projects/clang-trunk/sys/arm/freescale/imx/imx_wdog.c projects/clang-trunk/sys/arm/freescale/imx/imx_wdogreg.h projects/clang-trunk/sys/arm/include/proc.h projects/clang-trunk/sys/arm64/arm64/db_interface.c projects/clang-trunk/sys/arm64/arm64/gic_v3.c projects/clang-trunk/sys/arm64/arm64/gic_v3_its.c projects/clang-trunk/sys/arm64/arm64/gic_v3_reg.h projects/clang-trunk/sys/arm64/arm64/gic_v3_var.h projects/clang-trunk/sys/arm64/arm64/machdep.c projects/clang-trunk/sys/arm64/arm64/minidump_machdep.c projects/clang-trunk/sys/arm64/arm64/mp_machdep.c projects/clang-trunk/sys/arm64/arm64/pmap.c projects/clang-trunk/sys/arm64/arm64/support.S projects/clang-trunk/sys/arm64/arm64/trap.c projects/clang-trunk/sys/arm64/arm64/uma_machdep.c projects/clang-trunk/sys/arm64/arm64/unwind.c projects/clang-trunk/sys/arm64/conf/GENERIC projects/clang-trunk/sys/arm64/include/cpu.h projects/clang-trunk/sys/arm64/include/md_var.h projects/clang-trunk/sys/arm64/include/param.h projects/clang-trunk/sys/arm64/include/pmap.h projects/clang-trunk/sys/boot/efi/Makefile.inc projects/clang-trunk/sys/boot/efi/loader/Makefile projects/clang-trunk/sys/boot/efi/loader/arch/amd64/framebuffer.c projects/clang-trunk/sys/boot/efi/loader/arch/arm64/Makefile.inc projects/clang-trunk/sys/boot/fdt/dts/arm/bananapi.dts projects/clang-trunk/sys/boot/fdt/dts/arm/beaglebone-black.dts projects/clang-trunk/sys/boot/fdt/dts/arm/cubieboard2.dts projects/clang-trunk/sys/boot/fdt/dts/arm/sun7i-a20.dtsi projects/clang-trunk/sys/boot/ficl/Makefile projects/clang-trunk/sys/boot/i386/Makefile.inc projects/clang-trunk/sys/boot/libstand32/Makefile projects/clang-trunk/sys/boot/pc98/Makefile.inc projects/clang-trunk/sys/boot/userboot/ficl/Makefile projects/clang-trunk/sys/boot/userboot/libstand/Makefile projects/clang-trunk/sys/boot/zfs/Makefile projects/clang-trunk/sys/cam/ata/ata_da.c projects/clang-trunk/sys/cam/ata/ata_xpt.c projects/clang-trunk/sys/cam/ctl/README.ctl.txt projects/clang-trunk/sys/cam/ctl/ctl.c projects/clang-trunk/sys/cam/ctl/ctl.h projects/clang-trunk/sys/cam/ctl/ctl_backend_block.c projects/clang-trunk/sys/cam/ctl/ctl_error.c projects/clang-trunk/sys/cam/ctl/ctl_frontend.c projects/clang-trunk/sys/cam/ctl/ctl_frontend_cam_sim.c projects/clang-trunk/sys/cam/ctl/ctl_frontend_ioctl.c projects/clang-trunk/sys/cam/ctl/ctl_frontend_iscsi.c projects/clang-trunk/sys/cam/ctl/ctl_io.h projects/clang-trunk/sys/cam/ctl/ctl_tpc_local.c projects/clang-trunk/sys/cam/ctl/scsi_ctl.c projects/clang-trunk/sys/cam/scsi/scsi_all.c projects/clang-trunk/sys/cam/scsi/scsi_all.h projects/clang-trunk/sys/cam/scsi/scsi_cd.c projects/clang-trunk/sys/cam/scsi/scsi_ch.c projects/clang-trunk/sys/cam/scsi/scsi_da.c projects/clang-trunk/sys/cam/scsi/scsi_pt.c projects/clang-trunk/sys/cam/scsi/scsi_sa.c projects/clang-trunk/sys/cam/scsi/scsi_xpt.c projects/clang-trunk/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h projects/clang-trunk/sys/compat/cloudabi/cloudabi_fd.c projects/clang-trunk/sys/compat/linux/linux_fork.c projects/clang-trunk/sys/conf/NOTES projects/clang-trunk/sys/conf/files projects/clang-trunk/sys/conf/files.amd64 projects/clang-trunk/sys/conf/files.arm64 projects/clang-trunk/sys/conf/files.powerpc projects/clang-trunk/sys/conf/kmod.mk projects/clang-trunk/sys/conf/options projects/clang-trunk/sys/conf/options.arm64 projects/clang-trunk/sys/conf/options.powerpc projects/clang-trunk/sys/contrib/dev/acpica/changes.txt projects/clang-trunk/sys/contrib/dev/acpica/common/adisasm.c projects/clang-trunk/sys/contrib/dev/acpica/common/dmtable.c projects/clang-trunk/sys/contrib/dev/acpica/compiler/aslmain.c projects/clang-trunk/sys/contrib/dev/acpica/compiler/asloperands.c projects/clang-trunk/sys/contrib/dev/acpica/compiler/asloptions.c projects/clang-trunk/sys/contrib/dev/acpica/compiler/aslstartup.c projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbcmds.c projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbconvert.c projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbdisply.c projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbexec.c projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbfileio.c projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbhistry.c projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbinput.c projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbmethod.c projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbnames.c projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbobject.c projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbstats.c projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbtest.c projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbutils.c projects/clang-trunk/sys/contrib/dev/acpica/components/debugger/dbxface.c projects/clang-trunk/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c projects/clang-trunk/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c projects/clang-trunk/sys/contrib/dev/acpica/components/disassembler/dmnames.c projects/clang-trunk/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/clang-trunk/sys/contrib/dev/acpica/components/disassembler/dmresrc.c projects/clang-trunk/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c projects/clang-trunk/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c projects/clang-trunk/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c projects/clang-trunk/sys/contrib/dev/acpica/components/disassembler/dmutils.c projects/clang-trunk/sys/contrib/dev/acpica/components/disassembler/dmwalk.c projects/clang-trunk/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c projects/clang-trunk/sys/contrib/dev/acpica/components/dispatcher/dsdebug.c projects/clang-trunk/sys/contrib/dev/acpica/components/dispatcher/dsinit.c projects/clang-trunk/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c projects/clang-trunk/sys/contrib/dev/acpica/components/events/evregion.c projects/clang-trunk/sys/contrib/dev/acpica/components/executer/exconfig.c projects/clang-trunk/sys/contrib/dev/acpica/components/executer/exdump.c projects/clang-trunk/sys/contrib/dev/acpica/components/executer/exresnte.c projects/clang-trunk/sys/contrib/dev/acpica/components/executer/exresolv.c projects/clang-trunk/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c projects/clang-trunk/sys/contrib/dev/acpica/components/namespace/nseval.c projects/clang-trunk/sys/contrib/dev/acpica/components/namespace/nsload.c projects/clang-trunk/sys/contrib/dev/acpica/components/namespace/nsutils.c projects/clang-trunk/sys/contrib/dev/acpica/components/parser/psloop.c projects/clang-trunk/sys/contrib/dev/acpica/components/resources/rsdump.c projects/clang-trunk/sys/contrib/dev/acpica/components/tables/tbfadt.c projects/clang-trunk/sys/contrib/dev/acpica/components/tables/tbfind.c projects/clang-trunk/sys/contrib/dev/acpica/components/tables/tbinstal.c projects/clang-trunk/sys/contrib/dev/acpica/components/tables/tbutils.c projects/clang-trunk/sys/contrib/dev/acpica/components/tables/tbxfload.c projects/clang-trunk/sys/contrib/dev/acpica/components/utilities/utfileio.c projects/clang-trunk/sys/contrib/dev/acpica/components/utilities/utinit.c projects/clang-trunk/sys/contrib/dev/acpica/components/utilities/utmisc.c projects/clang-trunk/sys/contrib/dev/acpica/components/utilities/utnonansi.c projects/clang-trunk/sys/contrib/dev/acpica/components/utilities/utxface.c projects/clang-trunk/sys/contrib/dev/acpica/components/utilities/utxfinit.c projects/clang-trunk/sys/contrib/dev/acpica/include/acbuffer.h projects/clang-trunk/sys/contrib/dev/acpica/include/acconfig.h projects/clang-trunk/sys/contrib/dev/acpica/include/acdebug.h projects/clang-trunk/sys/contrib/dev/acpica/include/acdisasm.h projects/clang-trunk/sys/contrib/dev/acpica/include/acexcep.h projects/clang-trunk/sys/contrib/dev/acpica/include/acglobal.h projects/clang-trunk/sys/contrib/dev/acpica/include/aclocal.h projects/clang-trunk/sys/contrib/dev/acpica/include/acpixf.h projects/clang-trunk/sys/contrib/dev/acpica/include/actables.h projects/clang-trunk/sys/contrib/dev/acpica/include/actypes.h projects/clang-trunk/sys/contrib/dev/acpica/include/acutils.h projects/clang-trunk/sys/contrib/dev/acpica/include/platform/acenv.h projects/clang-trunk/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_ani.c projects/clang-trunk/sys/dev/acpica/Osd/OsdDebug.c projects/clang-trunk/sys/dev/ath/ath_rate/sample/sample.c projects/clang-trunk/sys/dev/ath/ath_rate/sample/sample.h projects/clang-trunk/sys/dev/ath/if_ath.c projects/clang-trunk/sys/dev/ath/if_ath_beacon.c projects/clang-trunk/sys/dev/ath/if_ath_debug.h projects/clang-trunk/sys/dev/ath/if_ath_misc.h projects/clang-trunk/sys/dev/ath/if_ath_rx.c projects/clang-trunk/sys/dev/ath/if_ath_rx_edma.c projects/clang-trunk/sys/dev/ath/if_ath_sysctl.c projects/clang-trunk/sys/dev/ath/if_ath_tdma.c projects/clang-trunk/sys/dev/ath/if_ath_tx.c projects/clang-trunk/sys/dev/ath/if_ath_tx_edma.c projects/clang-trunk/sys/dev/ath/if_athvar.h projects/clang-trunk/sys/dev/bwi/bwimac.c projects/clang-trunk/sys/dev/bwi/bwiphy.c projects/clang-trunk/sys/dev/bwi/bwirf.c projects/clang-trunk/sys/dev/bwi/if_bwi.c projects/clang-trunk/sys/dev/bwi/if_bwivar.h projects/clang-trunk/sys/dev/bwn/if_bwn.c projects/clang-trunk/sys/dev/bwn/if_bwnvar.h projects/clang-trunk/sys/dev/ciss/ciss.c projects/clang-trunk/sys/dev/cxgbe/adapter.h projects/clang-trunk/sys/dev/cxgbe/t4_main.c projects/clang-trunk/sys/dev/cyapa/cyapa.c projects/clang-trunk/sys/dev/drm2/drmP.h projects/clang-trunk/sys/dev/drm2/i915/i915_dma.c projects/clang-trunk/sys/dev/drm2/i915/i915_drv.c projects/clang-trunk/sys/dev/drm2/i915/i915_drv.h projects/clang-trunk/sys/dev/drm2/i915/i915_gem.c projects/clang-trunk/sys/dev/drm2/i915/i915_gem_execbuffer.c projects/clang-trunk/sys/dev/drm2/i915/i915_gem_gtt.c projects/clang-trunk/sys/dev/drm2/i915/i915_gem_tiling.c projects/clang-trunk/sys/dev/drm2/i915/i915_reg.h projects/clang-trunk/sys/dev/drm2/i915/intel_ddi.c projects/clang-trunk/sys/dev/drm2/i915/intel_display.c projects/clang-trunk/sys/dev/drm2/i915/intel_pm.c projects/clang-trunk/sys/dev/e1000/e1000_80003es2lan.c projects/clang-trunk/sys/dev/e1000/e1000_82540.c projects/clang-trunk/sys/dev/e1000/e1000_82541.c projects/clang-trunk/sys/dev/e1000/e1000_82541.h projects/clang-trunk/sys/dev/e1000/e1000_82542.c projects/clang-trunk/sys/dev/e1000/e1000_82543.c projects/clang-trunk/sys/dev/e1000/e1000_82543.h projects/clang-trunk/sys/dev/e1000/e1000_82571.h projects/clang-trunk/sys/dev/e1000/e1000_82575.c projects/clang-trunk/sys/dev/e1000/e1000_82575.h projects/clang-trunk/sys/dev/e1000/e1000_api.c projects/clang-trunk/sys/dev/e1000/e1000_api.h projects/clang-trunk/sys/dev/e1000/e1000_defines.h projects/clang-trunk/sys/dev/e1000/e1000_hw.h projects/clang-trunk/sys/dev/e1000/e1000_i210.c projects/clang-trunk/sys/dev/e1000/e1000_i210.h projects/clang-trunk/sys/dev/e1000/e1000_ich8lan.c projects/clang-trunk/sys/dev/e1000/e1000_ich8lan.h projects/clang-trunk/sys/dev/e1000/e1000_mac.c projects/clang-trunk/sys/dev/e1000/e1000_mac.h projects/clang-trunk/sys/dev/e1000/e1000_manage.c projects/clang-trunk/sys/dev/e1000/e1000_nvm.c projects/clang-trunk/sys/dev/e1000/e1000_nvm.h projects/clang-trunk/sys/dev/e1000/e1000_osdep.h projects/clang-trunk/sys/dev/e1000/e1000_phy.c projects/clang-trunk/sys/dev/e1000/e1000_regs.h projects/clang-trunk/sys/dev/e1000/if_em.c projects/clang-trunk/sys/dev/e1000/if_em.h projects/clang-trunk/sys/dev/e1000/if_igb.c projects/clang-trunk/sys/dev/e1000/if_igb.h projects/clang-trunk/sys/dev/fdt/fdt_slicer.c projects/clang-trunk/sys/dev/filemon/filemon.c projects/clang-trunk/sys/dev/filemon/filemon_lock.c projects/clang-trunk/sys/dev/filemon/filemon_wrapper.c projects/clang-trunk/sys/dev/gpio/gpiobus.c projects/clang-trunk/sys/dev/hwpmc/hwpmc_mod.c projects/clang-trunk/sys/dev/ichiic/ig4_iic.c projects/clang-trunk/sys/dev/ichwd/ichwd.c projects/clang-trunk/sys/dev/ichwd/ichwd.h projects/clang-trunk/sys/dev/if_ndis/if_ndis.c projects/clang-trunk/sys/dev/if_ndis/if_ndisvar.h projects/clang-trunk/sys/dev/ipmi/ipmi_smbios.c projects/clang-trunk/sys/dev/ipmi/ipmivars.h projects/clang-trunk/sys/dev/ipw/if_ipw.c projects/clang-trunk/sys/dev/ipw/if_ipwvar.h projects/clang-trunk/sys/dev/isl/isl.c projects/clang-trunk/sys/dev/iwi/if_iwi.c projects/clang-trunk/sys/dev/iwi/if_iwivar.h projects/clang-trunk/sys/dev/iwm/if_iwm.c projects/clang-trunk/sys/dev/iwm/if_iwm_mac_ctxt.c projects/clang-trunk/sys/dev/iwm/if_iwm_phy_ctxt.c projects/clang-trunk/sys/dev/iwm/if_iwm_power.c projects/clang-trunk/sys/dev/iwm/if_iwm_scan.c projects/clang-trunk/sys/dev/iwm/if_iwmvar.h projects/clang-trunk/sys/dev/iwn/if_iwn.c projects/clang-trunk/sys/dev/iwn/if_iwn_ioctl.h projects/clang-trunk/sys/dev/iwn/if_iwnvar.h projects/clang-trunk/sys/dev/malo/if_malo.c projects/clang-trunk/sys/dev/malo/if_malo.h projects/clang-trunk/sys/dev/mii/brgphy.c projects/clang-trunk/sys/dev/mii/miidevs projects/clang-trunk/sys/dev/mmc/host/dwmmc.c projects/clang-trunk/sys/dev/mmc/mmc.c projects/clang-trunk/sys/dev/msk/if_mskreg.h projects/clang-trunk/sys/dev/mwl/if_mwl.c projects/clang-trunk/sys/dev/mwl/if_mwl_pci.c projects/clang-trunk/sys/dev/mwl/if_mwlvar.h projects/clang-trunk/sys/dev/pccbb/pccbb.c projects/clang-trunk/sys/dev/ral/if_ral_pci.c projects/clang-trunk/sys/dev/ral/rt2560.c projects/clang-trunk/sys/dev/ral/rt2560var.h projects/clang-trunk/sys/dev/ral/rt2661.c projects/clang-trunk/sys/dev/ral/rt2661var.h projects/clang-trunk/sys/dev/ral/rt2860.c projects/clang-trunk/sys/dev/ral/rt2860var.h projects/clang-trunk/sys/dev/random/build.sh projects/clang-trunk/sys/dev/random/fortuna.c projects/clang-trunk/sys/dev/random/random_harvestq.c projects/clang-trunk/sys/dev/random/unit_test.c projects/clang-trunk/sys/dev/random/yarrow.c projects/clang-trunk/sys/dev/sound/midi/midi.c projects/clang-trunk/sys/dev/usb/controller/uhci_pci.c projects/clang-trunk/sys/dev/usb/quirk/usb_quirk.c projects/clang-trunk/sys/dev/usb/serial/u3g.c projects/clang-trunk/sys/dev/usb/usbdevs projects/clang-trunk/sys/dev/usb/wlan/if_rsu.c projects/clang-trunk/sys/dev/usb/wlan/if_rsureg.h projects/clang-trunk/sys/dev/usb/wlan/if_rum.c projects/clang-trunk/sys/dev/usb/wlan/if_rumvar.h projects/clang-trunk/sys/dev/usb/wlan/if_run.c projects/clang-trunk/sys/dev/usb/wlan/if_runvar.h projects/clang-trunk/sys/dev/usb/wlan/if_uath.c projects/clang-trunk/sys/dev/usb/wlan/if_uathvar.h projects/clang-trunk/sys/dev/usb/wlan/if_upgt.c projects/clang-trunk/sys/dev/usb/wlan/if_upgtvar.h projects/clang-trunk/sys/dev/usb/wlan/if_ural.c projects/clang-trunk/sys/dev/usb/wlan/if_uralvar.h projects/clang-trunk/sys/dev/usb/wlan/if_urtw.c projects/clang-trunk/sys/dev/usb/wlan/if_urtwn.c projects/clang-trunk/sys/dev/usb/wlan/if_urtwnreg.h projects/clang-trunk/sys/dev/usb/wlan/if_urtwvar.h projects/clang-trunk/sys/dev/usb/wlan/if_zyd.c projects/clang-trunk/sys/dev/usb/wlan/if_zydreg.h projects/clang-trunk/sys/dev/virtio/network/if_vtnet.c projects/clang-trunk/sys/dev/vt/hw/fb/vt_fb.c projects/clang-trunk/sys/dev/vt/vt.h projects/clang-trunk/sys/dev/vt/vt_core.c projects/clang-trunk/sys/dev/vt/vt_cpulogos.c projects/clang-trunk/sys/dev/wi/if_wi.c projects/clang-trunk/sys/dev/wi/if_wi_macio.c projects/clang-trunk/sys/dev/wi/if_wi_pccard.c projects/clang-trunk/sys/dev/wi/if_wi_pci.c projects/clang-trunk/sys/dev/wi/if_wivar.h projects/clang-trunk/sys/dev/wpi/if_wpi.c projects/clang-trunk/sys/dev/wpi/if_wpivar.h projects/clang-trunk/sys/dev/wtap/if_wtap.c projects/clang-trunk/sys/dev/wtap/if_wtapvar.h projects/clang-trunk/sys/dev/xen/blkback/blkback.c projects/clang-trunk/sys/dev/xen/blkfront/blkfront.c projects/clang-trunk/sys/dev/xen/netfront/netfront.c projects/clang-trunk/sys/dev/xen/xenstore/xenstore.c projects/clang-trunk/sys/fs/devfs/devfs_vfsops.c projects/clang-trunk/sys/fs/devfs/devfs_vnops.c projects/clang-trunk/sys/fs/nfs/nfs_commonacl.c projects/clang-trunk/sys/geom/geom_flashmap.c projects/clang-trunk/sys/geom/geom_io.c projects/clang-trunk/sys/gnu/fs/reiserfs/reiserfs_vfsops.c projects/clang-trunk/sys/i386/i386/machdep.c projects/clang-trunk/sys/kern/imgact_elf.c projects/clang-trunk/sys/kern/init_main.c projects/clang-trunk/sys/kern/kern_descrip.c projects/clang-trunk/sys/kern/kern_event.c projects/clang-trunk/sys/kern/kern_procctl.c projects/clang-trunk/sys/kern/kern_timeout.c projects/clang-trunk/sys/kern/ksched.c projects/clang-trunk/sys/kern/link_elf.c projects/clang-trunk/sys/kern/sched_ule.c projects/clang-trunk/sys/kern/subr_acl_nfs4.c projects/clang-trunk/sys/kern/subr_module.c projects/clang-trunk/sys/kern/subr_syscall.c projects/clang-trunk/sys/kern/sys_process.c projects/clang-trunk/sys/kern/vfs_mount.c projects/clang-trunk/sys/kern/vfs_mountroot.c projects/clang-trunk/sys/kern/vfs_subr.c projects/clang-trunk/sys/kern/vfs_syscalls.c projects/clang-trunk/sys/kern/vfs_vnops.c projects/clang-trunk/sys/mips/beri/beri_machdep.c projects/clang-trunk/sys/mips/mips/fp.S projects/clang-trunk/sys/mips/rmi/dev/nlge/if_nlge.c projects/clang-trunk/sys/mips/rmi/files.xlr projects/clang-trunk/sys/mips/rmi/iodi.c projects/clang-trunk/sys/modules/Makefile projects/clang-trunk/sys/modules/am335x_dmtpps/Makefile projects/clang-trunk/sys/modules/zfs/Makefile projects/clang-trunk/sys/net/altq/altq.h projects/clang-trunk/sys/net/altq/altq_cbq.c projects/clang-trunk/sys/net/altq/altq_cbq.h projects/clang-trunk/sys/net/altq/altq_classq.h projects/clang-trunk/sys/net/altq/altq_fairq.c projects/clang-trunk/sys/net/altq/altq_fairq.h projects/clang-trunk/sys/net/altq/altq_hfsc.c projects/clang-trunk/sys/net/altq/altq_hfsc.h projects/clang-trunk/sys/net/altq/altq_priq.c projects/clang-trunk/sys/net/altq/altq_priq.h projects/clang-trunk/sys/net/altq/altq_rmclass.c projects/clang-trunk/sys/net/altq/altq_rmclass.h projects/clang-trunk/sys/net/altq/altq_subr.c projects/clang-trunk/sys/net/altq/altq_var.h projects/clang-trunk/sys/net/if.c projects/clang-trunk/sys/net/if_dl.h projects/clang-trunk/sys/net/if_epair.c projects/clang-trunk/sys/net/if_llatbl.c projects/clang-trunk/sys/net/if_llatbl.h projects/clang-trunk/sys/net/if_var.h projects/clang-trunk/sys/net/pfvar.h projects/clang-trunk/sys/net/route.c projects/clang-trunk/sys/net/route.h projects/clang-trunk/sys/net/rss_config.c projects/clang-trunk/sys/net/rss_config.h projects/clang-trunk/sys/net80211/ieee80211.c projects/clang-trunk/sys/net80211/ieee80211_ddb.c projects/clang-trunk/sys/net80211/ieee80211_freebsd.c projects/clang-trunk/sys/net80211/ieee80211_ioctl.c projects/clang-trunk/sys/net80211/ieee80211_output.c projects/clang-trunk/sys/net80211/ieee80211_power.c projects/clang-trunk/sys/net80211/ieee80211_proto.c projects/clang-trunk/sys/net80211/ieee80211_proto.h projects/clang-trunk/sys/net80211/ieee80211_regdomain.c projects/clang-trunk/sys/net80211/ieee80211_scan_sta.c projects/clang-trunk/sys/net80211/ieee80211_var.h projects/clang-trunk/sys/netinet/if_ether.c projects/clang-trunk/sys/netinet/in.c projects/clang-trunk/sys/netinet/in_pcb.h projects/clang-trunk/sys/netinet/in_rss.c projects/clang-trunk/sys/netinet/in_rss.h projects/clang-trunk/sys/netinet/ip_input.c projects/clang-trunk/sys/netinet/sctp_constants.h projects/clang-trunk/sys/netinet/sctp_input.c projects/clang-trunk/sys/netinet/sctp_output.c projects/clang-trunk/sys/netinet/sctp_sysctl.c projects/clang-trunk/sys/netinet/sctp_sysctl.h projects/clang-trunk/sys/netinet/sctp_usrreq.c projects/clang-trunk/sys/netinet/sctputil.c projects/clang-trunk/sys/netinet/sctputil.h projects/clang-trunk/sys/netinet/tcp_subr.c projects/clang-trunk/sys/netinet/tcp_syncache.c projects/clang-trunk/sys/netinet/tcp_syncache.h projects/clang-trunk/sys/netinet/tcp_timer.c projects/clang-trunk/sys/netinet/tcp_var.h projects/clang-trunk/sys/netinet/toecore.c projects/clang-trunk/sys/netinet/udp_usrreq.c projects/clang-trunk/sys/netinet/udp_var.h projects/clang-trunk/sys/netinet6/in6.c projects/clang-trunk/sys/netinet6/in6_ifattach.c projects/clang-trunk/sys/netinet6/in6_rss.c projects/clang-trunk/sys/netinet6/in6_rss.h projects/clang-trunk/sys/netinet6/in6_var.h projects/clang-trunk/sys/netinet6/ip6_input.c projects/clang-trunk/sys/netinet6/ip6_var.h projects/clang-trunk/sys/netinet6/nd6.c projects/clang-trunk/sys/netinet6/nd6.h projects/clang-trunk/sys/netinet6/nd6_nbr.c projects/clang-trunk/sys/netinet6/udp6_usrreq.c projects/clang-trunk/sys/netpfil/ipfw/ip_fw_private.h projects/clang-trunk/sys/netpfil/pf/pf.c projects/clang-trunk/sys/netpfil/pf/pf_altq.h projects/clang-trunk/sys/netpfil/pf/pf_if.c projects/clang-trunk/sys/netpfil/pf/pf_ioctl.c projects/clang-trunk/sys/netpfil/pf/pf_norm.c projects/clang-trunk/sys/ofed/include/linux/linux_compat.c projects/clang-trunk/sys/ofed/include/linux/mm.h projects/clang-trunk/sys/powerpc/booke/locore.S projects/clang-trunk/sys/powerpc/booke/pmap.c projects/clang-trunk/sys/powerpc/booke/trap_subr.S projects/clang-trunk/sys/powerpc/include/_types.h projects/clang-trunk/sys/powerpc/include/pmap.h projects/clang-trunk/sys/powerpc/include/pte.h projects/clang-trunk/sys/powerpc/include/tlb.h projects/clang-trunk/sys/powerpc/mpc85xx/fsl_sdhc.c projects/clang-trunk/sys/powerpc/mpc85xx/mpc85xx.h projects/clang-trunk/sys/powerpc/mpc85xx/pci_mpc85xx.c projects/clang-trunk/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c projects/clang-trunk/sys/powerpc/mpc85xx/platform_mpc85xx.c projects/clang-trunk/sys/powerpc/ofw/ofw_machdep.c projects/clang-trunk/sys/powerpc/powerpc/pmap_dispatch.c projects/clang-trunk/sys/powerpc/powerpc/trap.c projects/clang-trunk/sys/powerpc/powerpc/uma_machdep.c projects/clang-trunk/sys/rpc/rpc_generic.c projects/clang-trunk/sys/rpc/svc_vc.c projects/clang-trunk/sys/sys/acl.h projects/clang-trunk/sys/sys/capsicum.h projects/clang-trunk/sys/sys/cdefs.h projects/clang-trunk/sys/sys/param.h projects/clang-trunk/sys/sys/pcpu.h projects/clang-trunk/sys/sys/posix4.h projects/clang-trunk/sys/sys/proc.h projects/clang-trunk/sys/sys/ptrace.h projects/clang-trunk/sys/sys/random.h projects/clang-trunk/sys/sys/slicer.h projects/clang-trunk/sys/sys/user.h projects/clang-trunk/sys/sys/vnode.h projects/clang-trunk/sys/teken/teken_subr.h projects/clang-trunk/sys/ufs/ffs/ffs_softdep.c projects/clang-trunk/sys/vm/swap_pager.c projects/clang-trunk/sys/vm/uma_core.c projects/clang-trunk/sys/vm/vm_page.c projects/clang-trunk/sys/vm/vm_pageout.c projects/clang-trunk/sys/x86/acpica/madt.c projects/clang-trunk/sys/x86/include/ofw_machdep.h projects/clang-trunk/sys/x86/x86/fdt_machdep.c projects/clang-trunk/sys/x86/x86/nexus.c projects/clang-trunk/sys/x86/xen/hvm.c projects/clang-trunk/sys/xen/xen-os.h projects/clang-trunk/tests/sys/vm/mmap_test.c projects/clang-trunk/tools/regression/acltools/tools-crossfs.test projects/clang-trunk/tools/regression/acltools/tools-nfs4-psarc.test projects/clang-trunk/tools/regression/acltools/tools-nfs4-trivial.test projects/clang-trunk/tools/regression/acltools/tools-nfs4.test projects/clang-trunk/tools/regression/lib/libc/gen/test-wordexp.c projects/clang-trunk/tools/regression/lib/msun/test-cexp.c projects/clang-trunk/tools/regression/lib/msun/test-csqrt.c projects/clang-trunk/tools/regression/lib/msun/test-invtrig.c projects/clang-trunk/tools/regression/lib/msun/test-trig.c projects/clang-trunk/tools/regression/p1003_1b/main.c projects/clang-trunk/tools/tools/ath/athaggrstats/athaggrstats.c projects/clang-trunk/tools/tools/ath/athaggrstats/main.c projects/clang-trunk/tools/tools/ath/athdebug/athdebug.c projects/clang-trunk/tools/tools/ath/athrd/athrd.c projects/clang-trunk/tools/tools/ath/athstats/athstats.c projects/clang-trunk/tools/tools/ath/athstats/main.c projects/clang-trunk/tools/tools/ath/common/ah_osdep.h projects/clang-trunk/tools/tools/ath/common/dumpregs_5210.c projects/clang-trunk/tools/tools/ath/common/dumpregs_5211.c projects/clang-trunk/tools/tools/ath/common/dumpregs_5212.c projects/clang-trunk/tools/tools/ath/common/dumpregs_5416.c projects/clang-trunk/tools/tools/crypto/cryptostats.c projects/clang-trunk/tools/tools/crypto/cryptotest.c projects/clang-trunk/tools/tools/crypto/hifnstats.c projects/clang-trunk/tools/tools/crypto/ipsecstats.c projects/clang-trunk/tools/tools/crypto/safestats.c projects/clang-trunk/tools/tools/crypto/ubsecstats.c projects/clang-trunk/tools/tools/cxgbetool/cxgbetool.c projects/clang-trunk/tools/tools/iwn/iwnstats/iwn_ioctl.c projects/clang-trunk/tools/tools/iwn/iwnstats/iwn_ioctl.h projects/clang-trunk/tools/tools/iwn/iwnstats/iwnstats.h projects/clang-trunk/tools/tools/iwn/iwnstats/main.c projects/clang-trunk/tools/tools/mwl/mwldebug/mwldebug.c projects/clang-trunk/tools/tools/mwl/mwlstats/mwlstats.c projects/clang-trunk/tools/tools/nanobsd/defaults.sh projects/clang-trunk/tools/tools/nanobsd/pcengines/common.conf projects/clang-trunk/tools/tools/nanobsd/rescue/common projects/clang-trunk/tools/tools/net80211/wlanstats/main.c projects/clang-trunk/tools/tools/net80211/wlanstats/wlanstats.c projects/clang-trunk/tools/tools/net80211/wlantxtime/wlantxtime.c projects/clang-trunk/tools/tools/npe/npestats/main.c projects/clang-trunk/tools/tools/npe/npestats/npestats.c projects/clang-trunk/tools/tools/sysbuild/sysbuild.sh projects/clang-trunk/usr.bin/ar/ar.c projects/clang-trunk/usr.bin/at/Makefile.inc projects/clang-trunk/usr.bin/bluetooth/btsockstat/btsockstat.c projects/clang-trunk/usr.bin/calendar/calendars/calendar.christian projects/clang-trunk/usr.bin/calendar/calendars/calendar.freebsd projects/clang-trunk/usr.bin/iconv/iconv.c projects/clang-trunk/usr.bin/iscsictl/Makefile projects/clang-trunk/usr.bin/netstat/Makefile projects/clang-trunk/usr.bin/netstat/if.c projects/clang-trunk/usr.bin/netstat/inet.c projects/clang-trunk/usr.bin/netstat/inet6.c projects/clang-trunk/usr.bin/netstat/main.c projects/clang-trunk/usr.bin/netstat/mroute.c projects/clang-trunk/usr.bin/netstat/mroute6.c projects/clang-trunk/usr.bin/netstat/netgraph.c projects/clang-trunk/usr.bin/netstat/netisr.c projects/clang-trunk/usr.bin/netstat/netstat.1 projects/clang-trunk/usr.bin/netstat/netstat.h projects/clang-trunk/usr.bin/netstat/route.c projects/clang-trunk/usr.bin/netstat/sctp.c projects/clang-trunk/usr.bin/procstat/Makefile projects/clang-trunk/usr.bin/procstat/procstat.1 projects/clang-trunk/usr.bin/procstat/procstat.c projects/clang-trunk/usr.bin/procstat/procstat.h projects/clang-trunk/usr.bin/procstat/procstat_args.c projects/clang-trunk/usr.bin/procstat/procstat_auxv.c projects/clang-trunk/usr.bin/procstat/procstat_basic.c projects/clang-trunk/usr.bin/procstat/procstat_bin.c projects/clang-trunk/usr.bin/procstat/procstat_cred.c projects/clang-trunk/usr.bin/procstat/procstat_cs.c projects/clang-trunk/usr.bin/procstat/procstat_files.c projects/clang-trunk/usr.bin/procstat/procstat_kstack.c projects/clang-trunk/usr.bin/procstat/procstat_rlimit.c projects/clang-trunk/usr.bin/procstat/procstat_rusage.c projects/clang-trunk/usr.bin/procstat/procstat_sigs.c projects/clang-trunk/usr.bin/procstat/procstat_threads.c projects/clang-trunk/usr.bin/procstat/procstat_vm.c projects/clang-trunk/usr.bin/script/script.1 projects/clang-trunk/usr.bin/sockstat/sockstat.1 projects/clang-trunk/usr.bin/sockstat/sockstat.c projects/clang-trunk/usr.bin/tftp/main.c projects/clang-trunk/usr.bin/truss/amd64-fbsd.c projects/clang-trunk/usr.bin/truss/amd64-fbsd32.c projects/clang-trunk/usr.bin/truss/amd64-linux32.c projects/clang-trunk/usr.bin/truss/arm-fbsd.c projects/clang-trunk/usr.bin/truss/i386-fbsd.c projects/clang-trunk/usr.bin/truss/i386-linux.c projects/clang-trunk/usr.bin/truss/main.c projects/clang-trunk/usr.bin/truss/mips-fbsd.c projects/clang-trunk/usr.bin/truss/powerpc-fbsd.c projects/clang-trunk/usr.bin/truss/powerpc64-fbsd.c projects/clang-trunk/usr.bin/truss/sparc64-fbsd.c projects/clang-trunk/usr.bin/truss/syscall.h projects/clang-trunk/usr.bin/truss/syscalls.c projects/clang-trunk/usr.bin/vi/catalog/Makefile projects/clang-trunk/usr.bin/vtfontcvt/vtfontcvt.c projects/clang-trunk/usr.bin/w/Makefile projects/clang-trunk/usr.bin/wc/Makefile projects/clang-trunk/usr.bin/whois/whois.c projects/clang-trunk/usr.bin/xargs/tests/regress.n2P0.out projects/clang-trunk/usr.bin/xargs/tests/regress.sh projects/clang-trunk/usr.bin/xo/Makefile projects/clang-trunk/usr.bin/ypcat/ypcat.1 projects/clang-trunk/usr.bin/ypmatch/ypmatch.1 projects/clang-trunk/usr.bin/ypwhich/Makefile projects/clang-trunk/usr.bin/ypwhich/ypwhich.1 projects/clang-trunk/usr.bin/ypwhich/ypwhich.c projects/clang-trunk/usr.sbin/Makefile projects/clang-trunk/usr.sbin/acpi/acpidb/acpidb.c projects/clang-trunk/usr.sbin/boot0cfg/boot0cfg.8 projects/clang-trunk/usr.sbin/config/main.c projects/clang-trunk/usr.sbin/ctladm/ctladm.c projects/clang-trunk/usr.sbin/ctld/ctl.conf.5 projects/clang-trunk/usr.sbin/ctld/ctld.8 projects/clang-trunk/usr.sbin/ctld/kernel.c projects/clang-trunk/usr.sbin/fstyp/Makefile projects/clang-trunk/usr.sbin/hyperv/Makefile.inc projects/clang-trunk/usr.sbin/iscsid/iscsid.8 projects/clang-trunk/usr.sbin/makefs/mtree.c projects/clang-trunk/usr.sbin/ndp/ndp.c projects/clang-trunk/usr.sbin/ntp/config.h projects/clang-trunk/usr.sbin/pkg/dns_utils.c projects/clang-trunk/usr.sbin/pkg/pkg.c projects/clang-trunk/usr.sbin/pmcstat/pmcstat.c projects/clang-trunk/usr.sbin/pw/pw_user.c projects/clang-trunk/usr.sbin/pw/strtounum.c projects/clang-trunk/usr.sbin/pw/tests/pw_useradd.sh projects/clang-trunk/usr.sbin/syslogd/syslogd.c projects/clang-trunk/usr.sbin/sysrc/sysrc projects/clang-trunk/usr.sbin/sysrc/sysrc.8 projects/clang-trunk/usr.sbin/trpt/trpt.c projects/clang-trunk/usr.sbin/watchdogd/watchdogd.8 projects/clang-trunk/usr.sbin/watchdogd/watchdogd.c projects/clang-trunk/usr.sbin/yppoll/yppoll.8 projects/clang-trunk/usr.sbin/yppoll/yppoll.c projects/clang-trunk/usr.sbin/ypserv/Makefile projects/clang-trunk/usr.sbin/ypserv/Makefile.yp projects/clang-trunk/usr.sbin/ypserv/ypinit.8 projects/clang-trunk/usr.sbin/ypserv/ypinit.sh projects/clang-trunk/usr.sbin/ypset/ypset.8 Directory Properties: projects/clang-trunk/ (props changed) projects/clang-trunk/cddl/ (props changed) projects/clang-trunk/cddl/contrib/opensolaris/ (props changed) projects/clang-trunk/contrib/compiler-rt/ (props changed) projects/clang-trunk/contrib/expat/ (props changed) projects/clang-trunk/contrib/file/ (props changed) projects/clang-trunk/contrib/ncurses/ (props changed) projects/clang-trunk/contrib/subversion/ (props changed) projects/clang-trunk/contrib/tzdata/ (props changed) projects/clang-trunk/crypto/openssh/ (props changed) projects/clang-trunk/etc/ (props changed) projects/clang-trunk/gnu/usr.bin/binutils/ (props changed) projects/clang-trunk/include/ (props changed) projects/clang-trunk/lib/libc/ (props changed) projects/clang-trunk/lib/libutil/ (props changed) projects/clang-trunk/sbin/ (props changed) projects/clang-trunk/sbin/ipfw/ (props changed) projects/clang-trunk/share/ (props changed) projects/clang-trunk/share/man/man4/ (props changed) projects/clang-trunk/share/zoneinfo/ (props changed) projects/clang-trunk/sys/ (props changed) projects/clang-trunk/sys/boot/ (props changed) projects/clang-trunk/sys/cddl/contrib/opensolaris/ (props changed) projects/clang-trunk/sys/conf/ (props changed) projects/clang-trunk/sys/contrib/dev/acpica/ (props changed) projects/clang-trunk/usr.bin/calendar/ (props changed) projects/clang-trunk/usr.bin/procstat/ (props changed) Modified: projects/clang-trunk/Makefile.inc1 ============================================================================== --- projects/clang-trunk/Makefile.inc1 Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/Makefile.inc1 Sat Sep 5 18:36:23 2015 (r287490) @@ -449,7 +449,6 @@ LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${LIB32 PATH=${TMPPATH} \ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 \ - LIBPRIVATEDIR=/usr/lib32/private \ DTRACE="${DTRACE} -32" LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAGS}" \ CXX="${XCXX} ${LIB32FLAGS}" \ @@ -1128,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) @@ -1147,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 @@ -1163,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 @@ -1778,9 +1793,7 @@ cddl/lib/libctf__L: lib/libz__L .endif # cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built # on select architectures though (see cddl/lib/Makefile) -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "arm" || ${MACHINE_ARCH} == "i386" || \ - ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" +.if ${MACHINE_CPUARCH} != "sparc64" _prebuild_libs+= lib/libproc lib/librtld_db .endif Modified: projects/clang-trunk/ObsoleteFiles.inc ============================================================================== --- projects/clang-trunk/ObsoleteFiles.inc Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/ObsoleteFiles.inc Sat Sep 5 18:36:23 2015 (r287490) @@ -99,6 +99,12 @@ OLD_FILES+=usr/lib/clang/3.6.1/lib/freeb OLD_DIRS+=usr/lib/clang/3.6.1/lib/freebsd OLD_DIRS+=usr/lib/clang/3.6.1/lib OLD_DIRS+=usr/lib/clang/3.6.1 +# 20150818: *allocm() are gone in jemalloc 4.0.0 +OLD_FILES+=usr/share/man/man3/allocm.3.gz +OLD_FILES+=usr/share/man/man3/dallocm.3.gz +OLD_FILES+=usr/share/man/man3/nallocm.3.gz +OLD_FILES+=usr/share/man/man3/rallocm.3.gz +OLD_FILES+=usr/share/man/man3/sallocm.3.gz # 20150802: Remove netbsd's test on pw(8) OLD_FILES+=usr/tests/usr.sbin/pw/pw_test # 20150719: Remove libarchive.pc @@ -110,6 +116,9 @@ OLD_FILES+=usr/share/man/man4/dtrace-pro OLD_FILES+=usr/share/man/man4/dtrace-sched.4.gz OLD_FILES+=usr/share/man/man4/dtrace-tcp.4.gz OLD_FILES+=usr/share/man/man4/dtrace-udp.4.gz +# 20150624 +OLD_LIBS+=usr/lib/libugidfw.so.4 +OLD_LIBS+=usr/lib32/libugidfw.so.4 # 20150604: Move nvlist man pages to section 9. OLD_FILES+=usr/share/man/man3/libnv.3.gz OLD_FILES+=usr/share/man/man3/nvlist.3.gz Modified: projects/clang-trunk/UPDATING ============================================================================== --- projects/clang-trunk/UPDATING Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/UPDATING Sat Sep 5 18:36:23 2015 (r287490) @@ -36,6 +36,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 20141231 entry below for information about prerequisites and upgrading, if you are not already using 3.5.0 or higher. +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/clang-trunk/bin/df/df.c ============================================================================== --- projects/clang-trunk/bin/df/df.c Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/bin/df/df.c Sat Sep 5 18:36:23 2015 (r287490) @@ -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/clang-trunk/bin/ls/Makefile ============================================================================== --- projects/clang-trunk/bin/ls/Makefile Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/bin/ls/Makefile Sat Sep 5 18:36:23 2015 (r287490) @@ -5,7 +5,7 @@ PROG= ls SRCS= cmp.c ls.c print.c util.c -LIBADD= util xo +LIBADD= xo util .if !defined(RELEASE_CRUNCH) && \ ${MK_LS_COLORS} != no Modified: projects/clang-trunk/bin/pkill/Makefile ============================================================================== --- projects/clang-trunk/bin/pkill/Makefile Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/bin/pkill/Makefile Sat Sep 5 18:36:23 2015 (r287490) @@ -5,7 +5,7 @@ PROG= pkill -LIBADD= kvm +LIBADD= kvm jail LINKS= ${BINDIR}/pkill ${BINDIR}/pgrep MLINKS= pkill.1 pgrep.1 Modified: projects/clang-trunk/bin/pkill/Makefile.depend ============================================================================== --- projects/clang-trunk/bin/pkill/Makefile.depend Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/bin/pkill/Makefile.depend Sat Sep 5 18:36:23 2015 (r287490) @@ -9,6 +9,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libjail \ lib/libkvm \ Modified: projects/clang-trunk/bin/pkill/pkill.1 ============================================================================== --- projects/clang-trunk/bin/pkill/pkill.1 Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/bin/pkill/pkill.1 Sat Sep 5 18:36:23 2015 (r287490) @@ -29,7 +29,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 9, 2013 +.Dd August 21, 2015 .Dt PKILL 1 .Os .Sh NAME @@ -47,7 +47,7 @@ .Op Fl c Ar class .Op Fl d Ar delim .Op Fl g Ar pgrp -.Op Fl j Ar jid +.Op Fl j Ar jail .Op Fl s Ar sid .Op Fl t Ar tty .Op Fl u Ar euid @@ -63,7 +63,7 @@ .Op Fl U Ar uid .Op Fl c Ar class .Op Fl g Ar pgrp -.Op Fl j Ar jid +.Op Fl j Ar jail .Op Fl s Ar sid .Op Fl t Ar tty .Op Fl u Ar euid @@ -149,16 +149,16 @@ or command. .It Fl i Ignore case distinctions in both the process table and the supplied pattern. -.It Fl j Ar jid -Restrict matches to processes inside jails with a jail ID in the comma-separated -list -.Ar jid . -The value +.It Fl j Ar jail +Restrict matches to processes inside the specified jails. +The argument +.Ar jail +may be .Dq Li any -matches processes in any jail. -The value +to match processes in any jail, .Dq Li none -matches processes not in jail. +to match processes not in jail, +or a comma-separated list of jail IDs or names. .It Fl l Long output. For Modified: projects/clang-trunk/bin/pkill/pkill.c ============================================================================== --- projects/clang-trunk/bin/pkill/pkill.c Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/bin/pkill/pkill.c Sat Sep 5 18:36:23 2015 (r287490) @@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #define STATUS_MATCH 0 #define STATUS_NOMATCH 1 @@ -78,7 +79,7 @@ enum listtype { LT_GROUP, LT_TTY, LT_PGRP, - LT_JID, + LT_JAIL, LT_SID, LT_CLASS }; @@ -245,7 +246,7 @@ main(int argc, char **argv) cflags |= REG_ICASE; break; case 'j': - makelist(&jidlist, LT_JID, optarg); + makelist(&jidlist, LT_JAIL, optarg); criteria = 1; break; case 'l': @@ -585,7 +586,7 @@ usage(void) fprintf(stderr, "usage: %s %s [-F pidfile] [-G gid] [-M core] [-N system]\n" - " [-P ppid] [-U uid] [-c class] [-g pgrp] [-j jid]\n" + " [-P ppid] [-U uid] [-c class] [-g pgrp] [-j jail]\n" " [-s sid] [-t tty] [-u euid] pattern ...\n", getprogname(), ustr); @@ -700,7 +701,7 @@ makelist(struct listhead *head, enum lis if (li->li_number == 0) li->li_number = getsid(mypid); break; - case LT_JID: + case LT_JAIL: if (li->li_number < 0) errx(STATUS_BADUSAGE, "Negative jail ID `%s'", sp); @@ -766,15 +767,20 @@ foundtty: if ((st.st_mode & S_IFCHR) == li->li_number = st.st_rdev; break; - case LT_JID: + case LT_JAIL: { + int jid; + if (strcmp(sp, "none") == 0) li->li_number = 0; else if (strcmp(sp, "any") == 0) li->li_number = -1; + else if ((jid = jail_getid(sp)) != -1) + li->li_number = jid; else if (*ep != '\0') errx(STATUS_BADUSAGE, - "Invalid jail ID `%s'", sp); + "Invalid jail ID or name `%s'", sp); break; + } case LT_CLASS: li->li_number = -1; li->li_name = strdup(sp); Modified: projects/clang-trunk/bin/pkill/tests/pgrep-j_test.sh ============================================================================== --- projects/clang-trunk/bin/pkill/tests/pgrep-j_test.sh Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/bin/pkill/tests/pgrep-j_test.sh Sat Sep 5 18:36:23 2015 (r287490) @@ -14,7 +14,7 @@ if [ `id -u` -ne 0 ]; then exit 0 fi -echo "1..3" +echo "1..4" sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep @@ -87,5 +87,30 @@ else fi [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid) [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid) +wait + +# test 4 is like test 1 except with jname instead of jid. +name="pgrep -j " +sleep_amount=8 +jail -c path=/ name=${base}_4_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_4_1.pid $sleep $sleep_amount & + +jail -c path=/ name=${base}_4_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_4_2.pid $sleep $sleep_amount & + +sleep 0.5 + +jname="${base}_4_1,${base}_4_2" +pid1="$(pgrep -f -x -j "$jname" "$sleep $sleep_amount" | sort)" +pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_4_1.pid)" \ + $(cat ${PWD}/${base}_4_2.pid) | sort) +if [ "$pid1" = "$pid2" ]; then + echo "ok 4 - $name" +else + echo "not ok 4 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'" +fi +[ -f ${PWD}/${base}_4_1.pid ] && kill $(cat ${PWD}/${base}_4_1.pid) +[ -f ${PWD}/${base}_4_2.pid ] && kill $(cat ${PWD}/${base}_4_2.pid) +wait rm -f $sleep Modified: projects/clang-trunk/bin/pkill/tests/pkill-j_test.sh ============================================================================== --- projects/clang-trunk/bin/pkill/tests/pkill-j_test.sh Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/bin/pkill/tests/pkill-j_test.sh Sat Sep 5 18:36:23 2015 (r287490) @@ -14,7 +14,7 @@ if [ `id -u` -ne 0 ]; then exit 0 fi -echo "1..3" +echo "1..4" sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep @@ -90,5 +90,31 @@ else fi 2>/dev/null [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid) [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid) +wait + +# test 4 is like test 1 except with jname instead of jid. +name="pkill -j " +sleep_amount=8 +jail -c path=/ name=${base}_4_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_4_1.pid $sleep $sleep_amount & + +jail -c path=/ name=${base}_4_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_4_2.pid $sleep $sleep_amount & + +$sleep $sleep_amount & + +sleep 0.5 + +jname="${base}_4_1,${base}_4_2" +if pkill -f -j "$jname" $sleep && sleep 0.5 && + ! -f ${PWD}/${base}_4_1.pid && + ! -f ${PWD}/${base}_4_2.pid ; then + echo "ok 4 - $name" +else + echo "not ok 4 - $name" +fi 2>/dev/null +[ -f ${PWD}/${base}_4_1.pid ] && kill $(cat ${PWD}/${base}_4_1.pid) +[ -f ${PWD}/${base}_4_2.pid ] && kill $(cat ${PWD}/${base}_4_2.pid) +wait rm -f $sleep Modified: projects/clang-trunk/bin/ps/Makefile ============================================================================== --- projects/clang-trunk/bin/ps/Makefile Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/bin/ps/Makefile Sat Sep 5 18:36:23 2015 (r287490) @@ -11,6 +11,6 @@ SRCS= fmt.c keyword.c nlist.c print.c ps # on large systems. # CFLAGS+=-DLAZY_PS -LIBADD= m kvm jail xo +LIBADD= m kvm jail xo util .include Modified: projects/clang-trunk/bin/rm/rm.c ============================================================================== --- projects/clang-trunk/bin/rm/rm.c Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/bin/rm/rm.c Sat Sep 5 18:36:23 2015 (r287490) @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -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/clang-trunk/bin/setfacl/setfacl.1 ============================================================================== --- projects/clang-trunk/bin/setfacl/setfacl.1 Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/bin/setfacl/setfacl.1 Sat Sep 5 18:36:23 2015 (r287490) @@ -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/clang-trunk/bin/sh/expand.c ============================================================================== --- projects/clang-trunk/bin/sh/expand.c Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/bin/sh/expand.c Sat Sep 5 18:36:23 2015 (r287490) @@ -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); } @@ -1464,21 +1464,11 @@ patmatch(const char *pattern, const char bt_q = q; break; case '[': { - const char *endp; + const char *savep, *saveq; int invert, found; wchar_t chr; - endp = p; - if (*endp == '!' || *endp == '^') - endp++; - do { - while (*endp == CTLQUOTEMARK) - endp++; - if (*endp == 0) - goto dft; /* no matching ] */ - if (*endp == CTLESC) - endp++; - } while (*++endp != ']'); + savep = p, saveq = q; invert = 0; if (*p == '!' || *p == '^') { invert++; @@ -1497,6 +1487,11 @@ patmatch(const char *pattern, const char chr = (unsigned char)*q++; c = *p++; do { + if (c == '\0') { + p = savep, q = saveq; + c = '['; + goto dft; + } if (c == CTLQUOTEMARK) continue; if (c == '[' && *p == ':') { Modified: projects/clang-trunk/bin/sh/miscbltin.c ============================================================================== --- projects/clang-trunk/bin/sh/miscbltin.c Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/bin/sh/miscbltin.c Sat Sep 5 18:36:23 2015 (r287490) @@ -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/clang-trunk/bin/sh/options.c ============================================================================== --- projects/clang-trunk/bin/sh/options.c Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/bin/sh/options.c Sat Sep 5 18:36:23 2015 (r287490) @@ -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/clang-trunk/bin/sh/options.h ============================================================================== --- projects/clang-trunk/bin/sh/options.h Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/bin/sh/options.h Sat Sep 5 18:36:23 2015 (r287490) @@ -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/clang-trunk/bin/sh/parser.c ============================================================================== --- projects/clang-trunk/bin/sh/parser.c Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/bin/sh/parser.c Sat Sep 5 18:36:23 2015 (r287490) @@ -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); } @@ -1195,7 +1201,8 @@ parsebackq(char *out, struct nodelist ** static char * readcstyleesc(char *out) { - int c, v, i, n; + int c, vc, i, n; + unsigned int v; c = pgetc(); switch (c) { @@ -1310,12 +1317,12 @@ readcstyleesc(char *out) default: synerror("Bad escape sequence"); } - v = (char)v; + vc = (char)v; /* * We can't handle NUL bytes. * POSIX says we should skip till the closing quote. */ - if (v == '\0') { + if (vc == '\0') { while ((c = pgetc()) != '\'') { if (c == '\\') c = pgetc(); @@ -1332,9 +1339,9 @@ readcstyleesc(char *out) pungetc(); return out; } - if (SQSYNTAX[v] == CCTL) + if (SQSYNTAX[vc] == CCTL) USTPUTC(CTLESC, out); - USTPUTC(v, out); + USTPUTC(vc, out); return out; } @@ -1382,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 */ @@ -1661,7 +1668,7 @@ varname: pungetc(); else if (c == '\n' || c == PEOF) synerror("Unexpected end of line in substitution"); - else + else if (BASESYNTAX[c] != CCTL) USTPUTC(c, out); } if (subtype == 0) { @@ -1677,7 +1684,8 @@ varname: synerror("Unexpected end of line in substitution"); if (flags == VSNUL) STPUTC(':', out); - STPUTC(c, out); + if (BASESYNTAX[c] != CCTL) + STPUTC(c, out); subtype = VSERROR; } else subtype = p - types + VSNORMAL; @@ -2044,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/clang-trunk/bin/sh/sh.1 ============================================================================== --- projects/clang-trunk/bin/sh/sh.1 Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/bin/sh/sh.1 Sat Sep 5 18:36:23 2015 (r287490) @@ -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/clang-trunk/bin/sh/tests/builtins/Makefile ============================================================================== --- projects/clang-trunk/bin/sh/tests/builtins/Makefile Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/bin/sh/tests/builtins/Makefile Sat Sep 5 18:36:23 2015 (r287490) @@ -39,6 +39,7 @@ FILES+= case16.0 FILES+= case17.0 FILES+= case18.0 FILES+= case19.0 +FILES+= case20.0 FILES+= cd1.0 FILES+= cd2.0 FILES+= cd3.0 @@ -122,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/clang-trunk/bin/sh/tests/builtins/case20.0 (from r287489, head/bin/sh/tests/builtins/case20.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang-trunk/bin/sh/tests/builtins/case20.0 Sat Sep 5 18:36:23 2015 (r287490, copy of r287489, head/bin/sh/tests/builtins/case20.0) @@ -0,0 +1,9 @@ +# $FreeBSD$ + +# Shells do not agree about what this pattern should match, but it is +# certain that it must not crash and the missing close bracket must not +# be simply ignored. + +case B in +[[:alpha:]) echo bad ;; +esac Copied: projects/clang-trunk/bin/sh/tests/builtins/read9.0 (from r287489, head/bin/sh/tests/builtins/read9.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang-trunk/bin/sh/tests/builtins/read9.0 Sat Sep 5 18:36:23 2015 (r287490, copy of r287489, head/bin/sh/tests/builtins/read9.0) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +empty='' +read a b c <&1 >/dev/null) +[ $? -ne 0 ] && [ -n "$v" ] Copied: projects/clang-trunk/bin/sh/tests/parser/dollar-quote13.0 (from r287489, head/bin/sh/tests/parser/dollar-quote13.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang-trunk/bin/sh/tests/parser/dollar-quote13.0 Sat Sep 5 18:36:23 2015 (r287490, copy of r287489, head/bin/sh/tests/parser/dollar-quote13.0) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +# This Unicode escape sequence that has never been in range should either +# fail to expand or expand to a fallback. + +c=$(eval printf %s \$\'\\Uffffff41\' 2>/dev/null) +r=$(($? != 0)) +[ "$r.$c" = '1.' ] || [ "$r.$c" = '0.?' ] || [ "$r.$c" = $'0.\u2222' ] Copied: projects/clang-trunk/bin/sh/tests/parser/heredoc13.0 (from r287489, head/bin/sh/tests/parser/heredoc13.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang-trunk/bin/sh/tests/parser/heredoc13.0 Sat Sep 5 18:36:23 2015 (r287490, copy of r287489, 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/clang-trunk/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h ============================================================================== --- projects/clang-trunk/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Sat Sep 5 18:36:23 2015 (r287490) @@ -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/clang-trunk/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c ============================================================================== --- projects/clang-trunk/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Sat Sep 5 18:36:23 2015 (r287490) @@ -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/clang-trunk/cddl/lib/Makefile ============================================================================== --- projects/clang-trunk/cddl/lib/Makefile Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/cddl/lib/Makefile Sat Sep 5 18:36:23 2015 (r287490) @@ -26,9 +26,7 @@ _libzpool= libzpool .endif .endif -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "arm" || ${MACHINE_ARCH} == "i386" || \ - ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" +.if ${MACHINE_CPUARCH} != "sparc64" _drti= drti _libdtrace= libdtrace .endif Modified: projects/clang-trunk/contrib/compiler-rt/lib/builtins/multc3.c ============================================================================== --- projects/clang-trunk/contrib/compiler-rt/lib/builtins/multc3.c Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/contrib/compiler-rt/lib/builtins/multc3.c Sat Sep 5 18:36:23 2015 (r287490) @@ -18,55 +18,50 @@ /* Returns: the product of a + ib and c + id */ COMPILER_RT_ABI long double _Complex -__multc3(long double __a, long double __b, long double __c, long double __d) +__multc3(long double a, long double b, long double c, long double d) { - long double __ac = __a * __c; - long double __bd = __b * __d; - long double __ad = __a * __d; - long double __bc = __b * __c; + long double ac = a * c; + long double bd = b * d; + long double ad = a * d; + long double bc = b * c; long double _Complex z; - __real__ z = __ac - __bd; - __imag__ z = __ad + __bc; - if (crt_isnan(__real__ z) && crt_isnan(__imag__ z)) - { - int __recalc = 0; - if (crt_isinf(__a) || crt_isinf(__b)) - { - __a = crt_copysignl(crt_isinf(__a) ? 1 : 0, __a); - __b = crt_copysignl(crt_isinf(__b) ? 1 : 0, __b); - if (crt_isnan(__c)) - __c = crt_copysignl(0, __c); - if (crt_isnan(__d)) - __d = crt_copysignl(0, __d); - __recalc = 1; + __real__ z = ac - bd; + __imag__ z = ad + bc; + if (crt_isnan(__real__ z) && crt_isnan(__imag__ z)) { + int recalc = 0; + if (crt_isinf(a) || crt_isinf(b)) { + a = crt_copysignl(crt_isinf(a) ? 1 : 0, a); + b = crt_copysignl(crt_isinf(b) ? 1 : 0, b); + if (crt_isnan(c)) + c = crt_copysignl(0, c); + if (crt_isnan(d)) + d = crt_copysignl(0, d); + recalc = 1; } - if (crt_isinf(__c) || crt_isinf(__d)) - { - __c = crt_copysignl(crt_isinf(__c) ? 1 : 0, __c); - __d = crt_copysignl(crt_isinf(__d) ? 1 : 0, __d); - if (crt_isnan(__a)) - __a = crt_copysignl(0, __a); - if (crt_isnan(__b)) - __b = crt_copysignl(0, __b); - __recalc = 1; + if (crt_isinf(c) || crt_isinf(d)) { + c = crt_copysignl(crt_isinf(c) ? 1 : 0, c); + d = crt_copysignl(crt_isinf(d) ? 1 : 0, d); + if (crt_isnan(a)) + a = crt_copysignl(0, a); + if (crt_isnan(b)) + b = crt_copysignl(0, b); + recalc = 1; } - if (!__recalc && (crt_isinf(__ac) || crt_isinf(__bd) || - crt_isinf(__ad) || crt_isinf(__bc))) - { - if (crt_isnan(__a)) - __a = crt_copysignl(0, __a); - if (crt_isnan(__b)) - __b = crt_copysignl(0, __b); - if (crt_isnan(__c)) - __c = crt_copysignl(0, __c); - if (crt_isnan(__d)) - __d = crt_copysignl(0, __d); - __recalc = 1; + if (!recalc && (crt_isinf(ac) || crt_isinf(bd) || + crt_isinf(ad) || crt_isinf(bc))) { + if (crt_isnan(a)) + a = crt_copysignl(0, a); + if (crt_isnan(b)) + b = crt_copysignl(0, b); + if (crt_isnan(c)) + c = crt_copysignl(0, c); + if (crt_isnan(d)) + d = crt_copysignl(0, d); + recalc = 1; } - if (__recalc) - { - __real__ z = CRT_INFINITY * (__a * __c - __b * __d); - __imag__ z = CRT_INFINITY * (__a * __d + __b * __c); + if (recalc) { + __real__ z = CRT_INFINITY * (a * c - b * d); + __imag__ z = CRT_INFINITY * (a * d + b * c); } } return z; Modified: projects/clang-trunk/contrib/expat/lib/xmlparse.c ============================================================================== --- projects/clang-trunk/contrib/expat/lib/xmlparse.c Sat Sep 5 18:24:51 2015 (r287489) +++ projects/clang-trunk/contrib/expat/lib/xmlparse.c Sat Sep 5 18:36:23 2015 (r287490) @@ -1678,6 +1678,12 @@ XML_ParseBuffer(XML_Parser parser, int l *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Sat Sep 5 22:54:13 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D96A09CA8CC for ; Sat, 5 Sep 2015 22:54:13 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C2BD1F9D; Sat, 5 Sep 2015 22:54:13 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t85MsDAA000338; Sat, 5 Sep 2015 22:54:13 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t85Ms4i8000300; Sat, 5 Sep 2015 22:54:04 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201509052254.t85Ms4i8000300@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sat, 5 Sep 2015 22:54:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: 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... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2015 22:54:13 -0000 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 <> 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 + + * release 5.24 + 2015-06-11 8:52 Christos Zoulas * 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 . # @@ -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@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@astron.com]) +AC_INIT([file],[5.24],[christos@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@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): (VMS Itanium) # Modified by (5): Matthias Urlichs (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 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 #include #include #include @@ -42,51 +43,56 @@ #include #include -#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, ¶m); 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 ***