svn commit: r256554 - in projects/camlock: . bin/freebsd-version cddl/contrib/opensolaris/lib/libdtrace/common cddl/contrib/opensolaris/lib/libdtrace/powerpc contrib/ipfilter etc etc/atf etc/defaul...

Alexander Motin mav at FreeBSD.org
Tue Oct 15 18:07:30 UTC 2013 

Author: mav
Date: Tue Oct 15 18:07:23 2013
New Revision: 256554
URL: http://svnweb.freebsd.org/changeset/base/256554

Log:
  MFC @ r256552

Added:
  projects/camlock/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu
     - copied unchanged from r256552, head/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu
  projects/camlock/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu
     - copied unchanged from r256552, head/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu
  projects/camlock/sys/dev/random/dummy_rng.c
     - copied unchanged from r256552, head/sys/dev/random/dummy_rng.c
  projects/camlock/sys/dev/random/live_entropy_sources.c
     - copied unchanged from r256552, head/sys/dev/random/live_entropy_sources.c
  projects/camlock/sys/dev/random/live_entropy_sources.h
     - copied unchanged from r256552, head/sys/dev/random/live_entropy_sources.h
  projects/camlock/sys/dev/random/rwfile.c
     - copied unchanged from r256552, head/sys/dev/random/rwfile.c
  projects/camlock/sys/dev/random/rwfile.h
     - copied unchanged from r256552, head/sys/dev/random/rwfile.h
  projects/camlock/usr.sbin/bsdconfig/share/keymap.subr
     - copied unchanged from r256552, head/usr.sbin/bsdconfig/share/keymap.subr
  projects/camlock/usr.sbin/bsdinstall/scripts/entropy
     - copied unchanged from r256552, head/usr.sbin/bsdinstall/scripts/entropy
  projects/camlock/usr.sbin/bsdinstall/scripts/zfsboot
     - copied unchanged from r256552, head/usr.sbin/bsdinstall/scripts/zfsboot
Deleted:
  projects/camlock/etc/atf/
  projects/camlock/lib/libyaml/libbsdyml.3
  projects/camlock/share/atf/
  projects/camlock/share/examples/atf/
  projects/camlock/share/xml/
  projects/camlock/share/xsl/
  projects/camlock/sys/contrib/rdma/core_priv.h
  projects/camlock/sys/contrib/rdma/ib_addr.h
  projects/camlock/sys/contrib/rdma/ib_cache.h
  projects/camlock/sys/contrib/rdma/ib_cm.h
  projects/camlock/sys/contrib/rdma/ib_fmr_pool.h
  projects/camlock/sys/contrib/rdma/ib_mad.h
  projects/camlock/sys/contrib/rdma/ib_marshall.h
  projects/camlock/sys/contrib/rdma/ib_pack.h
  projects/camlock/sys/contrib/rdma/ib_sa.h
  projects/camlock/sys/contrib/rdma/ib_smi.h
  projects/camlock/sys/contrib/rdma/ib_umem.h
  projects/camlock/sys/contrib/rdma/ib_user_cm.h
  projects/camlock/sys/contrib/rdma/ib_user_mad.h
  projects/camlock/sys/contrib/rdma/ib_user_sa.h
  projects/camlock/sys/contrib/rdma/ib_user_verbs.h
  projects/camlock/sys/contrib/rdma/ib_verbs.h
  projects/camlock/sys/contrib/rdma/iw_cm.h
  projects/camlock/sys/contrib/rdma/rdma_addr.c
  projects/camlock/sys/contrib/rdma/rdma_cache.c
  projects/camlock/sys/contrib/rdma/rdma_cm.h
  projects/camlock/sys/contrib/rdma/rdma_cm_ib.h
  projects/camlock/sys/contrib/rdma/rdma_cma.c
  projects/camlock/sys/contrib/rdma/rdma_device.c
  projects/camlock/sys/contrib/rdma/rdma_iwcm.c
  projects/camlock/sys/contrib/rdma/rdma_user_cm.h
  projects/camlock/sys/contrib/rdma/rdma_verbs.c
  projects/camlock/sys/contrib/rdma/types.h
  projects/camlock/sys/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu
  projects/camlock/sys/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu
  projects/camlock/sys/dev/random/pseudo_rng.c
  projects/camlock/sys/modules/rdma/addr/
  projects/camlock/sys/modules/rdma/cma/
  projects/camlock/sys/modules/rdma/core/
  projects/camlock/sys/modules/rdma/iwcm/
  projects/camlock/usr.bin/atf/atf-config/
  projects/camlock/usr.bin/atf/atf-report/
  projects/camlock/usr.bin/atf/atf-run/
  projects/camlock/usr.bin/atf/atf-version/
