svn commit: r272229 - in projects/bhyve_svm: . bin/sh cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libdtrace/common cddl/usr.sbin contrib/apr-...

Neel Natu neel at FreeBSD.org
Sat Sep 27 22:15:59 UTC 2014 

Author: neel
Date: Sat Sep 27 22:15:50 2014
New Revision: 272229
URL: http://svnweb.freebsd.org/changeset/base/272229

Log:
  IFC @r272185

Added:
  projects/bhyve_svm/contrib/llvm/patches/patch-r269387-clang-arm-target-cpu.diff
     - copied unchanged from r272185, head/contrib/llvm/patches/patch-r269387-clang-arm-target-cpu.diff
  projects/bhyve_svm/contrib/llvm/patches/patch-r271024-llvm-r216989-r216990-fix-movw-armv6.diff
     - copied unchanged from r272185, head/contrib/llvm/patches/patch-r271024-llvm-r216989-r216990-fix-movw-armv6.diff
  projects/bhyve_svm/contrib/llvm/patches/patch-r271597-clang-r217410-i386-garbage-float.diff
     - copied unchanged from r272185, head/contrib/llvm/patches/patch-r271597-clang-r217410-i386-garbage-float.diff
  projects/bhyve_svm/contrib/pjdfstest/
     - copied from r272185, head/contrib/pjdfstest/
  projects/bhyve_svm/games/primes/spsp.c
     - copied unchanged from r272185, head/games/primes/spsp.c
  projects/bhyve_svm/lib/libproc/tests/
     - copied from r272185, head/lib/libproc/tests/
  projects/bhyve_svm/share/man/man4/ipheth.4
     - copied unchanged from r272185, head/share/man/man4/ipheth.4
  projects/bhyve_svm/share/man/man4/man4.arm/cgem.4
     - copied unchanged from r272185, head/share/man/man4/man4.arm/cgem.4
  projects/bhyve_svm/share/man/man4/smsc.4
     - copied unchanged from r272185, head/share/man/man4/smsc.4
  projects/bhyve_svm/sys/arm/samsung/s3c2xx0/
     - copied from r272185, head/sys/arm/samsung/s3c2xx0/
  projects/bhyve_svm/sys/dev/alpm/
     - copied from r272185, head/sys/dev/alpm/
  projects/bhyve_svm/sys/dev/amdpm/
     - copied from r272185, head/sys/dev/amdpm/
  projects/bhyve_svm/sys/dev/amdsmb/
     - copied from r272185, head/sys/dev/amdsmb/
  projects/bhyve_svm/sys/dev/dwc/
     - copied from r272185, head/sys/dev/dwc/
  projects/bhyve_svm/sys/dev/fdc/fdc_cbus.c
     - copied unchanged from r272185, head/sys/dev/fdc/fdc_cbus.c
  projects/bhyve_svm/sys/dev/intpm/
     - copied from r272185, head/sys/dev/intpm/
  projects/bhyve_svm/sys/dev/ncr/
     - copied from r272185, head/sys/dev/ncr/
  projects/bhyve_svm/sys/dev/nfsmb/
     - copied from r272185, head/sys/dev/nfsmb/
  projects/bhyve_svm/sys/dev/viapm/
     - copied from r272185, head/sys/dev/viapm/
  projects/bhyve_svm/sys/modules/ncr/
     - copied from r272185, head/sys/modules/ncr/
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/mlx4_stats.h
     - copied unchanged from r272185, head/sys/ofed/drivers/net/mlx4/mlx4_stats.h
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/utils.c
     - copied unchanged from r272185, head/sys/ofed/drivers/net/mlx4/utils.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/utils.h
     - copied unchanged from r272185, head/sys/ofed/drivers/net/mlx4/utils.h
  projects/bhyve_svm/usr.bin/mkimg/qcow.c
     - copied unchanged from r272185, head/usr.bin/mkimg/qcow.c
  projects/bhyve_svm/usr.bin/mkimg/tests/
     - copied from r272185, head/usr.bin/mkimg/tests/
Deleted:
  projects/bhyve_svm/contrib/llvm/patches/patch-r271024-llvm-r216989-fix-movm-armv6.diff
  projects/bhyve_svm/lib/libproc/test/
  projects/bhyve_svm/sys/arm/s3c2xx0/
  projects/bhyve_svm/sys/pc98/cbus/fdc.c
  projects/bhyve_svm/sys/pc98/cbus/fdc_cbus.c
  projects/bhyve_svm/sys/pc98/cbus/fdcreg.h
  projects/bhyve_svm/sys/pc98/cbus/fdcvar.h
  projects/bhyve_svm/sys/pci/
  projects/bhyve_svm/tools/regression/pjdfstest/