Modified:
  projects/camlock/Makefile.inc1
  projects/camlock/ObsoleteFiles.inc
  projects/camlock/UPDATING
  projects/camlock/bin/freebsd-version/freebsd-version.sh.in
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c
  projects/camlock/contrib/ipfilter/ipf.h
  projects/camlock/etc/Makefile
  projects/camlock/etc/defaults/periodic.conf
  projects/camlock/etc/defaults/rc.conf
  projects/camlock/etc/ftpusers
  projects/camlock/etc/group
  projects/camlock/etc/master.passwd
  projects/camlock/etc/mtree/BSD.root.dist
  projects/camlock/etc/mtree/BSD.usr.dist
  projects/camlock/etc/rc.d/initrandom
  projects/camlock/etc/rc.d/jail
  projects/camlock/gnu/usr.bin/cc/cc_tools/freebsd-native.h
  projects/camlock/gnu/usr.bin/groff/tmac/mdoc.local
  projects/camlock/lib/clang/clang.build.mk
  projects/camlock/lib/libc/gen/getutxent.c
  projects/camlock/lib/libcrypt/tests/crypt_tests.c
  projects/camlock/lib/libyaml/Makefile
  projects/camlock/release/Makefile
  projects/camlock/sbin/camcontrol/modeedit.c
  projects/camlock/sbin/iscontrol/iscsi.conf.5
  projects/camlock/sbin/nos-tun/nos-tun.c
  projects/camlock/share/Makefile
  projects/camlock/share/examples/Makefile
  projects/camlock/share/examples/kld/random_adaptor/random_adaptor_example.c
  projects/camlock/share/man/man4/random.4
  projects/camlock/share/man/man5/Makefile
  projects/camlock/share/man/man5/rc.conf.5
  projects/camlock/share/man/man7/Makefile
  projects/camlock/share/misc/bsd-family-tree
  projects/camlock/share/misc/committers-src.dot
  projects/camlock/share/mk/atf.test.mk
  projects/camlock/share/mk/bsd.libnames.mk
  projects/camlock/share/syscons/keymaps/INDEX.keymaps
  projects/camlock/sys/amd64/conf/GENERIC
  projects/camlock/sys/arm/mv/mv_localbus.c
  projects/camlock/sys/arm/versatile/versatile_pci.c
  projects/camlock/sys/boot/forth/loader.conf
  projects/camlock/sys/boot/i386/btx/btx/btx.S
  projects/camlock/sys/cam/ata/ata_all.c
  projects/camlock/sys/cam/ata/ata_all.h
  projects/camlock/sys/cam/ata/ata_da.c
  projects/camlock/sys/cam/ata/ata_pmp.c
  projects/camlock/sys/cam/cam_periph.c
  projects/camlock/sys/cam/cam_periph.h
  projects/camlock/sys/cam/cam_xpt.c
  projects/camlock/sys/cam/cam_xpt_periph.h
  projects/camlock/sys/cam/scsi/scsi_all.c
  projects/camlock/sys/cam/scsi/scsi_all.h
  projects/camlock/sys/cam/scsi/scsi_cd.c
  projects/camlock/sys/cam/scsi/scsi_ch.c
  projects/camlock/sys/cam/scsi/scsi_da.c
  projects/camlock/sys/cam/scsi/scsi_enc.c
  projects/camlock/sys/cam/scsi/scsi_pass.c
  projects/camlock/sys/cam/scsi/scsi_pt.c
  projects/camlock/sys/cam/scsi/scsi_sa.c
  projects/camlock/sys/cam/scsi/scsi_sg.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/powerpc/sys/fasttrap_isa.h
  projects/camlock/sys/conf/NOTES
  projects/camlock/sys/conf/files
  projects/camlock/sys/conf/files.amd64
  projects/camlock/sys/conf/files.i386
  projects/camlock/sys/conf/kmod.mk
  projects/camlock/sys/conf/newvers.sh
  projects/camlock/sys/conf/options
  projects/camlock/sys/contrib/rdma/krping/getopt.c
  projects/camlock/sys/contrib/rdma/krping/krping.c
  projects/camlock/sys/contrib/rdma/krping/krping.h
  projects/camlock/sys/contrib/rdma/krping/krping_dev.c
  projects/camlock/sys/dev/ata/ata-all.c
  projects/camlock/sys/dev/ata/ata-card.c
  projects/camlock/sys/dev/bxe/bxe.c
  projects/camlock/sys/dev/bxe/bxe_stats.c
  projects/camlock/sys/dev/bxe/ecore_sp.h
  projects/camlock/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
  projects/camlock/sys/dev/cxgbe/adapter.h
  projects/camlock/sys/dev/cxgbe/common/common.h
  projects/camlock/sys/dev/cxgbe/firmware/t4fw_cfg.txt
  projects/camlock/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt
  projects/camlock/sys/dev/cxgbe/firmware/t4fw_interface.h
  projects/camlock/sys/dev/cxgbe/firmware/t5fw_cfg.txt
  projects/camlock/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt
  projects/camlock/sys/dev/cxgbe/t4_main.c
  projects/camlock/sys/dev/cxgbe/t4_sge.c
  projects/camlock/sys/dev/cxgbe/tom/t4_cpl_io.c
  projects/camlock/sys/dev/etherswitch/arswitch/arswitchreg.h
  projects/camlock/sys/dev/glxsb/glxsb.c
  projects/camlock/sys/dev/hifn/hifn7751.c
  projects/camlock/sys/dev/hyperv/include/hyperv.h
  projects/camlock/sys/dev/hyperv/netvsc/hv_net_vsc.h
  projects/camlock/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  projects/camlock/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c
  projects/camlock/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
  projects/camlock/sys/dev/hyperv/storvsc/hv_vstorage.h
  projects/camlock/sys/dev/hyperv/vmbus/hv_channel.c
  projects/camlock/sys/dev/hyperv/vmbus/hv_hv.c
  projects/camlock/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
  projects/camlock/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
  projects/camlock/sys/dev/random/harvest.c
  projects/camlock/sys/dev/random/hash.h
  projects/camlock/sys/dev/random/ivy.c
  projects/camlock/sys/dev/random/nehemiah.c
  projects/camlock/sys/dev/random/random_adaptors.c
  projects/camlock/sys/dev/random/random_adaptors.h
  projects/camlock/sys/dev/random/random_harvestq.c
  projects/camlock/sys/dev/random/random_harvestq.h
  projects/camlock/sys/dev/random/randomdev.c
  projects/camlock/sys/dev/random/randomdev.h
  projects/camlock/sys/dev/random/randomdev_soft.c
  projects/camlock/sys/dev/random/randomdev_soft.h
  projects/camlock/sys/dev/random/yarrow.c
  projects/camlock/sys/dev/random/yarrow.h
  projects/camlock/sys/dev/rndtest/rndtest.c
  projects/camlock/sys/dev/safe/safe.c
  projects/camlock/sys/dev/syscons/scmouse.c
  projects/camlock/sys/dev/syscons/syscons.c
  projects/camlock/sys/dev/ubsec/ubsec.c
  projects/camlock/sys/dev/usb/controller/musb_otg.c
  projects/camlock/sys/dev/usb/controller/musb_otg.h
  projects/camlock/sys/dev/usb/usbdevs
  projects/camlock/sys/dev/usb/wlan/if_run.c
  projects/camlock/sys/dev/vmware/vmxnet3/if_vmx.c
  projects/camlock/sys/dev/vmware/vmxnet3/if_vmxvar.h
  projects/camlock/sys/dev/xen/blkfront/blkfront.c
  projects/camlock/sys/fs/devfs/devfs_vnops.c
  projects/camlock/sys/i386/conf/GENERIC
  projects/camlock/sys/kern/kern_exec.c
  projects/camlock/sys/kern/kern_intr.c
  projects/camlock/sys/kern/kern_mbuf.c
  projects/camlock/sys/kern/subr_bus.c
  projects/camlock/sys/kern/sys_generic.c
  projects/camlock/sys/mips/atheros/ar71xx_chip.c
  projects/camlock/sys/mips/atheros/ar71xx_cpudef.h
  projects/camlock/sys/mips/atheros/ar71xx_machdep.c
  projects/camlock/sys/mips/atheros/ar724x_chip.c
  projects/camlock/sys/mips/atheros/ar91xx_chip.c
  projects/camlock/sys/mips/atheros/ar933x_chip.c
  projects/camlock/sys/mips/atheros/ar933xreg.h
  projects/camlock/sys/mips/atheros/ar934x_chip.c
  projects/camlock/sys/mips/atheros/ar934xreg.h
  projects/camlock/sys/mips/cavium/octeon_rnd.c
  projects/camlock/sys/mips/include/asm.h
  projects/camlock/sys/mips/include/pcb.h
  projects/camlock/sys/mips/mips/bcopy.S
  projects/camlock/sys/mips/mips/exception.S
  projects/camlock/sys/mips/mips/fp.S
  projects/camlock/sys/mips/mips/support.S
  projects/camlock/sys/mips/mips/swtch.S
  projects/camlock/sys/modules/cxgbe/t4_firmware/Makefile
  projects/camlock/sys/modules/cxgbe/t5_firmware/Makefile
  projects/camlock/sys/modules/dtrace/Makefile
  projects/camlock/sys/modules/dtrace/fasttrap/Makefile
  projects/camlock/sys/modules/random/Makefile
  projects/camlock/sys/modules/rdma/Makefile
  projects/camlock/sys/net/if.c
  projects/camlock/sys/net/if_ethersubr.c
  projects/camlock/sys/net/if_tun.c
  projects/camlock/sys/net/if_var.h
  projects/camlock/sys/net/rtsock.c
  projects/camlock/sys/net80211/ieee80211_freebsd.c
  projects/camlock/sys/netatalk/at_control.c
  projects/camlock/sys/netgraph/ng_base.c
  projects/camlock/sys/netgraph/ng_iface.c
  projects/camlock/sys/netinet/in.c
  projects/camlock/sys/netinet/in.h
  projects/camlock/sys/netinet/in_var.h
  projects/camlock/sys/netinet/ip_input.c
  projects/camlock/sys/netinet/ip_output.c
  projects/camlock/sys/netinet6/in6.c
  projects/camlock/sys/netinet6/in6_var.h
  projects/camlock/sys/netinet6/ip6_input.c
  projects/camlock/sys/netinet6/ip6_output.c
  projects/camlock/sys/netipx/ipx.c
  projects/camlock/sys/netipx/ipx_if.h
  projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/main.c
  projects/camlock/sys/ofed/include/linux/gfp.h
  projects/camlock/sys/powerpc/aim/interrupt.c
  projects/camlock/sys/powerpc/aim/trap.c
  projects/camlock/sys/sys/counter.h
  projects/camlock/sys/sys/param.h
  projects/camlock/sys/sys/random.h
  projects/camlock/sys/sys/systm.h
  projects/camlock/sys/ufs/ufs/dinode.h
  projects/camlock/sys/vm/vm_phys.c
  projects/camlock/tools/build/mk/OptionalObsoleteFiles.inc
  projects/camlock/tools/make_libdeps.sh
  projects/camlock/usr.bin/atf/Makefile
  projects/camlock/usr.bin/atf/Makefile.inc
  projects/camlock/usr.bin/netstat/if.c
  projects/camlock/usr.bin/netstat/main.c
  projects/camlock/usr.bin/netstat/mbuf.c
  projects/camlock/usr.bin/netstat/netstat.h
  projects/camlock/usr.bin/netstat/route.c
  projects/camlock/usr.bin/rpcinfo/rpcinfo.c
  projects/camlock/usr.bin/systat/netcmds.c
  projects/camlock/usr.sbin/bhyve/pci_virtio_block.c
  projects/camlock/usr.sbin/bootparamd/bootparamd/main.c
  projects/camlock/usr.sbin/bootparamd/callbootd/callbootd.c
  projects/camlock/usr.sbin/bsdconfig/include/messages.subr
  projects/camlock/usr.sbin/bsdconfig/share/Makefile
  projects/camlock/usr.sbin/bsdconfig/share/device.subr
  projects/camlock/usr.sbin/bsdconfig/share/dialog.subr
  projects/camlock/usr.sbin/bsdconfig/share/strings.subr
  projects/camlock/usr.sbin/bsdconfig/share/variable.subr
  projects/camlock/usr.sbin/bsdinstall/bsdinstall
  projects/camlock/usr.sbin/bsdinstall/bsdinstall.8
  projects/camlock/usr.sbin/bsdinstall/scripts/Makefile
  projects/camlock/usr.sbin/bsdinstall/scripts/auto
  projects/camlock/usr.sbin/bsdinstall/scripts/config
  projects/camlock/usr.sbin/bsdinstall/scripts/jail
  projects/camlock/usr.sbin/bsdinstall/scripts/keymap
  projects/camlock/usr.sbin/bsdinstall/scripts/netconfig
  projects/camlock/usr.sbin/bsdinstall/scripts/script
  projects/camlock/usr.sbin/bsdinstall/scripts/services
  projects/camlock/usr.sbin/ifmcstat/ifmcstat.c
  projects/camlock/usr.sbin/jail/command.c
  projects/camlock/usr.sbin/jail/config.c
  projects/camlock/usr.sbin/jail/jail.8
  projects/camlock/usr.sbin/jail/jail.c
  projects/camlock/usr.sbin/jail/jailp.h
  projects/camlock/usr.sbin/pkg/Makefile
  projects/camlock/usr.sbin/pkg/config.c
  projects/camlock/usr.sbin/ypset/ypset.c