Modified:
  projects/bhyve_svm/Makefile.inc1
  projects/bhyve_svm/ObsoleteFiles.inc
  projects/bhyve_svm/UPDATING
  projects/bhyve_svm/bin/sh/sh.1
  projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
  projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
  projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  projects/bhyve_svm/cddl/usr.sbin/Makefile
  projects/bhyve_svm/contrib/apr-util/CHANGES
  projects/bhyve_svm/contrib/apr-util/NOTICE
  projects/bhyve_svm/contrib/apr-util/apr-util.spec
  projects/bhyve_svm/contrib/apr-util/configure
  projects/bhyve_svm/contrib/apr-util/crypto/apr_crypto.c
  projects/bhyve_svm/contrib/apr-util/crypto/apr_passwd.c
  projects/bhyve_svm/contrib/apr-util/dbd/apr_dbd_mysql.c
  projects/bhyve_svm/contrib/apr-util/dbd/apr_dbd_odbc.c
  projects/bhyve_svm/contrib/apr-util/dbm/NWGNUmakefile
  projects/bhyve_svm/contrib/apr-util/include/apu_version.h
  projects/bhyve_svm/contrib/apr-util/test/Makefile.win
  projects/bhyve_svm/contrib/atf/FREEBSD-upgrade
  projects/bhyve_svm/contrib/atf/atf-c++/atf-c++-api.3
  projects/bhyve_svm/contrib/atf/atf-c/atf-c-api.3
  projects/bhyve_svm/contrib/atf/atf-sh/atf-check.1
  projects/bhyve_svm/contrib/atf/atf-sh/atf-sh-api.3
  projects/bhyve_svm/contrib/atf/atf-sh/atf-sh.1
  projects/bhyve_svm/contrib/atf/doc/atf-test-case.4
  projects/bhyve_svm/contrib/atf/doc/atf-test-program.1
  projects/bhyve_svm/contrib/hyperv/tools/hv_kvp_daemon.c
  projects/bhyve_svm/contrib/ipfilter/lib/gethost.c
  projects/bhyve_svm/contrib/ipfilter/lib/printnat.c
  projects/bhyve_svm/contrib/ipfilter/tools/ipf_y.y
  projects/bhyve_svm/contrib/ipfilter/tools/ipnat_y.y
  projects/bhyve_svm/contrib/llvm/patches/patch-r270147-llvm-r197824-r213427-r213960.diff
  projects/bhyve_svm/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff
  projects/bhyve_svm/contrib/llvm/patches/patch-r271432-clang-r205331-debug-info-crash.diff
  projects/bhyve_svm/contrib/ofed/libibverbs/examples/asyncwatch.c
  projects/bhyve_svm/contrib/ofed/libibverbs/examples/device_list.c
  projects/bhyve_svm/contrib/ofed/libibverbs/examples/devinfo.c
  projects/bhyve_svm/contrib/ofed/libmlx4/src/mlx4-abi.h
  projects/bhyve_svm/etc/defaults/periodic.conf
  projects/bhyve_svm/etc/motd
  projects/bhyve_svm/etc/mtree/BSD.tests.dist
  projects/bhyve_svm/etc/rc.d/Makefile
  projects/bhyve_svm/etc/rc.d/syscons
  projects/bhyve_svm/games/factor/factor.6
  projects/bhyve_svm/games/primes/Makefile
  projects/bhyve_svm/games/primes/primes.c
  projects/bhyve_svm/games/primes/primes.h
  projects/bhyve_svm/lib/libnv/nv.3
  projects/bhyve_svm/lib/libproc/Makefile
  projects/bhyve_svm/lib/libproc/proc_sym.c
  projects/bhyve_svm/lib/libthr/libthr.3
  projects/bhyve_svm/lib/libthr/thread/thr_init.c
  projects/bhyve_svm/lib/msun/src/e_lgamma_r.c
  projects/bhyve_svm/release/doc/en_US.ISO8859-1/hardware/article.xml
  projects/bhyve_svm/sbin/ping6/Makefile
  projects/bhyve_svm/sbin/ping6/ping6.c
  projects/bhyve_svm/sbin/routed/defs.h
  projects/bhyve_svm/sbin/routed/input.c
  projects/bhyve_svm/sbin/routed/main.c
  projects/bhyve_svm/sbin/routed/output.c
  projects/bhyve_svm/sbin/routed/routed.8
  projects/bhyve_svm/sbin/sysctl/sysctl.c
  projects/bhyve_svm/share/man/man4/Makefile
  projects/bhyve_svm/share/man/man4/ada.4
  projects/bhyve_svm/share/man/man4/cdce.4
  projects/bhyve_svm/share/man/man4/man4.arm/Makefile
  projects/bhyve_svm/share/man/man4/miibus.4
  projects/bhyve_svm/share/man/man4/urndis.4
  projects/bhyve_svm/share/man/man9/Makefile
  projects/bhyve_svm/share/man/man9/sleepqueue.9
  projects/bhyve_svm/share/misc/committers-src.dot
  projects/bhyve_svm/share/mk/bsd.progs.mk
  projects/bhyve_svm/sys/Makefile
  projects/bhyve_svm/sys/amd64/amd64/fpu.c
  projects/bhyve_svm/sys/amd64/amd64/machdep.c
  projects/bhyve_svm/sys/amd64/amd64/trap.c
  projects/bhyve_svm/sys/amd64/conf/GENERIC
  projects/bhyve_svm/sys/amd64/conf/NOTES
  projects/bhyve_svm/sys/amd64/vmm/intel/vmx.c
  projects/bhyve_svm/sys/amd64/vmm/io/vlapic.c
  projects/bhyve_svm/sys/amd64/vmm/vmm.c
  projects/bhyve_svm/sys/arm/allwinner/a10_clk.c
  projects/bhyve_svm/sys/arm/altera/socfpga/files.socfpga
  projects/bhyve_svm/sys/arm/arm/machdep.c
  projects/bhyve_svm/sys/arm/arm/mpcore_timer.c
  projects/bhyve_svm/sys/arm/at91/at91rm92reg.h
  projects/bhyve_svm/sys/arm/at91/at91sam9260reg.h
  projects/bhyve_svm/sys/arm/at91/at91sam9g20reg.h
  projects/bhyve_svm/sys/arm/at91/at91sam9g45reg.h
  projects/bhyve_svm/sys/arm/at91/at91sam9x5reg.h
  projects/bhyve_svm/sys/arm/conf/LN2410SBC
  projects/bhyve_svm/sys/arm/conf/NOTES
  projects/bhyve_svm/sys/arm/conf/SOCKIT
  projects/bhyve_svm/sys/boot/efi/include/eficonsctl.h
  projects/bhyve_svm/sys/boot/fdt/dts/arm/socfpga-sockit.dts
  projects/bhyve_svm/sys/boot/fdt/dts/arm/socfpga.dtsi
  projects/bhyve_svm/sys/cam/ctl/ctl.c
  projects/bhyve_svm/sys/cam/ctl/ctl.h
  projects/bhyve_svm/sys/cam/ctl/ctl_cmd_table.c
  projects/bhyve_svm/sys/cam/ctl/ctl_error.c
  projects/bhyve_svm/sys/cam/ctl/ctl_error.h
  projects/bhyve_svm/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/bhyve_svm/sys/cam/ctl/ctl_private.h
  projects/bhyve_svm/sys/compat/freebsd32/freebsd32_misc.c
  projects/bhyve_svm/sys/compat/linux/linux_ioctl.c
  projects/bhyve_svm/sys/compat/linux/linux_mib.c
  projects/bhyve_svm/sys/conf/NOTES
  projects/bhyve_svm/sys/conf/files
  projects/bhyve_svm/sys/conf/files.amd64
  projects/bhyve_svm/sys/conf/files.pc98
  projects/bhyve_svm/sys/conf/options
  projects/bhyve_svm/sys/contrib/ipfilter/netinet/ip_dstlist.c
  projects/bhyve_svm/sys/contrib/ipfilter/netinet/ip_frag.c
  projects/bhyve_svm/sys/ddb/db_main.c
  projects/bhyve_svm/sys/ddb/ddb.h
  projects/bhyve_svm/sys/dev/acpica/acpi.c
  projects/bhyve_svm/sys/dev/acpica/acpi_pci.c
  projects/bhyve_svm/sys/dev/asmc/asmc.c
  projects/bhyve_svm/sys/dev/asmc/asmcvar.h
  projects/bhyve_svm/sys/dev/atkbdc/atkbd.c
  projects/bhyve_svm/sys/dev/bce/if_bce.c
  projects/bhyve_svm/sys/dev/bce/if_bcereg.h
  projects/bhyve_svm/sys/dev/cxgbe/t4_main.c
  projects/bhyve_svm/sys/dev/cxgbe/tom/t4_listen.c
  projects/bhyve_svm/sys/dev/et/if_et.c
  projects/bhyve_svm/sys/dev/fdc/fdc.c
  projects/bhyve_svm/sys/dev/fdc/fdcvar.h
  projects/bhyve_svm/sys/dev/fdt/fdt_common.c
  projects/bhyve_svm/sys/dev/fdt/fdt_common.h
  projects/bhyve_svm/sys/dev/fdt/simplebus.c
  projects/bhyve_svm/sys/dev/ixl/i40e_common.c
  projects/bhyve_svm/sys/dev/ixl/if_ixl.c
  projects/bhyve_svm/sys/dev/ixl/if_ixlv.c
  projects/bhyve_svm/sys/dev/ixl/ixl_txrx.c
  projects/bhyve_svm/sys/dev/jme/if_jme.c
  projects/bhyve_svm/sys/dev/lmc/if_lmc.c
  projects/bhyve_svm/sys/dev/lmc/if_lmc.h
  projects/bhyve_svm/sys/dev/mxge/if_mxge.c
  projects/bhyve_svm/sys/dev/netmap/netmap.c
  projects/bhyve_svm/sys/dev/netmap/netmap_kern.h
  projects/bhyve_svm/sys/dev/oce/oce_if.c
  projects/bhyve_svm/sys/dev/oce/oce_if.h
  projects/bhyve_svm/sys/dev/ofw/ofw_bus_subr.c
  projects/bhyve_svm/sys/dev/ofw/ofw_bus_subr.h
  projects/bhyve_svm/sys/dev/ofw/ofwbus.c
  projects/bhyve_svm/sys/dev/pci/pci.c
  projects/bhyve_svm/sys/dev/pci/pci_private.h
  projects/bhyve_svm/sys/dev/ti/if_ti.c
  projects/bhyve_svm/sys/dev/tws/tws.c
  projects/bhyve_svm/sys/dev/tws/tws.h
  projects/bhyve_svm/sys/dev/tws/tws_cam.c
  projects/bhyve_svm/sys/dev/tws/tws_hdm.c
  projects/bhyve_svm/sys/dev/tws/tws_hdm.h
  projects/bhyve_svm/sys/dev/tws/tws_services.c
  projects/bhyve_svm/sys/dev/txp/if_txp.c
  projects/bhyve_svm/sys/dev/usb/controller/ohci_s3c24x0.c
  projects/bhyve_svm/sys/dev/usb/controller/xhci.c
  projects/bhyve_svm/sys/dev/usb/net/if_smsc.c
  projects/bhyve_svm/sys/dev/usb/usbdevs
  projects/bhyve_svm/sys/dev/vmware/vmxnet3/if_vmx.c
  projects/bhyve_svm/sys/dev/vmware/vmxnet3/if_vmxvar.h
  projects/bhyve_svm/sys/dev/vt/vt_buf.c
  projects/bhyve_svm/sys/dev/vte/if_vte.c
  projects/bhyve_svm/sys/dev/wi/if_wi.c
  projects/bhyve_svm/sys/dev/xen/netfront/netfront.c
  projects/bhyve_svm/sys/fs/autofs/autofs.c
  projects/bhyve_svm/sys/fs/autofs/autofs_vnops.c
  projects/bhyve_svm/sys/fs/devfs/devfs_vnops.c
  projects/bhyve_svm/sys/gnu/fs/reiserfs/reiserfs_fs_i.h
  projects/bhyve_svm/sys/i386/i386/machdep.c
  projects/bhyve_svm/sys/kern/bus_if.m
  projects/bhyve_svm/sys/kern/kern_cons.c
  projects/bhyve_svm/sys/kern/kern_descrip.c
  projects/bhyve_svm/sys/kern/kern_event.c
  projects/bhyve_svm/sys/kern/kern_malloc.c
  projects/bhyve_svm/sys/kern/subr_bus.c
  projects/bhyve_svm/sys/kern/sys_pipe.c
  projects/bhyve_svm/sys/kern/sys_procdesc.c
  projects/bhyve_svm/sys/kern/sys_socket.c
  projects/bhyve_svm/sys/kern/tty_pts.c
  projects/bhyve_svm/sys/kern/uipc_mqueue.c
  projects/bhyve_svm/sys/kern/uipc_sem.c
  projects/bhyve_svm/sys/kern/uipc_shm.c
  projects/bhyve_svm/sys/kern/uipc_sockbuf.c
  projects/bhyve_svm/sys/kern/vfs_syscalls.c
  projects/bhyve_svm/sys/kern/vfs_vnops.c
  projects/bhyve_svm/sys/mips/beri/beri_simplebus.c
  projects/bhyve_svm/sys/mips/mips/machdep.c
  projects/bhyve_svm/sys/modules/Makefile
  projects/bhyve_svm/sys/modules/fdc/Makefile
  projects/bhyve_svm/sys/modules/i2c/controllers/alpm/Makefile
  projects/bhyve_svm/sys/modules/i2c/controllers/amdpm/Makefile
  projects/bhyve_svm/sys/modules/i2c/controllers/amdsmb/Makefile
  projects/bhyve_svm/sys/modules/i2c/controllers/intpm/Makefile
  projects/bhyve_svm/sys/modules/i2c/controllers/nfsmb/Makefile
  projects/bhyve_svm/sys/modules/i2c/controllers/viapm/Makefile
  projects/bhyve_svm/sys/modules/mlx4/Makefile
  projects/bhyve_svm/sys/modules/mlxen/Makefile
  projects/bhyve_svm/sys/modules/netmap/Makefile
  projects/bhyve_svm/sys/net/ieee8023ad_lacp.c
  projects/bhyve_svm/sys/net/ieee8023ad_lacp.h
  projects/bhyve_svm/sys/net/if.c
  projects/bhyve_svm/sys/net/if_gif.c
  projects/bhyve_svm/sys/net/if_gre.c
  projects/bhyve_svm/sys/net/if_gre.h
  projects/bhyve_svm/sys/net/if_lagg.c
  projects/bhyve_svm/sys/net/if_lagg.h
  projects/bhyve_svm/sys/net/if_var.h
  projects/bhyve_svm/sys/net/if_vlan.c
  projects/bhyve_svm/sys/net/route.c
  projects/bhyve_svm/sys/net/route.h
  projects/bhyve_svm/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
  projects/bhyve_svm/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
  projects/bhyve_svm/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
  projects/bhyve_svm/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
  projects/bhyve_svm/sys/netinet/in.c
  projects/bhyve_svm/sys/netinet/ip_gre.c
  projects/bhyve_svm/sys/netinet/ip_ipsec.c
  projects/bhyve_svm/sys/netinet/tcp_input.c
  projects/bhyve_svm/sys/netinet/tcp_output.c
  projects/bhyve_svm/sys/netinet/tcp_subr.c
  projects/bhyve_svm/sys/netinet/tcp_var.h
  projects/bhyve_svm/sys/netinet/toecore.c
  projects/bhyve_svm/sys/netpfil/ipfw/ip_dn_io.c
  projects/bhyve_svm/sys/ofed/drivers/infiniband/hw/mlx4/mad.c
  projects/bhyve_svm/sys/ofed/drivers/infiniband/hw/mlx4/main.c
  projects/bhyve_svm/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
  projects/bhyve_svm/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c
  projects/bhyve_svm/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/alloc.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/catas.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/cmd.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/cq.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/en_cq.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/en_ethtool.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/en_main.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/en_netdev.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/en_port.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/en_port.h
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/en_resources.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/en_rx.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/en_selftest.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/en_tx.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/eq.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/fw.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/fw.h
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/icm.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/icm.h
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/intf.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/main.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/mcg.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/mlx4.h
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/mlx4_en.h
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/mr.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/pd.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/port.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/profile.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/qp.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/reset.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/resource_tracker.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/sense.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/srq.c
  projects/bhyve_svm/sys/ofed/drivers/net/mlx4/sys_tune.c
  projects/bhyve_svm/sys/ofed/include/linux/linux_compat.c
  projects/bhyve_svm/sys/ofed/include/linux/mlx4/cmd.h
  projects/bhyve_svm/sys/ofed/include/linux/mlx4/cq.h
  projects/bhyve_svm/sys/ofed/include/linux/mlx4/device.h
  projects/bhyve_svm/sys/ofed/include/linux/mlx4/driver.h
  projects/bhyve_svm/sys/ofed/include/linux/mlx4/qp.h
  projects/bhyve_svm/sys/ofed/include/linux/mlx4/srq.h
  projects/bhyve_svm/sys/opencrypto/cryptodev.c
  projects/bhyve_svm/sys/pc98/cbus/olpt.c
  projects/bhyve_svm/sys/pc98/cbus/pckbd.c
  projects/bhyve_svm/sys/pc98/pc98/machdep.c
  projects/bhyve_svm/sys/powerpc/aim/locore64.S
  projects/bhyve_svm/sys/powerpc/aim/machdep.c
  projects/bhyve_svm/sys/powerpc/booke/machdep.c
  projects/bhyve_svm/sys/powerpc/ofw/ofw_pcibus.c
  projects/bhyve_svm/sys/powerpc/pseries/vdevice.c
  projects/bhyve_svm/sys/sparc64/sparc64/machdep.c
  projects/bhyve_svm/sys/sys/bus.h
  projects/bhyve_svm/sys/sys/file.h
  projects/bhyve_svm/sys/sys/filedesc.h
  projects/bhyve_svm/sys/sys/ksem.h
  projects/bhyve_svm/sys/sys/mman.h
  projects/bhyve_svm/sys/sys/sleepqueue.h
  projects/bhyve_svm/sys/sys/sockbuf.h
  projects/bhyve_svm/sys/sys/syscallsubr.h
  projects/bhyve_svm/sys/vm/vm_map.c
  projects/bhyve_svm/sys/vm/vm_pageout.c
  projects/bhyve_svm/sys/x86/xen/pv.c
  projects/bhyve_svm/tools/build/mk/OptionalObsoleteFiles.inc
  projects/bhyve_svm/tools/test/dtrace/Makefile
  projects/bhyve_svm/usr.bin/calendar/calendars/calendar.freebsd
  projects/bhyve_svm/usr.bin/grep/regex/tre-fastmatch.c
  projects/bhyve_svm/usr.bin/man/man.1
  projects/bhyve_svm/usr.bin/mkimg/Makefile
  projects/bhyve_svm/usr.bin/xinstall/xinstall.c
  projects/bhyve_svm/usr.sbin/autofs/common.c
  projects/bhyve_svm/usr.sbin/bhyve/smbiostbl.c
  projects/bhyve_svm/usr.sbin/bsdinstall/scripts/services
  projects/bhyve_svm/usr.sbin/newsyslog/newsyslog.8