Directory Properties:
  projects/camlock/   (props changed)
  projects/camlock/cddl/   (props changed)
  projects/camlock/cddl/contrib/opensolaris/   (props changed)
  projects/camlock/contrib/ipfilter/   (props changed)
  projects/camlock/gnu/usr.bin/cc/cc_tools/   (props changed)
  projects/camlock/lib/libc/   (props changed)
  projects/camlock/sbin/   (props changed)
  projects/camlock/share/man/man4/   (props changed)
  projects/camlock/sys/   (props changed)
  projects/camlock/sys/boot/   (props changed)
  projects/camlock/sys/cddl/contrib/opensolaris/   (props changed)
  projects/camlock/sys/conf/   (props changed)
  projects/camlock/sys/dev/hyperv/   (props changed)
  projects/camlock/usr.sbin/bhyve/   (props changed)
  projects/camlock/usr.sbin/bsdinstall/scripts/docsinstall   (props changed)
  projects/camlock/usr.sbin/jail/   (props changed)

Modified: projects/camlock/Makefile.inc1
==============================================================================
--- projects/camlock/Makefile.inc1	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/Makefile.inc1	Tue Oct 15 18:07:23 2013	(r256554)
@@ -329,7 +329,7 @@ TARGET_ABI=	gnueabi
 .else
 TARGET_ABI=	unknown
 .endif
-TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0
+TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
 XFLAGS+=	-target ${TARGET_TRIPLE}
 .endif
 .endif

Modified: projects/camlock/ObsoleteFiles.inc
==============================================================================
--- projects/camlock/ObsoleteFiles.inc	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/ObsoleteFiles.inc	Tue Oct 15 18:07:23 2013	(r256554)
@@ -38,8 +38,38 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20131014: libbsdyml becomes private
+OLD_FILES+=usr/lib/libbsdyml.a
+OLD_FILES+=usr/lib/libbsdyml.so
+OLD_LIBS+=usr/lib/libbsdyml.so.0
+OLD_FILES+=usr/lib/libbsdyml_p.a
+OLD_FILES+=usr/lib32/libbsdyml.a
+OLD_FILES+=usr/lib32/libbsdyml.so
+OLD_LIBS+=usr/lib32/libbsdyml.so.0
+OLD_FILES+=usr/lib32/libbsdyml_p.a
+OLD_FILES+=usr/share/man/man3/libbsdyml.3.gz
+OLD_FILES+=usr/include/bsdyml.h
+# 20131013: Removal of the ATF tools
+OLD_FILES+=etc/atf/FreeBSD.conf
+OLD_FILES+=etc/atf/atf-run.hooks
+OLD_FILES+=etc/atf/common.conf
+OLD_FILES+=usr/bin/atf-config
+OLD_FILES+=usr/bin/atf-report
+OLD_FILES+=usr/bin/atf-run
+OLD_FILES+=usr/bin/atf-version
+OLD_FILES+=usr/share/atf/atf-run.hooks
+OLD_FILES+=usr/share/examples/atf/atf-run.hooks
+OLD_FILES+=usr/share/examples/atf/tests-results.css
+OLD_FILES+=usr/share/man/man1/atf-config.1.gz
+OLD_FILES+=usr/share/man/man1/atf-report.1.gz
+OLD_FILES+=usr/share/man/man1/atf-run.1.gz
+OLD_FILES+=usr/share/man/man1/atf-version.1.gz
+OLD_FILES+=usr/share/man/man5/atf-formats.5.gz
+OLD_FILES+=usr/share/man/man7/atf.7.gz
+OLD_FILES+=usr/share/xml/atf/tests-results.dtd
+OLD_FILES+=usr/share/xsl/atf/tests-results.xsl
 # 20131009: freebsd-version moved from /libexec to /bin
-OLD_FILES+=/libexec/freebsd-version
+OLD_FILES+=libexec/freebsd-version
 # 20131001: ar and ranlib from binutils not used
 OLD_FILES+=usr/bin/gnu-ar
 OLD_FILES+=usr/bin/gnu-ranlib
@@ -6093,6 +6123,13 @@ OLD_LIBS+=usr/lib/libkse.so.1
 OLD_LIBS+=usr/lib/liblwres.so.3
 OLD_LIBS+=usr/lib/pam_ftp.so.2
 
+# 20131013: Removal of the ATF tools
+OLD_DIRS+=etc/atf
+OLD_DIRS+=usr/share/examples/atf
+OLD_DIRS+=usr/share/xml/atf
+OLD_DIRS+=usr/share/xml
+OLD_DIRS+=usr/share/xsl/atf
+OLD_DIRS+=usr/share/xsl
 # 20040925: bind9 import
 OLD_DIRS+=usr/share/doc/bind/html
 OLD_DIRS+=usr/share/doc/bind/misc

Modified: projects/camlock/UPDATING
==============================================================================
--- projects/camlock/UPDATING	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/UPDATING	Tue Oct 15 18:07:23 2013	(r256554)
@@ -16,8 +16,8 @@ from older versions of FreeBSD, try WITH
 head, and then rebuild without this option. The bootstrap process from
 older version of current is a bit fragile.
 
-NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW:
-	FreeBSD 10.x has many debugging features turned on, in both the kernel
+NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
+	FreeBSD 11.x has many debugging features turned on, in both the kernel
 	and userland.  These features attempt to detect incorrect use of
 	system primitives, and encourage loud failure through extra sanity
 	checking and fail stop semantics.  They also substantially impact
@@ -31,6 +31,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20131014:
+	libbsdyml has been renamed to libyaml and moved to /usr/lib/private.
+	This will break ports-mgmt/pkg. Rebuild the port, or upgrade to pkg
+	1.1.4_8 and verify bsdyml not linked in, before running "make
+	delete-old-libs":
+	  # make -C /usr/ports/ports-mgmt/pkg build deinstall install clean
+	  or
+	  # pkg install pkg; ldd /usr/local/sbin/pkg | grep bsdyml
+
 20131010:
 	The rc.d/jail script has been updated to support jail(8)
 	configuration file.  The "jail_<jname>_*" rc.conf(5) variables

Modified: projects/camlock/bin/freebsd-version/freebsd-version.sh.in
==============================================================================
--- projects/camlock/bin/freebsd-version/freebsd-version.sh.in	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/bin/freebsd-version/freebsd-version.sh.in	Tue Oct 15 18:07:23 2013	(r256554)
@@ -81,7 +81,7 @@ userland_version() {
 # Print a usage string and exit.
 #
 usage() {
-	echo "usage: $progname [-ku]\n" >&2
+	echo "usage: $progname [-ku]" >&2
 	exit 1
 }
 

Modified: projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Tue Oct 15 18:07:23 2013	(r256554)
@@ -242,8 +242,14 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION_
 /* XXX */
 printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
 #elif defined(__powerpc__)
-/* XXX */
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+			/*
+			 * Add 4 bytes to hit the low half of this 64-bit
+			 * big-endian address.
+			 */
+			rel->r_offset = s->dofs_offset +
+			    dofr[j].dofr_offset + 4;
+			rel->r_info = ELF32_R_INFO(count + dep->de_global,
+			    R_PPC_REL32);
 #elif defined(__sparc)
 			/*
 			 * Add 4 bytes to hit the low half of this 64-bit
@@ -423,7 +429,10 @@ prepare_elf64(dtrace_hdl_t *dtp, const d
 #elif defined(__mips__)
 /* XXX */
 #elif defined(__powerpc__)
-/* XXX */
+			rel->r_offset = s->dofs_offset +
+			    dofr[j].dofr_offset;
+			rel->r_info = ELF64_R_INFO(count + dep->de_global,
+			    R_PPC64_REL64);
 #elif defined(__i386) || defined(__amd64)
 			rel->r_offset = s->dofs_offset +
 			    dofr[j].dofr_offset;
@@ -824,12 +833,84 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION_
 	return (0);
 }
 #elif defined(__powerpc__)
+/* The sentinel is 'xor r3,r3,r3'. */
+#define DT_OP_XOR_R3	0x7c631a78
+
+#define DT_OP_NOP		0x60000000
+#define DT_OP_BLR		0x4e800020
+
+/* This captures all forms of branching to address. */
+#define DT_IS_BRANCH(inst)	((inst & 0xfc000000) == 0x48000000)
+#define DT_IS_BL(inst)	(DT_IS_BRANCH(inst) && (inst & 0x01))
+
 /* XXX */
 static int
 dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
     uint32_t *off)
 {
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+	uint32_t *ip;
+
+	if ((rela->r_offset & (sizeof (uint32_t) - 1)) != 0)
+		return (-1);
+
+	/*LINTED*/
+	ip = (uint32_t *)(p + rela->r_offset);
+
+	/*
+	 * We only know about some specific relocation types.
+	 */
+	if (GELF_R_TYPE(rela->r_info) != R_PPC_REL24 &&
+	    GELF_R_TYPE(rela->r_info) != R_PPC_PLTREL24)
+		return (-1);
+
+	/*
+	 * We may have already processed this object file in an earlier linker
+	 * invocation. Check to see if the present instruction sequence matches
+	 * the one we would install below.
+	 */
+	if (isenabled) {
+		if (ip[0] == DT_OP_XOR_R3) {
+			(*off) += sizeof (ip[0]);
+			return (0);
+		}
+	} else {
+		if (ip[0] == DT_OP_NOP) {
+			(*off) += sizeof (ip[0]);
+			return (0);
+		}
+	}
+
+	/*
+	 * We only expect branch to address instructions.
+	 */
+	if (!DT_IS_BRANCH(ip[0])) {
+		dt_dprintf("found %x instead of a branch instruction at %llx\n",
+		    ip[0], (u_longlong_t)rela->r_offset);
+		return (-1);
+	}
+
+	if (isenabled) {
+		/*
+		 * It would necessarily indicate incorrect usage if an is-
+		 * enabled probe were tail-called so flag that as an error.
+		 * It's also potentially (very) tricky to handle gracefully,
+		 * but could be done if this were a desired use scenario.
+		 */
+		if (!DT_IS_BL(ip[0])) {
+			dt_dprintf("tail call to is-enabled probe at %llx\n",
+			    (u_longlong_t)rela->r_offset);
+			return (-1);
+		}
+
+		ip[0] = DT_OP_XOR_R3;
+		(*off) += sizeof (ip[0]);
+	} else {
+		if (DT_IS_BL(ip[0]))
+			ip[0] = DT_OP_NOP;
+		else
+			ip[0] = DT_OP_BLR;
+	}
+
 	return (0);
 }
 

Modified: projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c	Tue Oct 15 18:07:23 2013	(r256554)
@@ -35,14 +35,26 @@
 #include <dt_impl.h>
 #include <dt_pid.h>
 
+#include <libproc_compat.h>
+
 /*ARGSUSED*/
 int
 dt_pid_create_entry_probe(struct ps_prochandle *P, dtrace_hdl_t *dtp,
     fasttrap_probe_spec_t *ftp, const GElf_Sym *symp)
 {
+	ftp->ftps_type = DTFTP_ENTRY;
+	ftp->ftps_pc = (uintptr_t)symp->st_value;
+	ftp->ftps_size = (size_t)symp->st_size;
+	ftp->ftps_noffs = 1;
+	ftp->ftps_offs[0] = 0;
+
+	if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) {
+		dt_dprintf("fasttrap probe creation ioctl failed: %s\n",
+		    strerror(errno));
+		return (dt_set_errno(dtp, errno));
+	}
 
-	dt_dprintf("%s: unimplemented\n", __func__);
-	return (DT_PROC_ERR);
+	return (1);
 }
 
 int