Directory Properties:
  projects/bhyve_svm/   (props changed)
  projects/bhyve_svm/cddl/   (props changed)
  projects/bhyve_svm/cddl/contrib/opensolaris/   (props changed)
  projects/bhyve_svm/contrib/apr-util/   (props changed)
  projects/bhyve_svm/contrib/atf/   (props changed)
  projects/bhyve_svm/contrib/ipfilter/   (props changed)
  projects/bhyve_svm/contrib/llvm/   (props changed)
  projects/bhyve_svm/etc/   (props changed)
  projects/bhyve_svm/sbin/   (props changed)
  projects/bhyve_svm/share/   (props changed)
  projects/bhyve_svm/share/man/man4/   (props changed)
  projects/bhyve_svm/sys/   (props changed)
  projects/bhyve_svm/sys/amd64/vmm/   (props changed)
  projects/bhyve_svm/sys/boot/   (props changed)
  projects/bhyve_svm/sys/conf/   (props changed)
  projects/bhyve_svm/sys/contrib/ipfilter/   (props changed)
  projects/bhyve_svm/usr.bin/calendar/   (props changed)
  projects/bhyve_svm/usr.bin/mkimg/   (props changed)
  projects/bhyve_svm/usr.sbin/bhyve/   (props changed)

Modified: projects/bhyve_svm/Makefile.inc1
==============================================================================
--- projects/bhyve_svm/Makefile.inc1	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/Makefile.inc1	Sat Sep 27 22:15:50 2014	(r272229)
@@ -911,7 +911,7 @@ packageworld:
 # and do a 'make reinstall' on the *client* to install new binaries from the
 # most recent server build.
 #