@@ -50,8 +62,74 @@ dt_pid_create_return_probe(struct ps_pro
     fasttrap_probe_spec_t *ftp, const GElf_Sym *symp, uint64_t *stret)
 {
 
-	dt_dprintf("%s: unimplemented\n", __func__);
-	return (DT_PROC_ERR);
+	uintptr_t temp;
+	uint32_t *text;
+	int i;
+	int srdepth = 0;
+
+	if ((text = malloc(symp->st_size + 4)) == NULL) {
+		dt_dprintf("mr sparkle: malloc() failed\n");
+		return (DT_PROC_ERR);
+	}
+
+	if (Pread(P, text, symp->st_size, symp->st_value) != symp->st_size) {
+		dt_dprintf("mr sparkle: Pread() failed\n");
+		free(text);
+		return (DT_PROC_ERR);
+	}
+
+	/*
+	 * Leave a dummy instruction in the last slot to simplify edge
+	 * conditions.
+	 */
+	text[symp->st_size / 4] = 0;
+
+	ftp->ftps_type = DTFTP_RETURN;
+	ftp->ftps_pc = symp->st_value;
+	ftp->ftps_size = symp->st_size;
+	ftp->ftps_noffs = 0;
+
+	for (i = 0; i < symp->st_size / 4; i++) {
+
+		if ((text[i] & 0xfc000001) != 0x48000000 &&
+		    text[i] != 0x4e800020)
+			continue;
+
+		/*
+		 * Check for a jump within this function.  If it's outside this
+		 * function then it's a tail-call, so a return point.
+		 */
+		if ((text[i] & 0xfc000000) == 0x48000000) {
+			temp = (text[i] & 0x03fffffc);
+			/* Bit 30 denotes an absolute address. */
+			if (!(text[i] & 0x02)) {
+				temp += symp->st_value + i * 4;
+			}
+			else {
+				/* Sign extend the absolute address. */
+				if (temp & 0x02000000) {
+					temp |= (UINTPTR_MAX - 0x03ffffff);
+				}
+			}
+			if (temp >= symp->st_value &&
+			    temp <= (symp->st_value + symp->st_size))
+				continue;
+		}
+		dt_dprintf("return at offset %x\n", i * 4);
+		ftp->ftps_offs[ftp->ftps_noffs++] = i * 4;
+	}
+
+	free(text);
+	if (ftp->ftps_noffs > 0) {
+		if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) {
+			dt_dprintf("fasttrap probe creation ioctl failed: %s\n",
+			    strerror(errno));
+			return (dt_set_errno(dtp, errno));
+		}
+	}
+
+
+	return (ftp->ftps_noffs);
 }
 
 /*ARGSUSED*/
@@ -59,9 +137,22 @@ int
 dt_pid_create_offset_probe(struct ps_prochandle *P, dtrace_hdl_t *dtp,
     fasttrap_probe_spec_t *ftp, const GElf_Sym *symp, ulong_t off)
 {
+	if (off & 0x3)
+		return (DT_PROC_ALIGN);
 
-	dt_dprintf("%s: unimplemented\n", __func__);
-	return (DT_PROC_ERR);
+	ftp->ftps_type = DTFTP_OFFSETS;
+	ftp->ftps_pc = (uintptr_t)symp->st_value;
+	ftp->ftps_size = (size_t)symp->st_size;
+	ftp->ftps_noffs = 1;
+	ftp->ftps_offs[0] = off;
+
+	if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) {
+		dt_dprintf("fasttrap probe creation ioctl failed: %s\n",
+		    strerror(errno));
+		return (dt_set_errno(dtp, errno));
+	}
+
+	return (1);
 }
 
 /*ARGSUSED*/
@@ -69,7 +160,38 @@ int
 dt_pid_create_glob_offset_probes(struct ps_prochandle *P, dtrace_hdl_t *dtp,
     fasttrap_probe_spec_t *ftp, const GElf_Sym *symp, const char *pattern)
 {
+	ulong_t i;
+
+	ftp->ftps_type = DTFTP_OFFSETS;
+	ftp->ftps_pc = (uintptr_t)symp->st_value;
+	ftp->ftps_size = (size_t)symp->st_size;
+	ftp->ftps_noffs = 0;
+
+	/*
+	 * If we're matching against everything, just iterate through each
+	 * instruction in the function, otherwise look for matching offset
+	 * names by constructing the string and comparing it against the
+	 * pattern.
+	 */
+	if (strcmp("*", pattern) == 0) {
+		for (i = 0; i < symp->st_size; i += 4) {
+			ftp->ftps_offs[ftp->ftps_noffs++] = i;
+		}
+	} else {
+		char name[sizeof (i) * 2 + 1];
+
+		for (i = 0; i < symp->st_size; i += 4) {
+			(void) sprintf(name, "%lx", i);
+			if (gmatch(name, pattern))
+				ftp->ftps_offs[ftp->ftps_noffs++] = i;
+		}
+	}
+
+	if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) {
+		dt_dprintf("fasttrap probe creation ioctl failed: %s\n",
+		    strerror(errno));
+		return (dt_set_errno(dtp, errno));
+	}
 
-	dt_dprintf("%s: unimplemented\n", __func__);
-	return (DT_PROC_ERR);
+	return (ftp->ftps_noffs);
 }

Modified: projects/camlock/contrib/ipfilter/ipf.h
==============================================================================
--- projects/camlock/contrib/ipfilter/ipf.h	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/contrib/ipfilter/ipf.h	Tue Oct 15 18:07:23 2013	(r256554)
@@ -42,9 +42,10 @@ struct file;
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <net/if.h>
-#if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-#endif
+
+#define	_WANT_IFADDR
+#include <net/if_var.h>
+
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>

Modified: projects/camlock/etc/Makefile
==============================================================================
--- projects/camlock/etc/Makefile	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/etc/Makefile	Tue Oct 15 18:07:23 2013	(r256554)
@@ -215,9 +215,6 @@ distribution:
 		echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \
 	) | ${METALOG.add}
 .endif
-.if ${MK_ATF} != "no"
-	${_+_}cd ${.CURDIR}/atf; ${MAKE} install
-.endif
 .if ${MK_BLUETOOTH} != "no"
 	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
 .endif

Modified: projects/camlock/etc/defaults/periodic.conf
==============================================================================
--- projects/camlock/etc/defaults/periodic.conf	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/etc/defaults/periodic.conf	Tue Oct 15 18:07:23 2013	(r256554)
@@ -190,7 +190,7 @@ weekly_noid_dirs="/"					# Look here
 # 400.status-pkg
 weekly_status_pkg_enable="NO"				# Find out-of-date pkgs
 pkg_version=pkg_version					# Use this program
-pkg_version_index=/usr/ports/INDEX-10			# Use this index file
+pkg_version_index=/usr/ports/INDEX-11			# Use this index file
 
 # 450.status-security
 weekly_status_security_enable="YES"			# Security check

Modified: projects/camlock/etc/defaults/rc.conf
==============================================================================
--- projects/camlock/etc/defaults/rc.conf	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/etc/defaults/rc.conf	Tue Oct 15 18:07:23 2013	(r256554)
@@ -651,6 +651,7 @@ entropy_save_num="8"	# Number of entropy
 harvest_interrupt="YES"	# Entropy device harvests interrupt randomness
 harvest_ethernet="YES"	# Entropy device harvests ethernet randomness
 harvest_p_to_p="YES"	# Entropy device harvests point-to-point randomness
+harvest_swi="YES"	# Entropy device harvests internal SWI randomness
 dmesg_enable="YES"	# Save dmesg(8) to /var/run/dmesg.boot
 watchdogd_enable="NO"	# Start the software watchdog daemon
 watchdogd_flags=""	# Flags to watchdogd (if enabled)

Modified: projects/camlock/etc/ftpusers
==============================================================================
--- projects/camlock/etc/ftpusers	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/etc/ftpusers	Tue Oct 15 18:07:23 2013	(r256554)
@@ -15,7 +15,6 @@ man
 sshd
 smmsp
 mailnull
-_atf
 bind
 unbound
 proxy

Modified: projects/camlock/etc/group
==============================================================================
--- projects/camlock/etc/group	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/etc/group	Tue Oct 15 18:07:23 2013	(r256554)
@@ -16,7 +16,6 @@ staff:*:20:
 sshd:*:22:
 smmsp:*:25:
 mailnull:*:26:
-_atf:*:27:
 guest:*:31:
 bind:*:53:
 unbound:*:59:

Modified: projects/camlock/etc/master.passwd
==============================================================================
--- projects/camlock/etc/master.passwd	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/etc/master.passwd	Tue Oct 15 18:07:23 2013	(r256554)
@@ -13,7 +13,6 @@ man:*:9:9::0:0:Mister Man Pages:/usr/sha
 sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin
 smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin
 mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin
-_atf:*:27:27::0:0:& pseudo-user:/nonexistent:/usr/sbin/nologin
 bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin
 unbound:*:59:59::0:0:Unbound DNS Resolver:/var/unbound:/usr/sbin/nologin
 proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin

Modified: projects/camlock/etc/mtree/BSD.root.dist
==============================================================================
--- projects/camlock/etc/mtree/BSD.root.dist	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/etc/mtree/BSD.root.dist	Tue Oct 15 18:07:23 2013	(r256554)
@@ -24,8 +24,6 @@
     etc
         X11
         ..
-        atf
-        ..
         bluetooth
         ..
         defaults

Modified: projects/camlock/etc/mtree/BSD.usr.dist
==============================================================================
--- projects/camlock/etc/mtree/BSD.usr.dist	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/etc/mtree/BSD.usr.dist	Tue Oct 15 18:07:23 2013	(r256554)
@@ -299,8 +299,6 @@
             ..
             IPv6
             ..
-            atf
-            ..
             bhyve
             ..
             bootforth
@@ -1410,14 +1408,6 @@
             catalog
             ..
         ..
-        xml
-            atf
-            ..
-        ..
-        xsl
-            atf
-            ..
-        ..
         zoneinfo
             Africa
             ..

Modified: projects/camlock/etc/rc.d/initrandom
==============================================================================
--- projects/camlock/etc/rc.d/initrandom	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/etc/rc.d/initrandom	Tue Oct 15 18:07:23 2013	(r256554)
@@ -14,26 +14,6 @@ name="initrandom"
 start_cmd="initrandom_start"
 stop_cmd=":"
 
-feed_dev_random()
-{
-	if [ -f "${1}" -a -r "${1}" -a -s "${1}" ]; then
-		cat "${1}" | dd of=/dev/random bs=8k 2>/dev/null
-	fi
-}
-
-better_than_nothing()
-{
-	# XXX temporary until we can improve the entropy
-	# harvesting rate.
-	# Entropy below is not great, but better than nothing.
-	# This unblocks the generator at startup
-	# Note: commands are ordered to cause the most variance across reboots.
-	( kenv; dmesg; df -ib; ps -fauxww; date; sysctl -a ) \
-	    | dd of=/dev/random bs=8k 2>/dev/null
-	/sbin/sha256 -q `sysctl -n kern.bootfile` \
-	    | dd of=/dev/random bs=8k 2>/dev/null
-}
-
 initrandom_start()
 {
 	soft_random_generator=`sysctl kern.random 2>/dev/null`
@@ -63,23 +43,15 @@ initrandom_start()
 			else
 				${SYSCTL} kern.random.sys.harvest.point_to_point=0 >/dev/null
 			fi
-		fi
 
-		# First pass at reseeding /dev/random.
-		#
-		case ${entropy_file} in
-		[Nn][Oo] | '')
-			;;
-		*)
-			if [ -w /dev/random ]; then
-				feed_dev_random "${entropy_file}"
+			if checkyesno harvest_swi; then
+				${SYSCTL} kern.random.sys.harvest.swi=1 >/dev/null
+				echo -n ' swi'
+			else
+				${SYSCTL} kern.random.sys.harvest.swi=0 >/dev/null
 			fi
-			;;
-		esac
-
-		better_than_nothing
+		fi
 
-		echo -n ' kickstart'
 	fi
 
 	echo '.'

Modified: projects/camlock/etc/rc.d/jail
==============================================================================
--- projects/camlock/etc/rc.d/jail	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/etc/rc.d/jail	Tue Oct 15 18:07:23 2013	(r256554)
@@ -22,7 +22,7 @@ status_cmd="jail_status"
 extra_commands="config console status"
 : ${jail_conf:=/etc/jail.conf}
 : ${jail_program:=/usr/sbin/jail}
-: ${jail_consolecmd:=/bin/sh}
+: ${jail_consolecmd:=/usr/bin/login -f root}
 : ${jail_jexec:=/usr/sbin/jexec}
 : ${jail_jls:=/usr/sbin/jls}
 
@@ -94,7 +94,7 @@ extract_var()
 #
 parse_options()
 {
-	local _j
+	local _j _p
 	_j=$1
 
 	_confwarn=0
@@ -166,7 +166,7 @@ parse_options()
 			jail_handle_ips_option $_ip $_interface
 			alias=0
 			while : ; do
-				eval _x=\"\$jail_${_jail}_ip_multi${alias}\"
+				eval _x=\"\$jail_${_j}_ip_multi${alias}\"
 				[ -z "$_x" ] && break
 
 				jail_handle_ips_option $_x $_interface
@@ -208,6 +208,7 @@ parse_options()
 		eval : \${jail_${_j}_devfs_enable:=${jail_devfs_enable:-NO}}
 		if checkyesno jail_${_j}_devfs_enable; then
 			echo "	mount.devfs;"
+			eval _ruleset=\${jail_${_j}_devfs_ruleset:-${jail_devfs_ruleset}}
 			case $_ruleset in
 			"")	;;
 			[0-9]*) echo "	devfs_ruleset = \"$_ruleset\";" ;;
@@ -217,7 +218,7 @@ parse_options()
 				# mount(8) only accepts an integer. 
 				# This should accept a ruleset name.
 			;;
-			*)	warn "devfs_ruleset must be integer." ;;
+			*)	warn "devfs_ruleset must be an integer." ;;
 			esac
 			if [ -r $_fstab ]; then
 				echo "	mount.fstab = \"$_fstab\";"
@@ -226,8 +227,7 @@ parse_options()
 
 		eval : \${jail_${_j}_fdescfs_enable:=${jail_fdescfs_enable:-NO}}
 		if checkyesno jail_${_j}_fdescfs_enable; then
-			echo "	mount += " \
-			    "\"fdescfs ${_rootdir%/}/dev/fd fdescfs rw 0 0\";"
+			echo "	mount.fdescfs;"
 		fi
 		eval : \${jail_${_j}_procfs_enable:=${jail_procfs_enable:-NO}}
 		if checkyesno jail_${_j}_procfs_enable; then