-reinstall:
+reinstall: .MAKE
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Making hierarchy"
 	@echo "--------------------------------------------------------------"
@@ -926,7 +926,7 @@ reinstall:
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
 .endif
 
-redistribute:
+redistribute: .MAKE
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Distributing everything"
 	@echo "--------------------------------------------------------------"
@@ -936,7 +936,7 @@ redistribute:
 	    DISTRIBUTION=lib32
 .endif
 
-distrib-dirs distribution:
+distrib-dirs distribution: .MAKE
 	cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
 	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
 
@@ -1464,7 +1464,7 @@ native-xtools: .MAKE
 #
 # hierarchy - ensure that all the needed directories are present
 #
-hierarchy hier:
+hierarchy hier: .MAKE
 	cd ${.CURDIR}/etc && ${HMAKE} distrib-dirs
 
 #

Modified: projects/bhyve_svm/ObsoleteFiles.inc
==============================================================================
--- projects/bhyve_svm/ObsoleteFiles.inc	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/ObsoleteFiles.inc	Sat Sep 27 22:15:50 2014	(r272229)
@@ -38,6 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed
+OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz
+OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz
 # 20140917: hv_kvpd rc.d script removed in favor of devd configuration
 OLD_FILES+=etc/rc.d/hv_kvpd
 # 20140814: libopie version bump

Modified: projects/bhyve_svm/UPDATING
==============================================================================
--- projects/bhyve_svm/UPDATING	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/UPDATING	Sat Sep 27 22:15:50 2014	(r272229)
@@ -31,6 +31,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20140923:
+	pjdfstest has been moved from tools/regression/pjdfstest to
+	contrib/pjdfstest .
+
+20140922:
+	At svn r271982, The default linux compat kernel ABI has been adjusted
+	to 2.6.18 in support of the linux-c6 compat ports infrastructure
+	update.  If you wish to continue using the linux-f10 compat ports,
+	add compat.linux.osrelease=2.6.16 to your local sysctl.conf.  Users are
+	encouraged to update their linux-compat packages to linux-c6 during
+	their next update cycle.
+
 20140729:
 	The ofwfb driver, used to provide a graphics console on PowerPC when
 	using vt(4), no longer allows mmap() of all of physical memory. This

Modified: projects/bhyve_svm/bin/sh/sh.1
==============================================================================
--- projects/bhyve_svm/bin/sh/sh.1	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/bin/sh/sh.1	Sat Sep 27 22:15:50 2014	(r272229)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd September 4, 2014
+.Dd September 21, 2014
 .Dt SH 1
 .Os
 .Sh NAME
@@ -590,7 +590,8 @@ the following actions:
 Leading words of the form
 .Dq Li name=value
 are stripped off and assigned to the environment of
-the simple command.
+the simple command
+(they do not affect expansions).
 Redirection operators and
 their arguments (as described below) are stripped
 off and saved for processing.

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1	Sat Sep 27 22:15:50 2014	(r272229)
@@ -277,6 +277,19 @@ Generate a header file containing macros
 specified provider definitions.
 This option should be used to generate a header file that is included by other
 source files for later use with the
+.Fl G
+option.
+If the
+.Fl o
+option is present, the header file is saved using the pathname specified as the
+argument for that option.
+If the
+.Fl o
+option is not present and the DTrace program is contained within a file whose
+name is
+.Ar filename.d ,
+then the header file is saved using the name
+.Ar filename.h .
 .It Fl H
 Print the pathnames of included files when invoking
 .Xr cpp 1
@@ -289,20 +302,6 @@ option to each
 .Xr cpp 1
 invocation, causing it to display the list of pathnames, one for each line, to
 standard error.
-.Fl G
-option.
-If the
-.Fl o
-option
-is present, the header file is saved using the pathname specified as the
-argument for that option.
-If the
-.Fl o
-option is not present and the DTrace program is contained with a file whose
-name is
-.Ar filename.d ,
-then the header file is saved using the name
-.Ar filename.h .
 .It Fl i Ar probe-id Op Oo Ar predicate Oc Ar action
 Specify probe identifier
 .Ar ( probe-id )

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sat Sep 27 22:15:50 2014	(r272229)
@@ -4524,7 +4524,8 @@ is_root_pool(zpool_handle_t *zhp)
 }
 
 static void