@@ -235,8 +235,6 @@ parse_options()
 			    "\"procfs ${_rootdir%/}/proc procfs rw 0 0\";"
 		fi
 
-		echo "	${_parameters};"
-
 		eval : \${jail_${_j}_mount_enable:=${jail_mount_enable:-NO}}
 		if checkyesno jail_${_j}_mount_enable; then
 			echo "	allow.mount;" >> $_conf
@@ -244,6 +242,9 @@ parse_options()
 
 		extract_var $_j set_hostname_allow allow.set_hostname YN NO
 		extract_var $_j sysvipc_allow allow.sysvipc YN NO
+		for _p in $_parameters; do
+			echo "	${_p%\;};"
+		done
 		echo "}"
 	) >> $_conf
 
@@ -328,9 +329,9 @@ jail_extract_address()
 #
 jail_handle_ips_option()
 {
-	local _x _type _i _iface
+	local _x _type _i _defif
 	_x=$1
-	_iface=$2
+	_defif=$2
 
 	if [ -z "${_x}" ]; then
 		# No IP given. This can happen for the primary address
@@ -354,7 +355,8 @@ jail_handle_ips_option()
 		_type=""
 		_addr=""
 		_mask=""
-		jail_extract_address $_i $_iface
+		_iface=""
+		jail_extract_address $_i $_defif
 
 		# make sure we got an address.
 		case $_addr in
@@ -365,10 +367,10 @@ jail_handle_ips_option()
 		# Append address to list of addresses for the jail command.
 		case $_type in
 		inet)
-			echo "	ip4.addr += \"${_addr}${_mask}\";"
+			echo "	ip4.addr += \"${_iface}|${_addr}${_mask}\";"
 		;;
 		inet6)
-			echo "	ip6.addr += \"${_addr}${_mask}\";"
+			echo "	ip6.addr += \"${_iface}|${_addr}${_mask}\";"
 			need_dad_wait=1
 		;;
 		esac
@@ -377,26 +379,35 @@ jail_handle_ips_option()
 
 jail_config()
 {
+	local _j
+
 	case $1 in
 	_ALL)	return ;;
 	esac
-	for _jail in $@; do
-		if parse_options $_jail; then 
-			echo "$_jail: parameters are in $_conf."
+	for _j in $@; do
+		_j=$(echo $_j | tr /. _)
+		if parse_options $_j; then 
+			echo "$_j: parameters are in $_conf."
 		fi
 	done
 }
 
 jail_console()
 {
+	local _j _cmd
+
 	# One argument that is not _ALL.
 	case $#:$1 in
-	1:_ALL)	err 3 "Specify a jail name." ;;
-	1:*)	;;
-	*)	err 3 "Specify a jail name." ;;
+	0:*|1:_ALL)	err 3 "Specify a jail name." ;;
+	1:*)		;;
+	esac
+	_j=$(echo $1 | tr /. _)
+	shift
+	case $# in
+	0)	eval _cmd=\${jail_${_j}_consolecmd:-$jail_consolecmd} ;;
+	*)	_cmd=$@ ;;
 	esac
-	eval _cmd=\${jail_$1_consolecmd:-$jail_consolecmd}
-	$jail_jexec $1 $_cmd
+	$jail_jexec $_j $_cmd
 }
 
 jail_status()