-root_pool_upgrade_check(zpool_handle_t *zhp, char *poolname, int size) {
+root_pool_upgrade_check(zpool_handle_t *zhp, char *poolname, int size)
+{
 
 	if (poolname[0] == '\0' && is_root_pool(zhp))
 		(void) strlcpy(poolname, zpool_get_name(zhp), size);
@@ -4623,7 +4624,7 @@ upgrade_cb(zpool_handle_t *zhp, void *ar
 #ifdef __FreeBSD__
 		root_pool_upgrade_check(zhp, cbp->cb_poolname,
 		    sizeof(cbp->cb_poolname));
-#endif	/* ___FreeBSD__ */
+#endif	/* __FreeBSD__ */
 		printnl = B_TRUE;
 
 #ifdef illumos
@@ -4647,6 +4648,10 @@ upgrade_cb(zpool_handle_t *zhp, void *ar
 		if (count > 0) {
 			cbp->cb_first = B_FALSE;
 			printnl = B_TRUE;
+#ifdef __FreeBSD__
+			root_pool_upgrade_check(zhp, cbp->cb_poolname,
+			    sizeof(cbp->cb_poolname));
+#endif	/* __FreeBSD__ */
 			/*
 			 * If they did "zpool upgrade -a", then we could
 			 * be doing ioctls to different pools.  We need
@@ -4788,7 +4793,7 @@ upgrade_one(zpool_handle_t *zhp, void *d
 #ifdef __FreeBSD__
 		root_pool_upgrade_check(zhp, cbp->cb_poolname,
 		    sizeof(cbp->cb_poolname));
-#endif	/* ___FreeBSD__ */
+#endif	/* __FreeBSD__ */
 	}
 
 	if (cbp->cb_version >= SPA_VERSION_FEATURES) {

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c	Sat Sep 27 22:15:50 2014	(r272229)
@@ -121,12 +121,12 @@ dtrace_dof_init(void)
 #if !defined(sun)
 	Elf *e;
 	Elf_Scn *scn = NULL;
-	Elf_Data *symtabdata = NULL, *dynsymdata = NULL, *dofdata = NULL;
+	Elf_Data *dofdata = NULL;
 	dof_hdr_t *dof_next = NULL;
 	GElf_Shdr shdr;
 	int efd;
 	char *s;
-	size_t shstridx, symtabidx = 0, dynsymidx = 0;
+	size_t shstridx;
 #endif
 
 	if (getenv("DTRACE_DOF_INIT_DISABLE") != NULL)
@@ -166,15 +166,9 @@ dtrace_dof_init(void)
 	dof = NULL;
 	while ((scn = elf_nextscn(e, scn)) != NULL) {
 		gelf_getshdr(scn, &shdr);
-		if (shdr.sh_type == SHT_SYMTAB) {
-			symtabidx = shdr.sh_link;
-			symtabdata = elf_getdata(scn, NULL);
-		} else if (shdr.sh_type == SHT_DYNSYM) {
-			dynsymidx = shdr.sh_link;
-			dynsymdata = elf_getdata(scn, NULL);
-		} else if (shdr.sh_type == SHT_SUNW_dof) {
+		if (shdr.sh_type == SHT_SUNW_dof) {
 			s = elf_strptr(e, shstridx, shdr.sh_name);
-			if  (s != NULL && strcmp(s, ".SUNW_dof") == 0) {
+			if (s != NULL && strcmp(s, ".SUNW_dof") == 0) {
 				dofdata = elf_getdata(scn, NULL);
 				dof = dofdata->d_buf;
 			}

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Sat Sep 27 22:15:50 2014	(r272229)
@@ -1819,7 +1819,6 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 		    "failed to write %s: %s", file, strerror(errno)));
 	}
 #else
-	(void)close(fd);
 	if (status != 0)
 		return (dt_link_error(dtp, NULL, -1, NULL,
 		    "failed to write %s: %s", tfile,

Modified: projects/bhyve_svm/cddl/usr.sbin/Makefile
==============================================================================
--- projects/bhyve_svm/cddl/usr.sbin/Makefile	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/cddl/usr.sbin/Makefile	Sat Sep 27 22:15:50 2014	(r272229)
@@ -5,6 +5,7 @@
 SUBDIR=	${_dtrace} \
 	${_dtruss} \
 	${_lockstat} \
+	${_plockstat} \
 	${_tests} \
 	${_zdb} \
 	${_zhack}
@@ -24,6 +25,9 @@ _zhack=	zhack
 _dtrace=	dtrace
 _dtruss=	dtruss
 _lockstat=	lockstat
+.if defined(WITH_PLOCKSTAT)
+_plockstat=	plockstat
+.endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "mips"

Modified: projects/bhyve_svm/contrib/apr-util/CHANGES
==============================================================================
--- projects/bhyve_svm/contrib/apr-util/CHANGES	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/apr-util/CHANGES	Sat Sep 27 22:15:50 2014	(r272229)
@@ -1,4 +1,30 @@
                                                      -*- coding: utf-8 -*-
+Changes with APR-util 1.5.4
+
+  *) MySQL driver: Fix incorrect handling of bad parameter in the
+     driver support for apr_dbd_transaction_end().  PR 56330.
+     [Weiqiang Li <weiqiang_li hotmail.com>]
+
+  *) apr_crypto_get_driver(): Fix invalid storage reference on error path.
+     [Philip Martin <philip.martin wandisco.com>]
+
+  *) Fix compile failure for Android.  PR 56627.  [Fredrik Fornwall 
+     <fredrik fornwall.net>, Jeff Trawick]
+
+  *) Fix to let ODBC driver build with MSVC6, which does not have intptr_t
+     [Tom Donovan]
+
+  *) Windows cmake build: Fix incompatiblities with Visual Studio
+     generators with all cmake versions, and the NMake Makefile generator
+     with cmake 2.8.12 and later.  PR 56616 and other bugs.  [Jeff Trawick,
+     Bert Huijben]
+
+  *) Fix detection of Berkeley DB 6.0. PR 55277.
+     [Lars Wendler <polynomial-c gentoo.org>]
+
+  *) Improve platform detection for bundled expat by updating
+     config.guess and config.sub. [Rainer Jung]
+
 Changes with APR-util 1.5.3
 
   *) Cygwin: Use correct file extension when loading APR DSOs.  PR 55587.

Modified: projects/bhyve_svm/contrib/apr-util/NOTICE
==============================================================================
--- projects/bhyve_svm/contrib/apr-util/NOTICE	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/apr-util/NOTICE	Sat Sep 27 22:15:50 2014	(r272229)
@@ -1,7 +1,7 @@
 Apache Portable Runtime Utility Library
-Copyright (c) 2011 The Apache Software Foundation.
+Copyright (c) 2000-2014 The Apache Software Foundation.
 
-This product includes software developed by
+This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 Portions of this software were developed at the National Center

Modified: projects/bhyve_svm/contrib/apr-util/apr-util.spec
==============================================================================
--- projects/bhyve_svm/contrib/apr-util/apr-util.spec	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/apr-util/apr-util.spec	Sat Sep 27 22:15:50 2014	(r272229)
@@ -3,7 +3,7 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.5.3
+Version: 1.5.4
 Release: 1
 License: Apache Software License
 Group: System Environment/Libraries

Modified: projects/bhyve_svm/contrib/apr-util/configure
==============================================================================
--- projects/bhyve_svm/contrib/apr-util/configure	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/apr-util/configure	Sat Sep 27 22:15:50 2014	(r272229)
@@ -11608,19 +11608,34 @@ fi
   apu_db_version=0
 
   # Maximum supported version announced in help string.
-  # Although we search for all versions up to 5.9,
+  # Although we search for all versions up to 6.9,
   # we should only include existing versions in our
   # help string.
-  db_max_version=53
-  db_min_version=41
   dbm_list="sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4"
+  db_max_version=48
+  db_min_version=41
+  db_version="$db_min_version"
+  while [ $db_version -le $db_max_version ]
+  do
+    dbm_list="$dbm_list, db$db_version"
+    db_version=`expr $db_version + 1`
+  done
+  db_max_version=53
+  db_min_version=50
+  db_version="$db_min_version"
+  while [ $db_version -le $db_max_version ]
+  do
+    dbm_list="$dbm_list, db$db_version"
+    db_version=`expr $db_version + 1`
+  done
+  db_max_version=60
+  db_min_version=60
   db_version="$db_min_version"
   while [ $db_version -le $db_max_version ]
   do
     dbm_list="$dbm_list, db$db_version"
     db_version=`expr $db_version + 1`
   done
-  dbm_list="$dbm_list, db60"
 
 
 # Check whether --with-dbm was given.
@@ -12093,8 +12108,8 @@ if test "${with_berkeley_db+set}" = set;
 
   all_places="$check_places"
 
-  # Start version search at version 5.9
-  db_version=59
+  # Start version search at version 6.9
+  db_version=69
   while [ $db_version -ge 40 ]
   do
     db_major=`echo $db_version | sed -e 's/.$//'`
@@ -12178,7 +12193,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5"; then
+          if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5" -o ""${db_major}"" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -12580,7 +12595,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "3" = "3" -o "3" = "4" -o "3" = "5"; then
+          if test "3" = "3" -o "3" = "4" -o "3" = "5" -o "3" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -12978,7 +12993,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "2" = "3" -o "2" = "4" -o "2" = "5"; then
+          if test "2" = "3" -o "2" = "4" -o "2" = "5" -o "2" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -13376,7 +13391,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "1" = "3" -o "1" = "4" -o "1" = "5"; then
+          if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -13774,7 +13789,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "1" = "3" -o "1" = "4" -o "1" = "5"; then
+          if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -14186,7 +14201,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "1" = "3" -o "1" = "4" -o "1" = "5"; then
+          if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -14587,7 +14602,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "1" = "3" -o "1" = "4" -o "1" = "5"; then
+          if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -14988,7 +15003,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "2" = "3" -o "2" = "4" -o "2" = "5"; then
+          if test "2" = "3" -o "2" = "4" -o "2" = "5" -o "2" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -15389,7 +15404,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "3" = "3" -o "3" = "4" -o "3" = "5"; then
+          if test "3" = "3" -o "3" = "4" -o "3" = "5" -o "3" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -15794,7 +15809,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5"; then
+          if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5" -o ""${db_major}"" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -16202,7 +16217,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5"; then
+          if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5" -o ""${db_major}"" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -16534,8 +16549,8 @@ fi
 
   all_places="$check_places"
 
-  # Start version search at version 5.9
-  db_version=59
+  # Start version search at version 6.9
+  db_version=69
   while [ $db_version -ge 40 ]
   do
     db_major=`echo $db_version | sed -e 's/.$//'`
@@ -16619,7 +16634,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5"; then
+          if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5" -o ""${db_major}"" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -17021,7 +17036,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "3" = "3" -o "3" = "4" -o "3" = "5"; then
+          if test "3" = "3" -o "3" = "4" -o "3" = "5" -o "3" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -17419,7 +17434,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "2" = "3" -o "2" = "4" -o "2" = "5"; then
+          if test "2" = "3" -o "2" = "4" -o "2" = "5" -o "2" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -17817,7 +17832,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "1" = "3" -o "1" = "4" -o "1" = "5"; then
+          if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -18215,7 +18230,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "1" = "3" -o "1" = "4" -o "1" = "5"; then
+          if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of

Modified: projects/bhyve_svm/contrib/apr-util/crypto/apr_crypto.c
==============================================================================
--- projects/bhyve_svm/contrib/apr-util/crypto/apr_crypto.c	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/apr-util/crypto/apr_crypto.c	Sat Sep 27 22:15:50 2014	(r272229)
@@ -204,7 +204,7 @@ APU_DECLARE(apr_status_t) apr_crypto_get
         if (err && buffer) {
             apr_dso_error(dso, buffer, ERROR_SIZE - 1);
             err->msg = buffer;
-            err->reason = modname;
+            err->reason = apr_pstrdup(pool, modname);
             *result = err;
         }
     }

Modified: projects/bhyve_svm/contrib/apr-util/crypto/apr_passwd.c
==============================================================================
--- projects/bhyve_svm/contrib/apr-util/crypto/apr_passwd.c	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/apr-util/crypto/apr_passwd.c	Sat Sep 27 22:15:50 2014	(r272229)
@@ -66,6 +66,12 @@ static void crypt_mutex_unlock(void)
 #endif
 #endif
 
+#if defined(WIN32) || defined(BEOS) || defined(NETWARE) || defined(__ANDROID__)
+#define CRYPT_MISSING 1
+#else
+#define CRYPT_MISSING 0
+#endif
+
 /*
  * Validate a plaintext password against a smashed one.  Uses either
  * crypt() (if available) or apr_md5_encode() or apr_sha1_base64(), depending
@@ -77,7 +83,7 @@ APU_DECLARE(apr_status_t) apr_password_v
                                                 const char *hash)
 {
     char sample[200];
-#if !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+#if !CRYPT_MISSING
     char *crypt_pw;
 #endif
     if (hash[0] == '$'
@@ -100,7 +106,7 @@ APU_DECLARE(apr_status_t) apr_password_v
         /*
          * It's not our algorithm, so feed it to crypt() if possible.
          */
-#if defined(WIN32) || defined(BEOS) || defined(NETWARE)
+#if CRYPT_MISSING
         return (strcmp(passwd, hash) == 0) ? APR_SUCCESS : APR_EMISMATCH;
 #elif defined(CRYPT_R_CRYPTD)
         apr_status_t rv;

Modified: projects/bhyve_svm/contrib/apr-util/dbd/apr_dbd_mysql.c
==============================================================================
--- projects/bhyve_svm/contrib/apr-util/dbd/apr_dbd_mysql.c	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/apr-util/dbd/apr_dbd_mysql.c	Sat Sep 27 22:15:50 2014	(r272229)
@@ -1050,9 +1050,9 @@ static int dbd_mysql_end_transaction(apr
         else {
             ret = mysql_commit(trans->handle->conn);
         }
+        ret |= mysql_autocommit(trans->handle->conn, 1);
+        trans->handle->trans = NULL;
     }
-    ret |= mysql_autocommit(trans->handle->conn, 1);
-    trans->handle->trans = NULL;
     return ret;
 }
 /* Whether or not transactions work depends on whether the

Modified: projects/bhyve_svm/contrib/apr-util/dbd/apr_dbd_odbc.c
==============================================================================
--- projects/bhyve_svm/contrib/apr-util/dbd/apr_dbd_odbc.c	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/apr-util/dbd/apr_dbd_odbc.c	Sat Sep 27 22:15:50 2014	(r272229)
@@ -47,6 +47,21 @@
 #include <odbc/sqlext.h>
 #endif
 
+/*
+* MSVC6 does not support intptr_t (C99)
+* APR does not have a signed inptr type until 2.0  (r1557720)
+*/
+#if defined(_MSC_VER) && _MSC_VER < 1400
+#if APR_SIZEOF_VOIDP == 8
+#define   ODBC_INTPTR_T  apr_int64_t
+#else
+#define   ODBC_INTPTR_T  apr_int32_t
+#endif
+#else
+#define   ODBC_INTPTR_T  intptr_t
+#endif
+
+
 /* Driver name is "odbc" and the entry point is 'apr_dbd_odbc_driver' 
  * unless ODBC_DRIVER_NAME is defined and it is linked with another db library which
  * is ODBC source-compatible. e.g. DB2, Informix, TimesTen, mysql.  
@@ -114,9 +129,9 @@ struct apr_dbd_t
     char lastError[MAX_ERROR_STRING];
     int defaultBufferSize;      /* used for CLOBs in text mode, 
                                  * and when fld size is indeterminate */
-    intptr_t transaction_mode;
-    intptr_t dboptions;         /* driver options re SQLGetData */
-    intptr_t default_transaction_mode;
+    ODBC_INTPTR_T transaction_mode;
+    ODBC_INTPTR_T dboptions;         /* driver options re SQLGetData */
+    ODBC_INTPTR_T default_transaction_mode;
     int can_commit;             /* controls end_trans behavior */
 };
 