@@ -407,6 +418,8 @@ jail_status()
 
 jail_start()
 {
+	local _j _jid _jn
+
 	if [ $# = 0 ]; then
 		return
 	fi
@@ -417,28 +430,40 @@ jail_start()
 		command=$jail_program
 		rc_flags=$jail_flags
 		command_args="-f $jail_conf -c"
-		$command $rc_flags $command_args "*"
+		$jail_jls -nq | while read IN; do
+			_jn=$(echo $IN | tr " " "\n" | grep name=)
+			_jid=$(echo $IN | tr " " "\n" | grep jid=)
+			if $command $rc_flags $command_args ${_jn#name=}; then
+				echo -n " ${_jn#name=}"
+				echo "${_jid#jid=}" \
+				    > /var/run/jail_${_jn#name=}.id
+			fi
+		done
 		echo '.'
 		return
 	;;
 	esac
 	_tmp=`mktemp -t jail` || exit 3
-	for _jail in $@; do
-		parse_options $_jail || continue
+	for _j in $@; do
+		_j=$(echo $_j | tr /. _)
+		parse_options $_j || continue
 
 		eval rc_flags=\${jail_${_j}_flags:-$jail_flags}
 		eval command=\${jail_${_j}_program:-$jail_program}
 		if checkyesno jail_parallel_start; then
-			command_args="-i -f $_conf -c $_jail &"
+			command_args="-i -f $_conf -c $_j &"
 		else
-			command_args="-i -f $_conf -c $_jail"
+			command_args="-i -f $_conf -c $_j"
 		fi
 		if $command $rc_flags $command_args \
 		    >> $_tmp 2>&1 </dev/null; then
-			echo -n " ${_hostname:-${_jail}}"
+			echo -n " ${_hostname:-${_j}}"
+			_jid=$($jail_jls -n -j $_j | tr " " "\n" | grep jid=)
+			echo "${_jid#jid=}" > /var/run/jail_${_j}.id
 		else
-			echo " cannot start jail \"${_hostname:-${jail}}\": "
-			tail +2 $_tmp
+			rm -f /var/run/jail_${_j}.id
+			echo " cannot start jail \"${_hostname:-${_j}}\": "
+			cat $_tmp
 		fi
 		rm -f $_tmp
 	done
@@ -447,6 +472,8 @@ jail_start()
 
 jail_stop()
 {
+	local _j _jn
+
 	if [ $# = 0 ]; then
 		return
 	fi
@@ -457,16 +484,29 @@ jail_stop()
 		command=$jail_program
 		rc_flags=$jail_flags
 		command_args="-f $jail_conf -r"
-		$command $rc_flags $command_args "*"
+		$jail_jls -nq | while read IN; do
+			_jn=$(echo $IN | tr " " "\n" | grep name=)
+			echo -n " ${_jn#name=}"
+			$command $rc_flags $command_args ${_jn#name=}
+			if ! $jail_jls -j ${_jn#name=} > /dev/null 2>&1; then
+				rm -f /var/run/jail_${_jn#name=}.id
+			fi
+		done
 		echo '.'
 		return
 	;;
 	esac
-	for _jail in $@; do
-		parse_options $_jail || continue
+	for _j in $@; do
+		_j=$(echo $_j | tr /. _)
+		parse_options $_j || continue
+		if ! $jail_jls -j $_j > /dev/null 2>&1; then
+			continue
+		fi
 		eval command=\${jail_${_j}_program:-$jail_program}
-		if $command -q -f $_conf -r $_jail; then
-			echo -n " ${_hostname:-${_jail}}"
+		echo -n " ${_hostname:-${_j}}"
+		$command -q -f $_conf -r $_j
+		if ! $jail_jls -j $_j > /dev/null 2>&1; then
+			rm -f /var/run/jail_${_j}.id
 		fi
 	done
 	echo '.'

Modified: projects/camlock/gnu/usr.bin/cc/cc_tools/freebsd-native.h
==============================================================================
--- projects/camlock/gnu/usr.bin/cc/cc_tools/freebsd-native.h	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/gnu/usr.bin/cc/cc_tools/freebsd-native.h	Tue Oct 15 18:07:23 2013	(r256554)
@@ -7,8 +7,8 @@
 #define FREEBSD_NATIVE 1
 
 /* Fake out gcc/config/freebsd<version>.h.  */
-#define	FBSD_MAJOR	10
-#define	FBSD_CC_VER	1000001		/* form like __FreeBSD_version */
+#define	FBSD_MAJOR	11
+#define	FBSD_CC_VER	1100001		/* form like __FreeBSD_version */
 
 #undef SYSTEM_INCLUDE_DIR		/* We don't need one for now. */
 #undef TOOL_INCLUDE_DIR			/* We don't need one for now. */

Modified: projects/camlock/gnu/usr.bin/groff/tmac/mdoc.local
==============================================================================
--- projects/camlock/gnu/usr.bin/groff/tmac/mdoc.local	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/gnu/usr.bin/groff/tmac/mdoc.local	Tue Oct 15 18:07:23 2013	(r256554)
@@ -45,7 +45,7 @@
 .ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads)
 .
 .\" Default .Os value
-.ds doc-default-operating-system FreeBSD\~10.0
+.ds doc-default-operating-system FreeBSD\~11.0
 .
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-7.4    7.4
@@ -54,6 +54,7 @@
 .ds doc-operating-system-FreeBSD-9.1    9.1
 .ds doc-operating-system-FreeBSD-9.2    9.2
 .ds doc-operating-system-FreeBSD-10.0   10.0
+.ds doc-operating-system-FreeBSD-11.0   11.0
 .
 .\" Definitions not (yet) in doc-syms
 .

Modified: projects/camlock/lib/clang/clang.build.mk
==============================================================================
--- projects/camlock/lib/clang/clang.build.mk	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/lib/clang/clang.build.mk	Tue Oct 15 18:07:23 2013	(r256554)
@@ -27,8 +27,8 @@ TARGET_ABI=	gnueabi
 TARGET_ABI=	unknown
 .endif
 
-TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0
-BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.0
+TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
+BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd11.0
 CFLAGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \
 		-DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \
 		-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"

Modified: projects/camlock/lib/libc/gen/getutxent.c
==============================================================================
--- projects/camlock/lib/libc/gen/getutxent.c	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/lib/libc/gen/getutxent.c	Tue Oct 15 18:07:23 2013	(r256554)
@@ -122,9 +122,20 @@ getfutxent(struct futx *fu)
 	if (udb == UTXDB_LOG) {
 		uint16_t len;
 
+retry:
 		if (fread(&len, sizeof(len), 1, uf) != 1)
 			return (-1);
 		len = be16toh(len);
+		if (len == 0) {
+			/*
+			 * XXX: Though zero-size records are valid in theory,
+			 * they can never occur in practice. Zero-size records
+			 * indicate file corruption. Seek one byte forward, to
+			 * see if we can find a record there.
+			 */
+			ungetc('\0', uf);
+			goto retry;
+		}
 		if (len > sizeof *fu) {
 			/* Forward compatibility. */
 			if (fread(fu, sizeof(*fu), 1, uf) != 1)

Modified: projects/camlock/lib/libcrypt/tests/crypt_tests.c
==============================================================================
--- projects/camlock/lib/libcrypt/tests/crypt_tests.c	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/lib/libcrypt/tests/crypt_tests.c	Tue Oct 15 18:07:23 2013	(r256554)
@@ -43,7 +43,7 @@ ATF_TC_BODY(invalid, tc)
 
 /*
  * This function must not do anything except enumerate
- * the test cases, else atf-run is likely to be upset.
+ * the test cases, per atf-c-api(3).
  */
 ATF_TP_ADD_TCS(tp)
 {

Modified: projects/camlock/lib/libyaml/Makefile
==============================================================================
--- projects/camlock/lib/libyaml/Makefile	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/lib/libyaml/Makefile	Tue Oct 15 18:07:23 2013	(r256554)
@@ -2,15 +2,13 @@
 
 LIBYAML=	${.CURDIR}/../../contrib/libyaml
 
-LIB=		bsdyml
-SHLIB_MAJOR=	0
-INCS=		bsdyml.h
+LIB=		yaml
+PRIVATELIB=	true
+SHLIB_MAJOR=	1
 SRCS=		api.c dumper.c emitter.c loader.c \
 		parser.c reader.c scanner.c writer.c
-MAN=		libbsdyml.3
 
 .PATH:		${LIBYAML}/src ${LIBYAML}/include
-CLEANFILES=	bsdyml.h
 
 WARNS?=		1
 CFLAGS+=	-I${LIBYAML}/include \
@@ -18,7 +16,4 @@ CFLAGS+=	-I${LIBYAML}/include \
 		-I${.CURDIR} \
 		-DHAVE_CONFIG_H
 
-bsdyml.h: yaml.h
-	cp -f ${.ALLSRC} ${.TARGET}
-
 .include <bsd.lib.mk>

Modified: projects/camlock/release/Makefile
==============================================================================
--- projects/camlock/release/Makefile	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/release/Makefile	Tue Oct 15 18:07:23 2013	(r256554)
@@ -122,7 +122,8 @@ system: packagesystem
 # Install system
 	mkdir -p release
 	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
-	    DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1
+		DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \
+		WITHOUT_PROFILE=1
 # Copy distfiles
 	mkdir -p release/usr/freebsd-dist
 	cp *.txz MANIFEST release/usr/freebsd-dist

Modified: projects/camlock/sbin/camcontrol/modeedit.c
==============================================================================
--- projects/camlock/sbin/camcontrol/modeedit.c	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/sbin/camcontrol/modeedit.c	Tue Oct 15 18:07:23 2013	(r256554)
@@ -886,12 +886,12 @@ mode_list(struct cam_device *device, int
 	    timeout, data, sizeof(data));
 
 	mh = (struct scsi_mode_header_6 *)data;
-	len = mh->blk_desc_len;		/* Skip block descriptors. */
+	len = sizeof(*mh) + mh->blk_desc_len;	/* Skip block descriptors. */
 	/* Iterate through the pages in the reply. */
 	while (len < mh->data_length) {
 		/* Locate the next mode page header. */
 		mph = (struct scsi_mode_page_header *)
-		    ((intptr_t)mh + sizeof(*mh) + len);
+		    ((intptr_t)mh + len);
 
 		mph->page_code &= SMS_PAGE_CODE;
 		nameentry = nameentry_lookup(mph->page_code);

Modified: projects/camlock/sbin/iscontrol/iscsi.conf.5
==============================================================================
--- projects/camlock/sbin/iscontrol/iscsi.conf.5	Tue Oct 15 18:06:33 2013	(r256553)
+++ projects/camlock/sbin/iscontrol/iscsi.conf.5	Tue Oct 15 18:07:23 2013	(r256554)
@@ -24,18 +24,20 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 5, 2007
+.Dd October 10, 2013
 .Dt ISCSI.CONF 5
 .Os
 .Sh NAME
 .Nm iscsi.conf
-.Nd key options to be negotiated in an iSCSI session
+.Nd iSCSI initiator configuration file
 .Sh DESCRIPTION
 The file
 .Nm ,
-is read by the
+is used by the
+.Xr iscsictl 8
+and
 .Xr iscontrol 8
-program.
+utilities.
 It contains declarations and parameter/key-options.
 The syntax is very simple,
 .D1 Li variable = value;
@@ -69,9 +71,6 @@ Default is none.
 .It Cm DataDigest
 same as for HeaderDigest, but on the data part of the iSCSI PDU.
 (not yet tested)
-.It Cm MaxConnections
-is the number of simultaneous connections per session,
-currently only 1.

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

More information about the svn-src-projects mailing list