@@ -359,7 +374,7 @@ static SQLRETURN odbc_set_result_column(
                                         SQLHANDLE stmt)
 {
     SQLRETURN rc;
-    intptr_t maxsize, textsize, realsize, type, isunsigned = 1;
+    ODBC_INTPTR_T maxsize, textsize, realsize, type, isunsigned = 1;
 
     /* discover the sql type */
     rc = SQLColAttribute(stmt, icol + 1, SQL_DESC_UNSIGNED, NULL, 0, NULL,
@@ -747,7 +762,7 @@ static void *odbc_get(const apr_dbd_row_
     SQLRETURN rc;
     SQLLEN indicator;
     int state = row->res->colstate[col];
-    intptr_t options = row->res->apr_dbd->dboptions;
+    ODBC_INTPTR_T options = row->res->apr_dbd->dboptions;
 
     switch (state) {
     case (COL_UNAVAIL):
@@ -817,13 +832,13 @@ static apr_status_t odbc_parse_params(ap
                                int *connect, SQLCHAR **datasource, 
                                SQLCHAR **user, SQLCHAR **password, 
                                int *defaultBufferSize, int *nattrs,
-                               int **attrs, intptr_t **attrvals)
+                               int **attrs, ODBC_INTPTR_T **attrvals)
 {
     char *seps, *last, *next, *name[MAX_PARAMS], *val[MAX_PARAMS];
     int nparams = 0, i, j;
 
     *attrs = apr_pcalloc(pool, MAX_PARAMS * sizeof(char *));
-    *attrvals = apr_pcalloc(pool, MAX_PARAMS * sizeof(intptr_t));
+    *attrvals = apr_pcalloc(pool, MAX_PARAMS * sizeof(ODBC_INTPTR_T));
     *nattrs = 0;
     seps = DEFAULTSEPS;
     name[nparams] = apr_strtok(apr_pstrdup(pool, params), seps, &last);
@@ -1063,7 +1078,7 @@ static apr_dbd_t *odbc_open(apr_pool_t *
     SQLCHAR  *datasource = (SQLCHAR *)"", *user = (SQLCHAR *)"",
              *password = (SQLCHAR *)"";
     int nattrs = 0, *attrs = NULL,  connect = 0;
-    intptr_t *attrvals = NULL;
+    ODBC_INTPTR_T *attrvals = NULL;
 
     err_step = "SQLAllocHandle (SQL_HANDLE_DBC)";
     err_htype = SQL_HANDLE_ENV;
@@ -1117,10 +1132,10 @@ static apr_dbd_t *odbc_open(apr_pool_t *
         handle->default_transaction_mode = 0;
         handle->can_commit = APR_DBD_TRANSACTION_IGNORE_ERRORS;
         SQLGetInfo(hdbc, SQL_DEFAULT_TXN_ISOLATION,
-                   &(handle->default_transaction_mode), sizeof(intptr_t), NULL);
+                   &(handle->default_transaction_mode), sizeof(ODBC_INTPTR_T), NULL);
         handle->transaction_mode = handle->default_transaction_mode;
         SQLGetInfo(hdbc, SQL_GETDATA_EXTENSIONS ,&(handle->dboptions),
-                   sizeof(intptr_t), NULL);
+                   sizeof(ODBC_INTPTR_T), NULL);
         apr_pool_cleanup_register(pool, handle, odbc_close_cleanup, apr_pool_cleanup_null);
         return handle;
     }

Modified: projects/bhyve_svm/contrib/apr-util/dbm/NWGNUmakefile
==============================================================================
--- projects/bhyve_svm/contrib/apr-util/dbm/NWGNUmakefile	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/apr-util/dbm/NWGNUmakefile	Sat Sep 27 22:15:50 2014	(r272229)
@@ -235,7 +235,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms $(INSTDIRS) FORCE
-	copy $(OBJDIR)\*.nlm $(INSTALLBASE)
+	$(call COPY,$(OBJDIR)/*.nlm,$(INSTALLBASE))
 
 #
 # Any specialized rules here

Modified: projects/bhyve_svm/contrib/apr-util/include/apu_version.h
==============================================================================
--- projects/bhyve_svm/contrib/apr-util/include/apu_version.h	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/apr-util/include/apu_version.h	Sat Sep 27 22:15:50 2014	(r272229)
@@ -38,7 +38,7 @@
  */
 
 
-#define APU_COPYRIGHT "Copyright (c) 2013 The Apache Software " \
+#define APU_COPYRIGHT "Copyright (c) 2000-2014 The Apache Software " \
                       "Foundation or its licensors, as applicable."
 
 /* The numeric compile-time version constants. These constants are the
@@ -62,7 +62,7 @@
  * The Patch Level never includes API changes, simply bug fixes.
  * Reset to 0 when upgrading APR_MINOR_VERSION
  */
-#define APU_PATCH_VERSION       3
+#define APU_PATCH_VERSION       4
 
 /** 
  * The symbol APU_IS_DEV_VERSION is only defined for internal,

Modified: projects/bhyve_svm/contrib/apr-util/test/Makefile.win
==============================================================================
--- projects/bhyve_svm/contrib/apr-util/test/Makefile.win	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/apr-util/test/Makefile.win	Sat Sep 27 22:15:50 2014	(r272229)
@@ -88,6 +88,8 @@ APROUTDIR=$(OUTDIR)
 !IF "$(MODEL)" == "static"
 PROGRAM_DEPENDENCIES = \
 	$(APR_PATH)\$(APROUTDIR)\apr-1.lib \
+	$(API_PATH)\$(OUTDIR)\apriconv-1.lib \
+	..\xml\expat\lib\$(OUTDIR)\xml.lib \
 	..\$(OUTDIR)\aprutil-1.lib 
 STATIC_CFLAGS = /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC
 STATIC_LIBS = odbc32.lib odbccp32.lib wldap32.lib 

Modified: projects/bhyve_svm/contrib/atf/FREEBSD-upgrade
==============================================================================
--- projects/bhyve_svm/contrib/atf/FREEBSD-upgrade	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/atf/FREEBSD-upgrade	Sat Sep 27 22:15:50 2014	(r272229)
@@ -7,10 +7,9 @@ branches and you are supposed to follow 
 
 	http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html
 
-The ATF source code is hosted on Google Code as a subcomponent of the
-Kyua project:
+The ATF source code is hosted on GitHub:
 
-	http://code.google.com/p/kyua/downloads/list
+	https://github.com/jmmv/atf
 
 and is imported into the atf vendor branch (see base/vendor/atf/).
 
@@ -42,7 +41,7 @@ the vendor branch as you easily risk com
 tree.
 
 Lastly, with the list of old and new files in this import, make sure
-to udpate the reachover Makefiles accordingly.
+to update the reachover Makefiles accordingly.
 
 Test the build (keeping in mind the WITH_TESTS/WITHOUT_TESTS knobs) and,
 if all looks good, you are ready to commit all the changes in one go.

Modified: projects/bhyve_svm/contrib/atf/atf-c++/atf-c++-api.3
==============================================================================
--- projects/bhyve_svm/contrib/atf/atf-c++/atf-c++-api.3	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/atf/atf-c++/atf-c++-api.3	Sat Sep 27 22:15:50 2014	(r272229)
@@ -26,7 +26,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 15, 2013
+.Dd March 2, 2014
 .Dt ATF-C++-API 3
 .Os
 .Sh NAME
@@ -330,9 +330,8 @@ If
 .Va exitcode
 is not
 .Sq -1 ,
-.Xr atf-run 1
-will validate that the exit code of the test case matches the one provided
-in this call.
+the runtime engine will validate that the exit code of the test case
+matches the one provided in this call.
 Otherwise, the exact value will be ignored.
 .It Fn expect_fail "reason"
 Any failure (be it fatal or non-fatal) raised in this mode is recorded.
@@ -368,9 +367,8 @@ If
 .Va signo
 is not
 .Sq -1 ,
-.Xr atf-run 1
-will validate that the signal that terminated the test case matches the one
-provided in this call.
+the runtime engine will validate that the signal that terminated the test
+case matches the one provided in this call.
 Otherwise, the exact value will be ignored.
 .It Fn expect_timeout "reason"
 Expects the test case to execute for longer than its timeout.
@@ -631,5 +629,4 @@ ATF_INIT_TEST_CASES(tcs)
 .Ed
 .Sh SEE ALSO
 .Xr atf-test-program 1 ,
-.Xr atf-test-case 4 ,
-.Xr atf 7
+.Xr atf-test-case 4

Modified: projects/bhyve_svm/contrib/atf/atf-c/atf-c-api.3
==============================================================================
--- projects/bhyve_svm/contrib/atf/atf-c/atf-c-api.3	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/atf/atf-c/atf-c-api.3	Sat Sep 27 22:15:50 2014	(r272229)
@@ -26,7 +26,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 15, 2013
+.Dd March 2, 2014
 .Dt ATF-C-API 3
 .Os
 .Sh NAME
@@ -409,9 +409,8 @@ If
 .Va exitcode
 is not
 .Sq -1 ,
-.Xr atf-run 1
-will validate that the exit code of the test case matches the one provided
-in this call.
+the runtime engine will validate that the exit code of the test case
+matches the one provided in this call.
 Otherwise, the exact value will be ignored.
 .It Fn atf_tc_expect_fail "reason" "..."
 Any failure (be it fatal or non-fatal) raised in this mode is recorded.
@@ -443,9 +442,8 @@ If
 .Va signo
 is not
 .Sq -1 ,
-.Xr atf-run 1
-will validate that the signal that terminated the test case matches the one
-provided in this call.
+the runtime engine will validate that the signal that terminated the test
+case matches the one provided in this call.
 Otherwise, the exact value will be ignored.
 .It Fn atf_tc_expect_timeout "reason" "..."
 Expects the test case to execute for longer than its timeout.
@@ -771,5 +769,4 @@ ATF_TP_ADD_TCS(tp)
 .Ed
 .Sh SEE ALSO
 .Xr atf-test-program 1 ,
-.Xr atf-test-case 4 ,
-.Xr atf 7
+.Xr atf-test-case 4

Modified: projects/bhyve_svm/contrib/atf/atf-sh/atf-check.1
==============================================================================
--- projects/bhyve_svm/contrib/atf/atf-sh/atf-check.1	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/atf/atf-sh/atf-check.1	Sat Sep 27 22:15:50 2014	(r272229)
@@ -26,7 +26,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 27, 2010
+.Dd March 2, 2014
 .Dt ATF-CHECK 1
 .Os
 .Sh NAME
@@ -118,15 +118,20 @@ Analyzes standard error (syntax identica
 Executes
 .Ar command
 as a shell command line, executing it with the system shell defined by
-.Va ATF_SHELL
-in
-.Xr atf-config 1 .
+.Va ATF_SHELL .
 You should avoid using this flag if at all possible to prevent shell quoting
 issues.
 .El
 .Sh EXIT STATUS
 .Nm
 exits 0 on success, and other (unspecified) value on failure.
+.Sh ENVIRONMENT
+.Bl -tag -width ATFXSHELLXX -compact
+.It Va ATF_SHELL
+Path to the system shell to be used when the
+.Fl x
+is given to run commands.
+.El
 .Sh EXAMPLES
 .Bd -literal -offset indent
 # Exit code 0, nothing on stdout/stderr
@@ -146,6 +151,3 @@ atf-check -s signal:sigsegv my_program
 # Combined checks
 atf-check -o match:foo -o not-match:bar echo foo baz
 .Ed
-.Sh SEE ALSO
-.Xr atf-config 1 ,
-.Xr atf 7

Modified: projects/bhyve_svm/contrib/atf/atf-sh/atf-sh-api.3
==============================================================================
--- projects/bhyve_svm/contrib/atf/atf-sh/atf-sh-api.3	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/atf/atf-sh/atf-sh-api.3	Sat Sep 27 22:15:50 2014	(r272229)
@@ -26,7 +26,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd October 13, 2013
+.Dd March 2, 2014
 .Dt ATF-SH-API 3
 .Os
 .Sh NAME
@@ -224,9 +224,8 @@ If
 .Va exitcode
 is not
 .Sq -1 ,
-.Xr atf-run 1
-will validate that the exit code of the test case matches the one provided
-in this call.
+the runtime engine will validate that the exit code of the test case
+matches the one provided in this call.
 Otherwise, the exact value will be ignored.
 .It Fn atf_expect_fail "reason"
 Any failure raised in this mode is recorded, but such failures do not report
@@ -258,9 +257,8 @@ If
 .Va signo
 is not
 .Sq -1 ,
-.Xr atf-run 1
-will validate that the signal that terminated the test case matches the one
-provided in this call.
+the runtime engine will validate that the signal that terminated the test
+case matches the one provided in this call.
 Otherwise, the exact value will be ignored.
 .It Fn atf_expect_timeout "reason" "..."
 Expects the test case to execute for longer than its timeout.
@@ -339,5 +337,4 @@ atf_check -s exit:0 -o match:"^foo$" -e 
 .Sh SEE ALSO
 .Xr atf-sh 1 ,
 .Xr atf-test-program 1 ,
-.Xr atf-test-case 4 ,
-.Xr atf 7
+.Xr atf-test-case 4

Modified: projects/bhyve_svm/contrib/atf/atf-sh/atf-sh.1
==============================================================================
--- projects/bhyve_svm/contrib/atf/atf-sh/atf-sh.1	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/atf/atf-sh/atf-sh.1	Sat Sep 27 22:15:50 2014	(r272229)
@@ -26,7 +26,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd October 15, 2013
+.Dd March 2, 2014
 .Dt ATF-SH 1
 .Os
 .Sh NAME
@@ -47,10 +47,8 @@ library.
 .Pp
 .Nm
 is not a real interpreter though: it is just a wrapper around
-the system-wide shell defined by the
-.Sq atf_shell
-configuration value in
-.Xr atf-config 1 .
+the system-wide shell defined by
+.Va ATF_SHELL .
 .Nm
 executes the interpreter, loads the
 .Xr atf-sh-api 3
@@ -68,7 +66,10 @@ The following options are available:
 .It Fl h
 Shows a short summary of all available options and their purpose.
 .El
+.Sh ENVIRONMENT
+.Bl -tag -width ATFXSHELLXX -compact
+.It Va ATF_SHELL
+Path to the system shell to be used in the generated scripts.
+.El
 .Sh SEE ALSO
-.Xr atf-config 1 ,
-.Xr atf-sh-api 3 ,
-.Xr atf 7
+.Xr atf-sh-api 3

Modified: projects/bhyve_svm/contrib/atf/doc/atf-test-case.4
==============================================================================
--- projects/bhyve_svm/contrib/atf/doc/atf-test-case.4	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/atf/doc/atf-test-case.4	Sat Sep 27 22:15:50 2014	(r272229)
@@ -26,7 +26,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 13, 2011
+.Dd March 2, 2014
 .Dt ATF-TEST-CASE 4
 .Os
 .Sh NAME
@@ -171,9 +171,7 @@ Type: boolean.
 Optional.
 .Pp
 If set to true, specifies that the test case has a cleanup routine that has
-to be executed by
-.Xr atf-run 1
-during the cleanup phase of the execution.
+to be executed by the runtime engine during the cleanup phase of the execution.
 This property is automatically set by the framework when defining a test case
 with a cleanup routine, so it should never be set by hand.
 .It ident
@@ -251,8 +249,7 @@ the test case is
 .Pp
 If the test case is running as root and this property is
 .Sq unprivileged ,
-.Xr atf-run 1
-will automatically drop the privileges if the
+the runtime engine will automatically drop the privileges if the
 .Sq unprivileged-user
 configuration property is set; otherwise the test case is
 .Em skipped .
@@ -314,7 +311,4 @@ Test cases are always executed with a fi
 .Sq 0022 .
 The test case's code is free to change this during execution.
 .Sh SEE ALSO
-.Xr atf-run 1 ,
-.Xr atf-test-program 1 ,
-.Xr atf-formats 5 ,
-.Xr atf 7
+.Xr atf-test-program 1

Modified: projects/bhyve_svm/contrib/atf/doc/atf-test-program.1
==============================================================================
--- projects/bhyve_svm/contrib/atf/doc/atf-test-program.1	Sat Sep 27 21:13:21 2014	(r272228)
+++ projects/bhyve_svm/contrib/atf/doc/atf-test-program.1	Sat Sep 27 22:15:50 2014	(r272229)
@@ -26,7 +26,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 6, 2011
+.Dd March 2, 2014
 .Dt ATF-TEST-PROGRAM 1
 .Os
 .Sh NAME
@@ -61,16 +61,17 @@ instead of the test case body; see
 Note that the test case is
 .Em executed without isolation ,
 so it can and probably will create and modify files in the current directory.
-To execute test cases in a controller manner, refer to
-.Xr atf-run 1 ,
-which is the preferred way to run test cases.
+To execute test cases in a controller manner, you need a runtime engine
+that understands the ATF interface.
+The recommended runtime engine is
+.Xr kyua 1 .
 You should only execute test cases by hand for debugging purposes.
 .Pp
 In the second synopsis form, the test program will list all available
 test cases alongside their meta-data properties in a format that is
 machine parseable.
 This list is processed by
-.Xr atf-run 1
+.Xr kyua 1
 to know how to execute the test cases of a given test program.
 .Pp

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

More information about the svn-src-projects mailing list