svn commit: r254583 - in projects/bhyve_npt_pmap: . bin/ed bin/sh cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/opensolaris/lib/libzfs_core/common contrib/libstdc++/libsupc++ contrib/llvm...

Neel Natu neel at FreeBSD.org
Tue Aug 20 21:43:55 UTC 2013 

Author: neel
Date: Tue Aug 20 21:43:46 2013
New Revision: 254583
URL: http://svnweb.freebsd.org/changeset/base/254583

Log:
  IFC @r252646

Added:
  projects/bhyve_npt_pmap/etc/rc.d/swap
     - copied unchanged from r252646, head/etc/rc.d/swap
  projects/bhyve_npt_pmap/etc/rc.d/swaplate
     - copied unchanged from r252646, head/etc/rc.d/swaplate
  projects/bhyve_npt_pmap/sbin/nvmecontrol/devlist.c
     - copied unchanged from r252646, head/sbin/nvmecontrol/devlist.c
  projects/bhyve_npt_pmap/sbin/nvmecontrol/firmware.c
     - copied unchanged from r252646, head/sbin/nvmecontrol/firmware.c
  projects/bhyve_npt_pmap/sbin/nvmecontrol/identify.c
     - copied unchanged from r252646, head/sbin/nvmecontrol/identify.c
  projects/bhyve_npt_pmap/sbin/nvmecontrol/logpage.c
     - copied unchanged from r252646, head/sbin/nvmecontrol/logpage.c
  projects/bhyve_npt_pmap/sbin/nvmecontrol/nvmecontrol.h
     - copied unchanged from r252646, head/sbin/nvmecontrol/nvmecontrol.h
  projects/bhyve_npt_pmap/sbin/nvmecontrol/perftest.c
     - copied unchanged from r252646, head/sbin/nvmecontrol/perftest.c
  projects/bhyve_npt_pmap/sbin/nvmecontrol/reset.c
     - copied unchanged from r252646, head/sbin/nvmecontrol/reset.c
  projects/bhyve_npt_pmap/share/man/man4/cc_cdg.4
     - copied unchanged from r252646, head/share/man/man4/cc_cdg.4
  projects/bhyve_npt_pmap/share/man/man4/qlxge.4
     - copied unchanged from r252646, head/share/man/man4/qlxge.4
  projects/bhyve_npt_pmap/sys/arm/arm/generic_timer.c
     - copied unchanged from r252646, head/sys/arm/arm/generic_timer.c
  projects/bhyve_npt_pmap/sys/arm/conf/ARNDALE
     - copied unchanged from r252646, head/sys/arm/conf/ARNDALE
  projects/bhyve_npt_pmap/sys/arm/samsung/
     - copied from r252646, head/sys/arm/samsung/
  projects/bhyve_npt_pmap/sys/boot/fdt/dts/bcm2835.dtsi
     - copied unchanged from r252646, head/sys/boot/fdt/dts/bcm2835.dtsi
  projects/bhyve_npt_pmap/sys/boot/fdt/dts/exynos5250-arndale.dts
     - copied unchanged from r252646, head/sys/boot/fdt/dts/exynos5250-arndale.dts
  projects/bhyve_npt_pmap/sys/boot/fdt/dts/exynos5250.dtsi
     - copied unchanged from r252646, head/sys/boot/fdt/dts/exynos5250.dtsi
  projects/bhyve_npt_pmap/sys/boot/fdt/dts/rpi.dts
     - copied unchanged from r252646, head/sys/boot/fdt/dts/rpi.dts
  projects/bhyve_npt_pmap/sys/boot/i386/gptboot/gptboot.8
     - copied unchanged from r252646, head/sys/boot/i386/gptboot/gptboot.8
  projects/bhyve_npt_pmap/sys/dev/qlxge/
     - copied from r252646, head/sys/dev/qlxge/
  projects/bhyve_npt_pmap/sys/kern/subr_vmem.c
     - copied unchanged from r252646, head/sys/kern/subr_vmem.c
  projects/bhyve_npt_pmap/sys/modules/cc/cc_cdg/
     - copied from r252646, head/sys/modules/cc/cc_cdg/
  projects/bhyve_npt_pmap/sys/modules/qlxge/
     - copied from r252646, head/sys/modules/qlxge/
  projects/bhyve_npt_pmap/sys/netinet/cc/cc_cdg.c
     - copied unchanged from r252646, head/sys/netinet/cc/cc_cdg.c
  projects/bhyve_npt_pmap/sys/sys/vmem.h
     - copied unchanged from r252646, head/sys/sys/vmem.h
  projects/bhyve_npt_pmap/tools/build/options/WITHOUT_SVNLITE
     - copied unchanged from r252646, head/tools/build/options/WITHOUT_SVNLITE
  projects/bhyve_npt_pmap/tools/build/options/WITH_SVN
     - copied unchanged from r252646, head/tools/build/options/WITH_SVN
Deleted:
  projects/bhyve_npt_pmap/contrib/smbfs/mount_smbfs/Makefile
  projects/bhyve_npt_pmap/etc/rc.d/encswap
  projects/bhyve_npt_pmap/etc/rc.d/swap1
  projects/bhyve_npt_pmap/sys/boot/fdt/dts/bcm2835-rpi-b.dts
Modified:
  projects/bhyve_npt_pmap/Makefile.inc1
  projects/bhyve_npt_pmap/ObsoleteFiles.inc
  projects/bhyve_npt_pmap/UPDATING
  projects/bhyve_npt_pmap/bin/ed/re.c
  projects/bhyve_npt_pmap/bin/sh/eval.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
  projects/bhyve_npt_pmap/contrib/libstdc++/libsupc++/unwind-cxx.h
  projects/bhyve_npt_pmap/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h
  projects/bhyve_npt_pmap/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
  projects/bhyve_npt_pmap/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h
  projects/bhyve_npt_pmap/crypto/openssh/sshd_config
  projects/bhyve_npt_pmap/crypto/openssh/sshd_config.5
  projects/bhyve_npt_pmap/etc/defaults/rc.conf
  projects/bhyve_npt_pmap/etc/devd/usb.conf
  projects/bhyve_npt_pmap/etc/mtree/BSD.include.dist
  projects/bhyve_npt_pmap/etc/mtree/BSD.usr.dist
  projects/bhyve_npt_pmap/etc/network.subr
  projects/bhyve_npt_pmap/etc/newsyslog.conf
  projects/bhyve_npt_pmap/etc/periodic/daily/450.status-security
  projects/bhyve_npt_pmap/etc/rc.d/Makefile
  projects/bhyve_npt_pmap/etc/rc.d/addswap
  projects/bhyve_npt_pmap/etc/rc.d/fsck
  projects/bhyve_npt_pmap/etc/rc.d/hostapd
  projects/bhyve_npt_pmap/etc/rc.d/mdconfig
  projects/bhyve_npt_pmap/etc/syslog.conf
  projects/bhyve_npt_pmap/gnu/usr.bin/patch/pch.c
  projects/bhyve_npt_pmap/include/Makefile
  projects/bhyve_npt_pmap/include/gssapi/gssapi.h
  projects/bhyve_npt_pmap/include/iconv.h
  projects/bhyve_npt_pmap/include/paths.h
  projects/bhyve_npt_pmap/include/stdlib.h
  projects/bhyve_npt_pmap/lib/Makefile
  projects/bhyve_npt_pmap/lib/libc/gen/siginterrupt.c
  projects/bhyve_npt_pmap/lib/libc/gen/signal.c
  projects/bhyve_npt_pmap/lib/libc/iconv/Symbol.map
  projects/bhyve_npt_pmap/lib/libc/iconv/citrus_csmapper.c
  projects/bhyve_npt_pmap/lib/libc/iconv/citrus_iconv.c
  projects/bhyve_npt_pmap/lib/libc/iconv/citrus_iconv.h
  projects/bhyve_npt_pmap/lib/libc/iconv/citrus_iconv_local.h
  projects/bhyve_npt_pmap/lib/libc/iconv/citrus_lock.h
  projects/bhyve_npt_pmap/lib/libc/iconv/citrus_mapper.c
  projects/bhyve_npt_pmap/lib/libc/iconv/citrus_none.c
  projects/bhyve_npt_pmap/lib/libc/iconv/citrus_stdenc.h
  projects/bhyve_npt_pmap/lib/libc/iconv/citrus_stdenc_local.h
  projects/bhyve_npt_pmap/lib/libc/iconv/citrus_stdenc_template.h
  projects/bhyve_npt_pmap/lib/libc/iconv/iconv.c
  projects/bhyve_npt_pmap/lib/libc/locale/cXXrtomb_iconv.h
  projects/bhyve_npt_pmap/lib/libc/locale/mbrtocXX_iconv.h
  projects/bhyve_npt_pmap/lib/libc/stdlib/rand.c
  projects/bhyve_npt_pmap/lib/libdwarf/dwarf_init.c
  projects/bhyve_npt_pmap/lib/libdwarf/dwarf_loc.c
  projects/bhyve_npt_pmap/lib/libfetch/fetch.c
  projects/bhyve_npt_pmap/lib/libiconv_modules/BIG5/citrus_big5.c
  projects/bhyve_npt_pmap/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
  projects/bhyve_npt_pmap/lib/libiconv_modules/EUC/citrus_euc.c
  projects/bhyve_npt_pmap/lib/libiconv_modules/EUCTW/citrus_euctw.c
  projects/bhyve_npt_pmap/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
  projects/bhyve_npt_pmap/lib/libiconv_modules/HZ/citrus_hz.c
  projects/bhyve_npt_pmap/lib/libiconv_modules/ISO2022/citrus_iso2022.c
  projects/bhyve_npt_pmap/lib/libiconv_modules/JOHAB/citrus_johab.c
  projects/bhyve_npt_pmap/lib/libiconv_modules/MSKanji/citrus_mskanji.c
  projects/bhyve_npt_pmap/lib/libiconv_modules/UES/citrus_ues.c
  projects/bhyve_npt_pmap/lib/libiconv_modules/UTF1632/citrus_utf1632.c
  projects/bhyve_npt_pmap/lib/libiconv_modules/UTF7/citrus_utf7.c
  projects/bhyve_npt_pmap/lib/libiconv_modules/UTF8/citrus_utf8.c
  projects/bhyve_npt_pmap/lib/libiconv_modules/VIQR/citrus_viqr.c
  projects/bhyve_npt_pmap/lib/libiconv_modules/ZW/citrus_zw.c
  projects/bhyve_npt_pmap/lib/libiconv_modules/iconv_none/citrus_iconv_none.c
  projects/bhyve_npt_pmap/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
  projects/bhyve_npt_pmap/lib/libprocstat/Makefile
  projects/bhyve_npt_pmap/lib/libprocstat/common_kvm.h
  projects/bhyve_npt_pmap/lib/libprocstat/libprocstat.c
  projects/bhyve_npt_pmap/lib/librt/sigev_thread.c
  projects/bhyve_npt_pmap/lib/libstand/nfs.c
  projects/bhyve_npt_pmap/lib/libutil/login_times.c
  projects/bhyve_npt_pmap/rescue/rescue/Makefile
  projects/bhyve_npt_pmap/sbin/devd/devd.8
  projects/bhyve_npt_pmap/sbin/devd/devd.cc
  projects/bhyve_npt_pmap/sbin/dhclient/bpf.c
  projects/bhyve_npt_pmap/sbin/dhclient/clparse.c
  projects/bhyve_npt_pmap/sbin/dhclient/dhclient.c
  projects/bhyve_npt_pmap/sbin/dhclient/dhcpd.h
  projects/bhyve_npt_pmap/sbin/dhclient/packet.c
  projects/bhyve_npt_pmap/sbin/dhclient/privsep.c
  projects/bhyve_npt_pmap/sbin/dhclient/privsep.h
  projects/bhyve_npt_pmap/sbin/geom/class/part/gpart.8
  projects/bhyve_npt_pmap/sbin/hastctl/hastctl.c
  projects/bhyve_npt_pmap/sbin/hastd/control.c
  projects/bhyve_npt_pmap/sbin/hastd/hastd.8
  projects/bhyve_npt_pmap/sbin/hastd/refcnt.h
  projects/bhyve_npt_pmap/sbin/ifconfig/af_nd6.c
  projects/bhyve_npt_pmap/sbin/mdconfig/mdconfig.8
  projects/bhyve_npt_pmap/sbin/mdconfig/mdconfig.c
  projects/bhyve_npt_pmap/sbin/mount/mount.8
  projects/bhyve_npt_pmap/sbin/mount/mount.c
  projects/bhyve_npt_pmap/sbin/nvmecontrol/Makefile
  projects/bhyve_npt_pmap/sbin/nvmecontrol/nvmecontrol.8
  projects/bhyve_npt_pmap/sbin/nvmecontrol/nvmecontrol.c
  projects/bhyve_npt_pmap/sbin/reboot/boot_i386.8
  projects/bhyve_npt_pmap/sbin/swapon/swapon.8
  projects/bhyve_npt_pmap/sbin/swapon/swapon.c
  projects/bhyve_npt_pmap/share/examples/Makefile
  projects/bhyve_npt_pmap/share/examples/etc/README.examples
  projects/bhyve_npt_pmap/share/examples/etc/make.conf
  projects/bhyve_npt_pmap/share/man/man4/Makefile
  projects/bhyve_npt_pmap/share/man/man4/axe.4
  projects/bhyve_npt_pmap/share/man/man4/oce.4
  projects/bhyve_npt_pmap/share/man/man4/urtwn.4
  projects/bhyve_npt_pmap/share/man/man5/fstab.5
  projects/bhyve_npt_pmap/share/man/man5/rc.conf.5
  projects/bhyve_npt_pmap/share/man/man5/src.conf.5
  projects/bhyve_npt_pmap/share/man/man9/Makefile
  projects/bhyve_npt_pmap/share/man/man9/locking.9
  projects/bhyve_npt_pmap/share/man/man9/rmlock.9
  projects/bhyve_npt_pmap/share/misc/committers-ports.dot
  projects/bhyve_npt_pmap/share/mk/bsd.libnames.mk
  projects/bhyve_npt_pmap/sys/amd64/include/acpica_machdep.h
  projects/bhyve_npt_pmap/sys/amd64/include/counter.h
  projects/bhyve_npt_pmap/sys/amd64/vmm/vmm_instruction_emul.c
  projects/bhyve_npt_pmap/sys/amd64/vmm/x86.c
  projects/bhyve_npt_pmap/sys/arm/arm/bus_space_generic.c
  projects/bhyve_npt_pmap/sys/arm/arm/cpufunc.c
  projects/bhyve_npt_pmap/sys/arm/arm/db_trace.c
  projects/bhyve_npt_pmap/sys/arm/arm/exception.S
  projects/bhyve_npt_pmap/sys/arm/arm/gic.c
  projects/bhyve_npt_pmap/sys/arm/arm/identcpu.c
  projects/bhyve_npt_pmap/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
  projects/bhyve_npt_pmap/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
  projects/bhyve_npt_pmap/sys/arm/conf/RPI-B
  projects/bhyve_npt_pmap/sys/arm/include/armreg.h
  projects/bhyve_npt_pmap/sys/arm/include/asmacros.h
  projects/bhyve_npt_pmap/sys/arm/include/counter.h
  projects/bhyve_npt_pmap/sys/arm/include/intr.h
  projects/bhyve_npt_pmap/sys/arm/ti/am335x/am335x_lcd.c
  projects/bhyve_npt_pmap/sys/arm/ti/ti_scm.c
  projects/bhyve_npt_pmap/sys/arm/versatile/versatile_pci.c
  projects/bhyve_npt_pmap/sys/arm/versatile/versatile_sic.c
  projects/bhyve_npt_pmap/sys/boot/i386/gptboot/Makefile
  projects/bhyve_npt_pmap/sys/cam/cam_ccb.h
  projects/bhyve_npt_pmap/sys/cam/ctl/ctl_backend_ramdisk.c
  projects/bhyve_npt_pmap/sys/cam/scsi/scsi_all.c
  projects/bhyve_npt_pmap/sys/cam/scsi/scsi_xpt.c
  projects/bhyve_npt_pmap/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/bhyve_npt_pmap/sys/cddl/dev/dtmalloc/dtmalloc.c
  projects/bhyve_npt_pmap/sys/conf/NOTES
  projects/bhyve_npt_pmap/sys/conf/files
  projects/bhyve_npt_pmap/sys/conf/files.amd64
  projects/bhyve_npt_pmap/sys/conf/files.arm
  projects/bhyve_npt_pmap/sys/conf/files.i386
  projects/bhyve_npt_pmap/sys/conf/files.ia64
  projects/bhyve_npt_pmap/sys/conf/files.mips
  projects/bhyve_npt_pmap/sys/conf/files.pc98
  projects/bhyve_npt_pmap/sys/conf/files.powerpc
  projects/bhyve_npt_pmap/sys/conf/files.sparc64
  projects/bhyve_npt_pmap/sys/conf/newvers.sh
  projects/bhyve_npt_pmap/sys/conf/options
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/acpica_prep.sh
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/changes.txt   (contents, props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/common/dmrestag.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/common/dmtable.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/common/dmtbdump.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/aslmessages.h
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/asltree.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/dtfield.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/dtio.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/dttable.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/dttemplate.h
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/dtutils.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/preprocess.h
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/prscan.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/debugger/dbcmds.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/debugger/dbdisply.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/debugger/dbinput.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/debugger/dbnames.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/events/evgpeinit.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/executer/exdump.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/namespace/nsdump.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/namespace/nsrepair2.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/namespace/nsxfname.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/resources/rsdump.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/resources/rsutils.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/tables/tbxfroot.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/utilities/uteval.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/utilities/utstring.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/acdisasm.h
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/acpixf.h
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/actables.h
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/actypes.h
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/acutils.h
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/platform/acfreebsd.h
  projects/bhyve_npt_pmap/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c
  projects/bhyve_npt_pmap/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
  projects/bhyve_npt_pmap/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h
  projects/bhyve_npt_pmap/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_radio.c
  projects/bhyve_npt_pmap/sys/dev/acpi_support/atk0110.c
  projects/bhyve_npt_pmap/sys/dev/acpica/acpi_pcib.c
  projects/bhyve_npt_pmap/sys/dev/acpica/acpi_pcib_acpi.c
  projects/bhyve_npt_pmap/sys/dev/ata/chipsets/ata-intel.c
  projects/bhyve_npt_pmap/sys/dev/ath/ath_hal/ah.c
  projects/bhyve_npt_pmap/sys/dev/ath/ath_hal/ah_internal.h
  projects/bhyve_npt_pmap/sys/dev/ath/if_ath_ahb.c
  projects/bhyve_npt_pmap/sys/dev/ath/if_ath_rx_edma.c
  projects/bhyve_npt_pmap/sys/dev/bce/if_bce.c
  projects/bhyve_npt_pmap/sys/dev/bce/if_bcereg.h
  projects/bhyve_npt_pmap/sys/dev/bge/if_bge.c
  projects/bhyve_npt_pmap/sys/dev/bge/if_bgereg.h
  projects/bhyve_npt_pmap/sys/dev/cpuctl/cpuctl.c
  projects/bhyve_npt_pmap/sys/dev/cxgbe/t4_main.c
  projects/bhyve_npt_pmap/sys/dev/isci/scil/sati_passthrough.c
  projects/bhyve_npt_pmap/sys/dev/iwn/if_iwn.c
  projects/bhyve_npt_pmap/sys/dev/mfi/mfi.c
  projects/bhyve_npt_pmap/sys/dev/nvme/nvme.h
  projects/bhyve_npt_pmap/sys/dev/nvme/nvme_ctrlr.c
  projects/bhyve_npt_pmap/sys/dev/nvme/nvme_private.h
  projects/bhyve_npt_pmap/sys/dev/nvme/nvme_qpair.c
  projects/bhyve_npt_pmap/sys/dev/pci/pci.c
  projects/bhyve_npt_pmap/sys/dev/pci/pci_private.h
  projects/bhyve_npt_pmap/sys/dev/qlxgbe/ql_os.c
  projects/bhyve_npt_pmap/sys/dev/re/if_re.c
  projects/bhyve_npt_pmap/sys/dev/uart/uart.h
  projects/bhyve_npt_pmap/sys/dev/uart/uart_bus_fdt.c
  projects/bhyve_npt_pmap/sys/dev/uart/uart_cpu_fdt.c
  projects/bhyve_npt_pmap/sys/dev/uart/uart_subr.c
  projects/bhyve_npt_pmap/sys/dev/usb/net/if_axe.c
  projects/bhyve_npt_pmap/sys/dev/usb/quirk/usb_quirk.c
  projects/bhyve_npt_pmap/sys/dev/usb/serial/u3g.c
  projects/bhyve_npt_pmap/sys/dev/usb/usbdevs
  projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_urtwn.c
  projects/bhyve_npt_pmap/sys/dev/xen/blkfront/blkfront.c
  projects/bhyve_npt_pmap/sys/dev/xen/blkfront/block.h
  projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2_extern.h
  projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2_lookup.c
  projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2_vfsops.c
  projects/bhyve_npt_pmap/sys/fs/nfsclient/nfs_clport.c
  projects/bhyve_npt_pmap/sys/fs/smbfs/smbfs_node.c
  projects/bhyve_npt_pmap/sys/fs/smbfs/smbfs_smb.c
  projects/bhyve_npt_pmap/sys/fs/smbfs/smbfs_vfsops.c
  projects/bhyve_npt_pmap/sys/fs/smbfs/smbfs_vnops.c
  projects/bhyve_npt_pmap/sys/geom/geom_io.c
  projects/bhyve_npt_pmap/sys/i386/include/acpica_machdep.h
  projects/bhyve_npt_pmap/sys/i386/include/counter.h
  projects/bhyve_npt_pmap/sys/ia64/include/acpica_machdep.h
  projects/bhyve_npt_pmap/sys/ia64/include/counter.h
  projects/bhyve_npt_pmap/sys/kern/Make.tags.inc
  projects/bhyve_npt_pmap/sys/kern/kern_acct.c
  projects/bhyve_npt_pmap/sys/kern/kern_clock.c
  projects/bhyve_npt_pmap/sys/kern/kern_cpuset.c
  projects/bhyve_npt_pmap/sys/kern/kern_descrip.c
  projects/bhyve_npt_pmap/sys/kern/kern_lock.c
  projects/bhyve_npt_pmap/sys/kern/kern_mutex.c
  projects/bhyve_npt_pmap/sys/kern/kern_rmlock.c
  projects/bhyve_npt_pmap/sys/kern/kern_rwlock.c
  projects/bhyve_npt_pmap/sys/kern/kern_sx.c
  projects/bhyve_npt_pmap/sys/kern/kern_synch.c
  projects/bhyve_npt_pmap/sys/kern/subr_bus.c
  projects/bhyve_npt_pmap/sys/kern/subr_counter.c
  projects/bhyve_npt_pmap/sys/kern/subr_lock.c
  projects/bhyve_npt_pmap/sys/kern/sys_generic.c
  projects/bhyve_npt_pmap/sys/kern/uipc_usrreq.c
  projects/bhyve_npt_pmap/sys/kern/vfs_bio.c
  projects/bhyve_npt_pmap/sys/mips/conf/AR933X_BASE
  projects/bhyve_npt_pmap/sys/mips/conf/AR933X_BASE.hints
  projects/bhyve_npt_pmap/sys/mips/conf/CARAMBOLA2.hints
  projects/bhyve_npt_pmap/sys/mips/include/counter.h
  projects/bhyve_npt_pmap/sys/modules/Makefile
  projects/bhyve_npt_pmap/sys/modules/cc/Makefile
  projects/bhyve_npt_pmap/sys/net/if_bridge.c
  projects/bhyve_npt_pmap/sys/net/if_lagg.c
  projects/bhyve_npt_pmap/sys/net80211/ieee80211_ioctl.c
  projects/bhyve_npt_pmap/sys/netinet/if_ether.c
  projects/bhyve_npt_pmap/sys/netinet/in_mcast.c
  projects/bhyve_npt_pmap/sys/netinet/sctp_indata.c
  projects/bhyve_npt_pmap/sys/netinet/sctp_indata.h
  projects/bhyve_npt_pmap/sys/netinet/sctp_input.c
  projects/bhyve_npt_pmap/sys/netinet/sctp_pcb.c
  projects/bhyve_npt_pmap/sys/netinet6/in6.c
  projects/bhyve_npt_pmap/sys/netinet6/in6_ifattach.c
  projects/bhyve_npt_pmap/sys/netinet6/in6_var.h
  projects/bhyve_npt_pmap/sys/netinet6/nd6.c
  projects/bhyve_npt_pmap/sys/netsmb/smb_conn.c
  projects/bhyve_npt_pmap/sys/nfsclient/nfs_vnops.c
  projects/bhyve_npt_pmap/sys/powerpc/include/counter.h
  projects/bhyve_npt_pmap/sys/powerpc/wii/wii_ipcreg.h
  projects/bhyve_npt_pmap/sys/sparc64/include/counter.h
  projects/bhyve_npt_pmap/sys/sys/_rmlock.h
  projects/bhyve_npt_pmap/sys/sys/bus.h
  projects/bhyve_npt_pmap/sys/sys/cpuset.h
  projects/bhyve_npt_pmap/sys/sys/lock.h
  projects/bhyve_npt_pmap/sys/sys/malloc.h
  projects/bhyve_npt_pmap/sys/sys/rmlock.h
  projects/bhyve_npt_pmap/sys/sys/socketvar.h
  projects/bhyve_npt_pmap/sys/sys/stdatomic.h
  projects/bhyve_npt_pmap/sys/ufs/ffs/ffs_alloc.c
  projects/bhyve_npt_pmap/sys/ufs/ffs/ffs_balloc.c
  projects/bhyve_npt_pmap/sys/ufs/ufs/dinode.h
  projects/bhyve_npt_pmap/sys/ufs/ufs/inode.h
  projects/bhyve_npt_pmap/sys/ufs/ufs/ufs_extattr.c
  projects/bhyve_npt_pmap/sys/ufs/ufs/ufs_vnops.c
  projects/bhyve_npt_pmap/sys/vm/uma.h
  projects/bhyve_npt_pmap/sys/vm/uma_core.c
  projects/bhyve_npt_pmap/sys/vm/uma_int.h
  projects/bhyve_npt_pmap/sys/vm/vm.h
  projects/bhyve_npt_pmap/sys/vm/vm_init.c
  projects/bhyve_npt_pmap/sys/vm/vm_kern.c
  projects/bhyve_npt_pmap/sys/vm/vm_kern.h
  projects/bhyve_npt_pmap/sys/vm/vm_object.c
  projects/bhyve_npt_pmap/sys/vm/vm_pager.c
  projects/bhyve_npt_pmap/sys/vm/vm_pager.h
  projects/bhyve_npt_pmap/tools/tools/ath/Makefile.inc
  projects/bhyve_npt_pmap/tools/tools/cxgbetool/cxgbetool.c
  projects/bhyve_npt_pmap/usr.bin/Makefile
  projects/bhyve_npt_pmap/usr.bin/Makefile.amd64
  projects/bhyve_npt_pmap/usr.bin/Makefile.i386
  projects/bhyve_npt_pmap/usr.bin/Makefile.ia64
  projects/bhyve_npt_pmap/usr.bin/Makefile.powerpc
  projects/bhyve_npt_pmap/usr.bin/Makefile.sparc64
  projects/bhyve_npt_pmap/usr.bin/calendar/calendars/calendar.freebsd
  projects/bhyve_npt_pmap/usr.bin/iconv/iconv.c
  projects/bhyve_npt_pmap/usr.bin/kdump/kdump.c
  projects/bhyve_npt_pmap/usr.bin/killall/killall.1
  projects/bhyve_npt_pmap/usr.bin/killall/killall.c
  projects/bhyve_npt_pmap/usr.bin/mkcsmapper/lex.l
  projects/bhyve_npt_pmap/usr.bin/mkesdb/lex.l
  projects/bhyve_npt_pmap/usr.bin/patch/pch.c
  projects/bhyve_npt_pmap/usr.bin/rwho/rwho.c
  projects/bhyve_npt_pmap/usr.bin/sed/main.c
  projects/bhyve_npt_pmap/usr.bin/svn/lib/libapr_util/Makefile
  projects/bhyve_npt_pmap/usr.bin/svn/lib/libapr_util/apr_ldap.h
  projects/bhyve_npt_pmap/usr.bin/svn/lib/libapr_util/apu.h
  projects/bhyve_npt_pmap/usr.bin/svn/lib/libapr_util/apu_config.h
  projects/bhyve_npt_pmap/usr.bin/truss/syscalls.c
  projects/bhyve_npt_pmap/usr.sbin/Makefile.amd64
  projects/bhyve_npt_pmap/usr.sbin/Makefile.i386
  projects/bhyve_npt_pmap/usr.sbin/Makefile.ia64
  projects/bhyve_npt_pmap/usr.sbin/Makefile.powerpc
  projects/bhyve_npt_pmap/usr.sbin/Makefile.sparc64
  projects/bhyve_npt_pmap/usr.sbin/acpi/acpidb/acpidb.c
  projects/bhyve_npt_pmap/usr.sbin/acpi/acpidump/acpi.c
  projects/bhyve_npt_pmap/usr.sbin/bhyve/atpic.c
  projects/bhyve_npt_pmap/usr.sbin/bhyve/pci_emul.c
  projects/bhyve_npt_pmap/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt
  projects/bhyve_npt_pmap/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
  projects/bhyve_npt_pmap/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def
  projects/bhyve_npt_pmap/usr.sbin/newsyslog/newsyslog.c
  projects/bhyve_npt_pmap/usr.sbin/nfsd/nfsv4.4
  projects/bhyve_npt_pmap/usr.sbin/pkg_install/add/extract.c
  projects/bhyve_npt_pmap/usr.sbin/pkg_install/create/pl.c
  projects/bhyve_npt_pmap/usr.sbin/pkg_install/lib/exec.c
  projects/bhyve_npt_pmap/usr.sbin/pw/pw_user.c
  projects/bhyve_npt_pmap/usr.sbin/rwhod/rwhod.c
Directory Properties:
  projects/bhyve_npt_pmap/   (props changed)
  projects/bhyve_npt_pmap/cddl/   (props changed)
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/   (props changed)
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/bhyve_npt_pmap/contrib/libstdc++/   (props changed)
  projects/bhyve_npt_pmap/contrib/llvm/   (props changed)
  projects/bhyve_npt_pmap/contrib/llvm/tools/clang/   (props changed)
  projects/bhyve_npt_pmap/crypto/heimdal/   (props changed)
  projects/bhyve_npt_pmap/crypto/openssh/   (props changed)
  projects/bhyve_npt_pmap/lib/libc/   (props changed)
  projects/bhyve_npt_pmap/lib/libutil/   (props changed)
  projects/bhyve_npt_pmap/sbin/   (props changed)
  projects/bhyve_npt_pmap/share/man/man4/   (props changed)
  projects/bhyve_npt_pmap/sys/   (props changed)
  projects/bhyve_npt_pmap/sys/amd64/vmm/   (props changed)
  projects/bhyve_npt_pmap/sys/boot/   (props changed)
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/   (props changed)
  projects/bhyve_npt_pmap/sys/conf/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/common/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/debugger/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/disassembler/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/events/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/executer/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/namespace/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/resources/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/tables/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/utilities/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/os_specific/   (props changed)
  projects/bhyve_npt_pmap/usr.bin/calendar/   (props changed)
  projects/bhyve_npt_pmap/usr.sbin/bhyve/   (props changed)

Modified: projects/bhyve_npt_pmap/Makefile.inc1
==============================================================================
--- projects/bhyve_npt_pmap/Makefile.inc1	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/Makefile.inc1	Tue Aug 20 21:43:46 2013	(r254583)
@@ -1131,11 +1131,11 @@ legacy:
 .endif
 .for _tool in tools/build
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \
-	    cd ${.CURDIR}/${_tool}; \
-	    ${MAKE} DIRPRFX=${_tool}/ obj; \
-	    ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \
-	    ${MAKE} DIRPRFX=${_tool}/ depend; \
-	    ${MAKE} DIRPRFX=${_tool}/ all; \
+	    cd ${.CURDIR}/${_tool} && \
+	    ${MAKE} DIRPRFX=${_tool}/ obj && \
+	    ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes && \
+	    ${MAKE} DIRPRFX=${_tool}/ depend && \
+	    ${MAKE} DIRPRFX=${_tool}/ all && \
 	    ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
 .endfor
 
@@ -1264,10 +1264,10 @@ bootstrap-tools:
     ${_crunch} \
     ${_nmtree}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
-		cd ${.CURDIR}/${_tool}; \
-		${MAKE} DIRPRFX=${_tool}/ obj; \
-		${MAKE} DIRPRFX=${_tool}/ depend; \
-		${MAKE} DIRPRFX=${_tool}/ all; \
+		cd ${.CURDIR}/${_tool} && \
+		${MAKE} DIRPRFX=${_tool}/ obj && \
+		${MAKE} DIRPRFX=${_tool}/ depend && \
+		${MAKE} DIRPRFX=${_tool}/ all && \
 		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
 .endfor
 
@@ -1305,16 +1305,16 @@ build-tools:
     usr.bin/mkesdb_static \
     usr.bin/mkcsmapper_static
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \
-		cd ${.CURDIR}/${_tool}; \
-		${MAKE} DIRPRFX=${_tool}/ obj; \
+		cd ${.CURDIR}/${_tool} && \
+		${MAKE} DIRPRFX=${_tool}/ obj && \
 		${MAKE} DIRPRFX=${_tool}/ build-tools
 .endfor
 .for _tool in \
     ${_gcc_tools}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
-		cd ${.CURDIR}/${_tool}; \
-		${MAKE} DIRPRFX=${_tool}/ obj; \
-		${MAKE} DIRPRFX=${_tool}/ depend; \
+		cd ${.CURDIR}/${_tool} && \
+		${MAKE} DIRPRFX=${_tool}/ obj && \
+		${MAKE} DIRPRFX=${_tool}/ depend && \
 		${MAKE} DIRPRFX=${_tool}/ all
 .endfor
 
@@ -1363,10 +1363,10 @@ cross-tools:
     ${_crunchide} \
     ${_kgzip}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
-		cd ${.CURDIR}/${_tool}; \
-		${MAKE} DIRPRFX=${_tool}/ obj; \
-		${MAKE} DIRPRFX=${_tool}/ depend; \
-		${MAKE} DIRPRFX=${_tool}/ all; \
+		cd ${.CURDIR}/${_tool} && \
+		${MAKE} DIRPRFX=${_tool}/ obj && \
+		${MAKE} DIRPRFX=${_tool}/ depend && \
+		${MAKE} DIRPRFX=${_tool}/ all && \
 		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
 .endfor
 
@@ -1545,10 +1545,10 @@ lib/libradius__L: lib/libmd__L
 ${_lib}__PL: .PHONY
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
-		cd ${.CURDIR}/${_lib}; \
-		${MAKE} DIRPRFX=${_lib}/ obj; \
-		${MAKE} DIRPRFX=${_lib}/ depend; \
-		${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \
+		cd ${.CURDIR}/${_lib} && \
+		${MAKE} DIRPRFX=${_lib}/ obj && \
+		${MAKE} DIRPRFX=${_lib}/ depend && \
+		${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all && \
 		${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
 .endif
 .endfor
@@ -1557,10 +1557,10 @@ ${_lib}__PL: .PHONY
 ${_lib}__L: .PHONY
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
-		cd ${.CURDIR}/${_lib}; \
-		${MAKE} DIRPRFX=${_lib}/ obj; \
-		${MAKE} DIRPRFX=${_lib}/ depend; \
-		${MAKE} DIRPRFX=${_lib}/ all; \
+		cd ${.CURDIR}/${_lib} && \
+		${MAKE} DIRPRFX=${_lib}/ obj && \
+		${MAKE} DIRPRFX=${_lib}/ depend && \
+		${MAKE} DIRPRFX=${_lib}/ all && \
 		${MAKE} DIRPRFX=${_lib}/ install
 .endif
 .endfor
@@ -1570,10 +1570,10 @@ ${_lib}__L: .PHONY
 # modules.
 lib/libpam__L: .PHONY
 	${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
-		cd ${.CURDIR}/lib/libpam; \
-		${MAKE} DIRPRFX=lib/libpam/ obj; \
-		${MAKE} DIRPRFX=lib/libpam/ depend; \
-		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \
+		cd ${.CURDIR}/lib/libpam && \
+		${MAKE} DIRPRFX=lib/libpam/ obj && \
+		${MAKE} DIRPRFX=lib/libpam/ depend && \
+		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all && \
 		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install
 
 _prereq_libs: ${_prereq_libs:S/$/__PL/}
@@ -1584,7 +1584,7 @@ _generic_libs: ${_generic_libs:S/$/__L/}
 .for __target in all clean cleandepend cleandir depend includes obj
 .for entry in ${SUBDIR}
 ${entry}.${__target}__D: .PHONY
-	${_+_}@if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \
+	${_+_}@set -e; if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \
 		${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE_ARCH} (${__target})"; \
 		edir=${entry}.${MACHINE_ARCH}; \
 		cd ${.CURDIR}/$${edir}; \
@@ -1822,10 +1822,10 @@ _xb-bootstrap-tools:
 .for _tool in \
     ${_clang_tblgen}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
-	cd ${.CURDIR}/${_tool}; \
-	${CDMAKE} DIRPRFX=${_tool}/ obj; \
-	${CDMAKE} DIRPRFX=${_tool}/ depend; \
-	${CDMAKE} DIRPRFX=${_tool}/ all; \
+	cd ${.CURDIR}/${_tool} && \
+	${CDMAKE} DIRPRFX=${_tool}/ obj && \
+	${CDMAKE} DIRPRFX=${_tool}/ depend && \
+	${CDMAKE} DIRPRFX=${_tool}/ all && \
 	${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install
 .endfor
 
@@ -1841,9 +1841,9 @@ _xb-cross-tools:
     ${_clang_libs} \
     ${_clang}
 	${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \
-	cd ${.CURDIR}/${_tool}; \
-	${CDMAKE} DIRPRFX=${_tool}/ obj; \
-	${CDMAKE} DIRPRFX=${_tool}/ depend; \
+	cd ${.CURDIR}/${_tool} && \
+	${CDMAKE} DIRPRFX=${_tool}/ obj && \
+	${CDMAKE} DIRPRFX=${_tool}/ depend && \
 	${CDMAKE} DIRPRFX=${_tool}/ all
 .endfor
 

Modified: projects/bhyve_npt_pmap/ObsoleteFiles.inc
==============================================================================
--- projects/bhyve_npt_pmap/ObsoleteFiles.inc	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/ObsoleteFiles.inc	Tue Aug 20 21:43:46 2013	(r254583)
@@ -41,7 +41,7 @@
 # 20130623: dialog update from 1.1 to 1.2
 OLD_LIBS+=usr/lib/libdialog.so.7
 OLD_LIBS+=usr/lib32/libdialog.so.7
-# 20130616: vfs_mounted.9 removed
+# 20130616: vfs_mount.9 removed
 OLD_FILES+=usr/share/man/man9/vfs_mount.9.gz
 # 20130614: remove CVS from base
 OLD_FILES+=usr/bin/cvs

Modified: projects/bhyve_npt_pmap/UPDATING
==============================================================================
--- projects/bhyve_npt_pmap/UPDATING	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/UPDATING	Tue Aug 20 21:43:46 2013	(r254583)
@@ -31,6 +31,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20130629:
+	Fix targets that run multiple make's to use && rather than ;
+	so that subsequent steps depend on success of previous.
+
+	NOTE: if building 'universe' with -j* on stable/8 or stable/9
+	it would be better to start the build using bmake, to avoid
+	overloading the machine.
+
 20130618:
 	Fix a bug that allowed a tracing process (e.g. gdb) to write
 	to a memory-mapped file in the traced process's address space

Modified: projects/bhyve_npt_pmap/bin/ed/re.c
==============================================================================
--- projects/bhyve_npt_pmap/bin/ed/re.c	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/bin/ed/re.c	Tue Aug 20 21:43:46 2013	(r254583)
@@ -89,7 +89,7 @@ extract_pattern(int delimiter)
 		default:
 			break;
 		case '[':
-			if ((nd = parse_char_class(++nd)) == NULL) {
+			if ((nd = parse_char_class(nd + 1)) == NULL) {
 				errmsg = "unbalanced brackets ([])";
 				return NULL;
 			}

Modified: projects/bhyve_npt_pmap/bin/sh/eval.c
==============================================================================
--- projects/bhyve_npt_pmap/bin/sh/eval.c	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/bin/sh/eval.c	Tue Aug 20 21:43:46 2013	(r254583)
@@ -589,7 +589,8 @@ evalpipe(union node *n)
 		pip[1] = -1;
 		if (lp->next) {
 			if (pipe(pip) < 0) {
-				close(prevfd);
+				if (prevfd >= 0)
+					close(prevfd);
 				error("Pipe call failed: %s", strerror(errno));
 			}
 		}

Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Tue Aug 20 21:43:46 2013	(r254583)
@@ -21,9 +21,9 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2011 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  * Copyright (c) 2012 DEY Storage Systems, Inc.  All rights reserved.
+ * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel at dawidek.net>.
  * All rights reserved.
  * Copyright (c) 2012 Martin Matuska <mm at FreeBSD.org>. All rights reserved.
@@ -4159,6 +4159,7 @@ struct holdarg {
 	const char *snapname;
 	const char *tag;
 	boolean_t recursive;
+	int error;
 };
 
 static int
@@ -4286,15 +4287,20 @@ zfs_release_one(zfs_handle_t *zhp, void 
 	struct holdarg *ha = arg;
 	char name[ZFS_MAXNAMELEN];
 	int rv = 0;
+	nvlist_t *existing_holds;
 
 	(void) snprintf(name, sizeof (name),
 	    "%s@%s", zhp->zfs_name, ha->snapname);
 
-	if (lzc_exists(name)) {
-		nvlist_t *holds = fnvlist_alloc();
-		fnvlist_add_boolean(holds, ha->tag);
-		fnvlist_add_nvlist(ha->nvl, name, holds);
-		fnvlist_free(holds);
+	if (lzc_get_holds(name, &existing_holds) != 0) {
+		ha->error = ENOENT;
+	} else if (!nvlist_exists(existing_holds, ha->tag)) {
+		ha->error = ESRCH;
+	} else {
+		nvlist_t *torelease = fnvlist_alloc();
+		fnvlist_add_boolean(torelease, ha->tag);
+		fnvlist_add_nvlist(ha->nvl, name, torelease);
+		fnvlist_free(torelease);
 	}
 
 	if (ha->recursive)
@@ -4318,16 +4324,21 @@ zfs_release(zfs_handle_t *zhp, const cha
 	ha.snapname = snapname;
 	ha.tag = tag;
 	ha.recursive = recursive;
+	ha.error = 0;
 	(void) zfs_release_one(zfs_handle_dup(zhp), &ha);
 
 	if (nvlist_empty(ha.nvl)) {
 		fnvlist_free(ha.nvl);
-		ret = ENOENT;
+		ret = ha.error;
 		(void) snprintf(errbuf, sizeof (errbuf),
 		    dgettext(TEXT_DOMAIN,
 		    "cannot release hold from snapshot '%s@%s'"),
 		    zhp->zfs_name, snapname);
-		(void) zfs_standard_error(hdl, ret, errbuf);
+		if (ret == ESRCH) {
+			(void) zfs_error(hdl, EZFS_REFTAG_RELE, errbuf);
+		} else {
+			(void) zfs_standard_error(hdl, ret, errbuf);
+		}
 		return (ret);
 	}
 

Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c
==============================================================================
--- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c	Tue Aug 20 21:43:46 2013	(r254583)
@@ -22,6 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 /*

Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
==============================================================================
--- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Tue Aug 20 21:43:46 2013	(r254583)
@@ -302,11 +302,8 @@ lzc_snapshot(nvlist_t *snaps, nvlist_t *
  * marked for deferred destruction, and will be destroyed when the last hold
  * or clone is removed/destroyed.
  *
- * The return value will be ENOENT if none of the snapshots existed.
- *
  * The return value will be 0 if all snapshots were destroyed (or marked for
- * later destruction if 'defer' is set) or didn't exist to begin with and
- * at least one snapshot was destroyed.
+ * later destruction if 'defer' is set) or didn't exist to begin with.
  *
  * Otherwise the return value will be the errno of a (unspecified) snapshot
  * that failed, no snapshots will be destroyed, and the errlist will have an
@@ -397,15 +394,10 @@ lzc_exists(const char *dataset)
  * or imported.
  *
  * Holds for snapshots which don't exist will be skipped and have an entry
- * added to errlist, but will not cause an overall failure, except in the
- * case that all holds where skipped.
- *
- * The return value will be ENOENT if none of the snapshots for the requested
- * holds existed.
+ * added to errlist, but will not cause an overall failure.
  *
- * The return value will be 0 if the nvl holds was empty or all holds, for
- * snapshots that existed, were succesfully created and at least one hold
- * was created.
+ * The return value will be 0 if all holds, for snapshots that existed,
+ * were succesfully created.
  *
  * Otherwise the return value will be the errno of a (unspecified) hold that
  * failed and no holds will be created.
@@ -449,13 +441,10 @@ lzc_hold(nvlist_t *holds, int cleanup_fd
  * The value is a nvlist whose keys are the holds to remove.
  *
  * Holds which failed to release because they didn't exist will have an entry
- * added to errlist, but will not cause an overall failure, except in the
- * case that all releases where skipped.
- *
- * The return value will be ENOENT if none of the specified holds existed.
+ * added to errlist, but will not cause an overall failure.
  *
  * The return value will be 0 if the nvl holds was empty or all holds that
- * existed, were successfully removed and at least one hold was removed.
+ * existed, were successfully removed.
  *
  * Otherwise the return value will be the errno of a (unspecified) hold that
  * failed to release and no holds will be released.

Modified: projects/bhyve_npt_pmap/contrib/libstdc++/libsupc++/unwind-cxx.h
==============================================================================
--- projects/bhyve_npt_pmap/contrib/libstdc++/libsupc++/unwind-cxx.h	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/contrib/libstdc++/libsupc++/unwind-cxx.h	Tue Aug 20 21:43:46 2013	(r254583)
@@ -133,7 +133,7 @@ extern "C" void __cxa_bad_typeid ();
 // throws, and if bad_exception needs to be thrown.  Called from the
 // compiler.
 extern "C" void __cxa_call_unexpected (void *) __attribute__((noreturn));
-extern "C" void __cxa_call_terminate (void*) __attribute__((noreturn));
+extern "C" void __cxa_call_terminate (_Unwind_Exception*) __attribute__((noreturn));
 
 #ifdef __ARM_EABI_UNWINDER__
 // Arm EABI specified routines.

Modified: projects/bhyve_npt_pmap/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h
==============================================================================
--- projects/bhyve_npt_pmap/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h	Tue Aug 20 21:43:46 2013	(r254583)
@@ -27,7 +27,7 @@ protected:
 
 public:
   explicit ARMFrameLowering(const ARMSubtarget &sti)
-    : TargetFrameLowering(StackGrowsDown, sti.getStackAlignment(), 0, 4),
+    : TargetFrameLowering(StackGrowsDown, sti.getStackAlignment(), 0, 8),
       STI(sti) {
   }
 

Modified: projects/bhyve_npt_pmap/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
==============================================================================
--- projects/bhyve_npt_pmap/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp	Tue Aug 20 21:43:46 2013	(r254583)
@@ -10296,7 +10296,8 @@ void Sema::ActOnTagFinishDefinition(Scop
     Tag->setTopLevelDeclInObjCContainer();
 
   // Notify the consumer that we've defined a tag.
-  Consumer.HandleTagDeclDefinition(Tag);
+  if (!Tag->isInvalidDecl())
+    Consumer.HandleTagDeclDefinition(Tag);
 }
 
 void Sema::ActOnObjCContainerFinishDefinition() {

Modified: projects/bhyve_npt_pmap/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h
==============================================================================
--- projects/bhyve_npt_pmap/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h	Tue Aug 20 21:43:46 2013	(r254583)
@@ -36,7 +36,7 @@
 #ifndef GSSAPI_KRB5_H_
 #define GSSAPI_KRB5_H_
 
-#include <gssapi.h>
+#include <gssapi/gssapi.h>
 
 GSSAPI_CPP_START
 

Modified: projects/bhyve_npt_pmap/crypto/openssh/sshd_config
==============================================================================
--- projects/bhyve_npt_pmap/crypto/openssh/sshd_config	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/crypto/openssh/sshd_config	Tue Aug 20 21:43:46 2013	(r254583)
@@ -105,7 +105,7 @@
 #PrintLastLog yes
 #TCPKeepAlive yes
 #UseLogin no
-#UsePrivilegeSeparation sandbox
+#UsePrivilegeSeparation yes
 #PermitUserEnvironment no
 #Compression delayed
 #ClientAliveInterval 0

Modified: projects/bhyve_npt_pmap/crypto/openssh/sshd_config.5
==============================================================================
--- projects/bhyve_npt_pmap/crypto/openssh/sshd_config.5	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/crypto/openssh/sshd_config.5	Tue Aug 20 21:43:46 2013	(r254583)
@@ -1169,7 +1169,7 @@ the privilege of the authenticated user.
 The goal of privilege separation is to prevent privilege
 escalation by containing any corruption within the unprivileged processes.
 The default is
-.Dq sandbox .
+.Dq yes .
 If
 .Cm UsePrivilegeSeparation
 is set to

Modified: projects/bhyve_npt_pmap/etc/defaults/rc.conf
==============================================================================
--- projects/bhyve_npt_pmap/etc/defaults/rc.conf	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/etc/defaults/rc.conf	Tue Aug 20 21:43:46 2013	(r254583)
@@ -32,8 +32,6 @@ early_late_divider="FILESYSTEMS"	# Scrip
 always_force_depends="NO"	# Set to check that indicated dependencies are
 				# running during boot (can increase boot time).
 
-swapfile="NO"		# Set to name of swapfile if aux swapfile desired.
-swapfile_mdunit="99"	# Swapfile md(4) unit number created by mdconfig(8).
 apm_enable="NO"		# Set to YES to enable APM BIOS functions (or NO).
 apmd_enable="NO"	# Run apmd to handle APM event from userland.
 apmd_flags=""		# Flags to apmd (if enabled).
@@ -85,15 +83,12 @@ geli_autodetach="YES"	# Automatically de
 #geli_da1_autodetach="NO"
 #geli_mirror_home_flags="-k /etc/geli/home.keys"
 
-geli_swap_flags="-e aes -l 256 -s 4096 -d"	# Options for GELI-encrypted
-						# swap partitions.
-
 root_rw_mount="YES"	# Set to NO to inhibit remounting root read-write.
 fsck_y_enable="NO"	# Set to YES to do fsck -y if the initial preen fails.
 fsck_y_flags=""		# Additional flags for fsck -y
 background_fsck="YES"	# Attempt to run fsck in the background where possible.
 background_fsck_delay="60" # Time to wait (seconds) before starting the fsck.
-netfs_types="nfs:NFS oldnfs:OLDNFS" # Net filesystems.
+netfs_types="nfs:NFS oldnfs:OLDNFS smbfs:SMB" # Net filesystems.
 extra_netfs_types="NO"	# List of network extra filesystem types for delayed
 			# mount at startup (or NO).
 

Modified: projects/bhyve_npt_pmap/etc/devd/usb.conf
==============================================================================
--- projects/bhyve_npt_pmap/etc/devd/usb.conf	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/etc/devd/usb.conf	Tue Aug 20 21:43:46 2013	(r254583)
@@ -4299,7 +4299,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
-	match "product" "(0x3307|0x3308|0x3309|0x330a)";
+	match "product" "(0x3307|0x3308|0x3309|0x330a|0x330d)";
 	action "kldload -n if_urtwn";
 };
 
@@ -4976,5 +4976,5 @@ nomatch 32 {
 	action "kldload -n umass";
 };
 
-# 2479 USB entries processed
+# 2480 USB entries processed
 

Modified: projects/bhyve_npt_pmap/etc/mtree/BSD.include.dist
==============================================================================
--- projects/bhyve_npt_pmap/etc/mtree/BSD.include.dist	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/etc/mtree/BSD.include.dist	Tue Aug 20 21:43:46 2013	(r254583)
@@ -176,6 +176,8 @@
         ..
         procfs
         ..
+        smbfs
+        ..
         udf
         ..
         unionfs

Modified: projects/bhyve_npt_pmap/etc/mtree/BSD.usr.dist
==============================================================================
--- projects/bhyve_npt_pmap/etc/mtree/BSD.usr.dist	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/etc/mtree/BSD.usr.dist	Tue Aug 20 21:43:46 2013	(r254583)
@@ -309,6 +309,10 @@
                 srcs
                 ..
             ..
+            smbfs
+                print
+                ..
+            ..
             sunrpc
                 dir
                 ..

Modified: projects/bhyve_npt_pmap/etc/network.subr
==============================================================================
--- projects/bhyve_npt_pmap/etc/network.subr	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/etc/network.subr	Tue Aug 20 21:43:46 2013	(r254583)
@@ -164,6 +164,9 @@ ifconfig_up()
 		fi
 	fi
 
+	ifalias $1 link alias
+	ifalias $1 ether alias
+
 	if [ ${_cfg} -eq 0 ]; then
 		${IFCONFIG_CMD} $1 up
 	fi
@@ -171,6 +174,9 @@ ifconfig_up()
 	if wpaif $1; then
 		/etc/rc.d/wpa_supplicant start $1
 		_cfg=0		# XXX: not sure this should count
+	elif hostapif $1; then
+		/etc/rc.d/hostapd start $1
+		_cfg=0
 	fi
 
 	if dhcpif $1; then
@@ -198,6 +204,9 @@ ifconfig_down()
 	if wpaif $1; then
 		/etc/rc.d/wpa_supplicant stop $1
 		_cfg=0
+	elif hostapif $1; then
+		/etc/rc.d/hostapd stop $1
+		_cfg=0
 	fi
 
 	if dhcpif $1; then
@@ -276,6 +285,7 @@ ifconfig_getargs()
 		[Nn][Oo][Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) ;;
 		[Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) ;;
 		[Ww][Pp][Aa]) ;;
+		[Hh][Oo][Ss][Tt][Aa][Pp]) ;;
 		*)
 			_args="$_args $_arg"
 			;;
@@ -311,6 +321,15 @@ dhcpif()
 	local _tmpargs _arg
 	_tmpargs=`_ifconfig_getargs $1`
 
+	case $1 in
+	lo[0-9]*|\
+	stf[0-9]*|\
+	faith[0-9]*|\
+	lp[0-9]*|\
+	sl[0-9]*)
+		return 1
+		;;
+	esac
 	if noafif $1; then
 		return 1
 	fi
@@ -376,6 +395,24 @@ wpaif()
 	return 1
 }
 
+# hostapif if
+#	Returns 0 if the interface is a HOSTAP interface and 1 otherwise.
+hostapif()
+{
+	local _tmpargs _arg
+	_tmpargs=`_ifconfig_getargs $1`
+
+	for _arg in $_tmpargs; do
+		case $_arg in
+		[Hh][Oo][Ss][Tt][Aa][Pp])
+			return 0
+			;;
+		esac
+	done
+
+	return 1
+}
+
 # afexists af
 #	Returns 0 if the address family is enabled in the kernel
 #	1 otherwise.
@@ -398,6 +435,9 @@ afexists()
 			return 1
 		fi
 		;;
+	link|ether)
+		return 0
+		;;
 	*)
 		err 1 "afexists(): Unsupported address family: $_af"
 		;;
@@ -484,7 +524,7 @@ ipv6_autoconfif()
 	_if=$1
 
 	case $_if in
-	lo0|\
+	lo[0-9]*|\
 	stf[0-9]*|\
 	faith[0-9]*|\
 	lp[0-9]*|\
@@ -666,7 +706,7 @@ ifalias()
 	afexists $2 || return $_ret
 
 	case "$2" in
-	inet|inet6)
+	inet|inet6|link|ether)
 		ifalias_af_common $1 $2 $3 && _ret=0
 		;;
 	esac
@@ -873,6 +913,11 @@ ifalias_af_common_handler()
 	*)	return	;;
 	esac
 
+	# link(ether) does not support address removal.
+	case $_af:$_action in
+	link:-alias|ether:-alias)	return ;;
+	esac
+
 	_tmpargs=
 	for _c in $_args; do
 		case $_c in
@@ -931,6 +976,8 @@ ifalias_af_common()
 		inet\ *)	_iaf=inet ;;
 		inet6\ *)	_iaf=inet6 ;;
 		ipx\ *)		_iaf=ipx ;;
+		link\ *)	_iaf=link ;;
+		ether\ *)	_iaf=ether ;;
 		esac
 
 		case ${_af}:${_action}:${_iaf}:"${ifconfig_args}" in
@@ -978,7 +1025,7 @@ ifalias_af_common()
 	_tmpargs=
 	for _c in `get_if_var $_if ifconfig_IF_aliases` $_aliasn; do
 		case $_c in
-		inet|inet6|ipx)
+		inet|inet6|ipx|link|ether)
 			case $_tmpargs in
 			${_af}\ *)
 				eval ifalias_af_common_handler $_if $_af $_action $_tmpargs && _ret=0

Modified: projects/bhyve_npt_pmap/etc/newsyslog.conf
==============================================================================
--- projects/bhyve_npt_pmap/etc/newsyslog.conf	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/etc/newsyslog.conf	Tue Aug 20 21:43:46 2013	(r254583)
@@ -32,6 +32,7 @@
 /var/log/monthly.log			640  12	   *	$M1D0 JN
 /var/log/pflog				600  3	   100	*     JB    /var/run/pflogd.pid
 /var/log/ppp.log	root:network	640  3	   100	*     JC
+/var/log/devd.log			644  3	   100	*     JC
 /var/log/security			600  10	   100	*     JC
 /var/log/sendmail.st			640  10	   *	168   BN
 /var/log/utx.log			644  3	   *	@01T05 B

Modified: projects/bhyve_npt_pmap/etc/periodic/daily/450.status-security
==============================================================================
--- projects/bhyve_npt_pmap/etc/periodic/daily/450.status-security	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/etc/periodic/daily/450.status-security	Tue Aug 20 21:43:46 2013	(r254583)
@@ -18,19 +18,19 @@ case "$daily_status_security_enable" in
 
 	case "$daily_status_security_inline" in
 	    [Yy][Ee][Ss])
-		export security_output="";;
+		daily_status_security_output="";;
+	esac
+
+	export security_output="${daily_status_security_output}"
+	case "${daily_status_security_output}" in
+	    "")
+		rc=3;;
+	    /*)
+		echo "    (output logged separately)"
+		rc=0;;
 	    *)
-		export security_output="${daily_status_security_output}"
-		case "${daily_status_security_output}" in
-		    "")
-			rc=3;;
-		    /*)
-			echo "    (output logged separately)"
-			rc=0;;
-		    *)
-			echo "    (output mailed separately)"
-			rc=0;;
-		esac;;
+		echo "    (output mailed separately)"
+		rc=0;;
 	esac
 
 	periodic security || rc=3;;

Modified: projects/bhyve_npt_pmap/etc/rc.d/Makefile
==============================================================================
--- projects/bhyve_npt_pmap/etc/rc.d/Makefile	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/etc/rc.d/Makefile	Tue Aug 20 21:43:46 2013	(r254583)
@@ -37,7 +37,6 @@ FILES=	DAEMON \
 	dhclient \
 	dmesg \
 	dumpon \
-	encswap \
 	faith \
 	fsck \
 	ftp-proxy \
@@ -139,7 +138,8 @@ FILES=	DAEMON \
 	static_arp \
 	static_ndp \
 	stf \
-	swap1 \
+	swap \
+	swaplate \
 	syscons \
 	sysctl \
 	syslogd \

Modified: projects/bhyve_npt_pmap/etc/rc.d/addswap
==============================================================================
--- projects/bhyve_npt_pmap/etc/rc.d/addswap	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/etc/rc.d/addswap	Tue Aug 20 21:43:46 2013	(r254583)
@@ -13,57 +13,12 @@
 . /etc/rc.subr
 
 name="addswap"
-start_cmd="addswap_start"
-stop_cmd="addswap_stop"
+start_cmd=":"
+stop_cmd=":"
+rcvar=
 
-addswap_start()
-{
-	case ${swapfile} in
-	[Nn][Oo] | '')
-		;;
-	*)
-		if [ -w "${swapfile}" ]; then
-			check_startmsgs && echo "Adding ${swapfile} as additional swap"
-
-			if [ -n "${swapfile_mdunit}" ]; then
-				mdev="/dev/md${swapfile_mdunit#md}"
-				mdconfig -a -t vnode -f "${swapfile}" -u ${swapfile_mdunit}
-			else
-				mdev="/dev/`mdconfig -a -t vnode -f "${swapfile}"`"
-			fi
-
-			if [ $? -eq 0 ]; then
-				swapon ${mdev}
-			else
-				echo "error creating swapfile device"
-			fi
-		fi
-		;;
-	esac
-}
-
-addswap_stop()
-{
-	case ${swapfile} in
-	[Nn][Oo] | '')
-		;;
-	*)
-		if [ -n "${swapfile_mdunit}" ]; then
-			mdev="/dev/md${swapfile_mdunit#md}"
-		else
-			mdev="/dev/`mdconfig -lv | grep "${swapfile}" | cut -f1`"
-			swapfile_mdunit=${mdev#md}
-		fi
-		if [ -n "${swapfile_mdunit}" ]; then
-			swapctl -l | grep -q ${mdev}
-			if [ $? -eq 0 ]; then
-				echo "Dismounting swapfile ${swapfile}"
-				swapoff ${mdev} && mdconfig -d -u ${swapfile_mdunit}
-			fi
-		fi
-		;;
-	esac
-}
+set_rcvar_obsolete swapfile
+set_rcvar_obsolete geli_swap_flags
 
 load_rc_config $name
 run_rc_command "$1"

Modified: projects/bhyve_npt_pmap/etc/rc.d/fsck
==============================================================================
--- projects/bhyve_npt_pmap/etc/rc.d/fsck	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/etc/rc.d/fsck	Tue Aug 20 21:43:46 2013	(r254583)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: fsck
-# REQUIRE: localswap
+# REQUIRE: swap
 # KEYWORD: nojail
 
 . /etc/rc.subr

Modified: projects/bhyve_npt_pmap/etc/rc.d/hostapd
==============================================================================
--- projects/bhyve_npt_pmap/etc/rc.d/hostapd	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/etc/rc.d/hostapd	Tue Aug 20 21:43:46 2013	(r254583)
@@ -10,11 +10,18 @@
 . /etc/rc.subr
 
 name="hostapd"
-rcvar="hostapd_enable"
 command="/usr/sbin/${name}"
 
-conf_file="/etc/${name}.conf"
-pidfile="/var/run/${name}.pid"
+ifn="$2"
+if [ -z "$ifn" ]; then
+	rcvar="hostapd_enable"
+	conf_file="/etc/${name}.conf"
+	pidfile="/var/run/${name}.pid"
+else
+	rcvar=
+	conf_file="/etc/${name}-${ifn}.conf"
+	pidfile="/var/run/${name}-${ifn}.pid"
+fi
 
 command_args="-P ${pidfile} -B ${conf_file}"
 required_files="${conf_file}"

Modified: projects/bhyve_npt_pmap/etc/rc.d/mdconfig
==============================================================================
--- projects/bhyve_npt_pmap/etc/rc.d/mdconfig	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/etc/rc.d/mdconfig	Tue Aug 20 21:43:46 2013	(r254583)
@@ -28,7 +28,7 @@
 #
 
 # PROVIDE: mdconfig
-# REQUIRE: localswap root
+# REQUIRE: swap root
 
 . /etc/rc.subr
 

Copied: projects/bhyve_npt_pmap/etc/rc.d/swap (from r252646, head/etc/rc.d/swap)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve_npt_pmap/etc/rc.d/swap	Tue Aug 20 21:43:46 2013	(r254583, copy of r252646, head/etc/rc.d/swap)
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: swap
+# REQUIRE: disks
+# KEYWORD: nojail shutdown
+
+. /etc/rc.subr
+
+name="swap"
+start_cmd='/sbin/swapon -aq'
+stop_cmd=':'
+
+load_rc_config $name
+run_rc_command "$1"

Copied: projects/bhyve_npt_pmap/etc/rc.d/swaplate (from r252646, head/etc/rc.d/swaplate)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve_npt_pmap/etc/rc.d/swaplate	Tue Aug 20 21:43:46 2013	(r254583, copy of r252646, head/etc/rc.d/swaplate)
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: swaplate
+# REQUIRE: mountlate
+# KEYWORD: nojail shutdown
+
+. /etc/rc.subr
+
+name="swaplate"
+start_cmd='/sbin/swapon -aLq'
+stop_cmd='/sbin/swapoff -aq'
+
+load_rc_config swap
+run_rc_command "$1"

Modified: projects/bhyve_npt_pmap/etc/syslog.conf
==============================================================================
--- projects/bhyve_npt_pmap/etc/syslog.conf	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/etc/syslog.conf	Tue Aug 20 21:43:46 2013	(r254583)
@@ -13,6 +13,7 @@ mail.info					/var/log/maillog
 lpr.info					/var/log/lpd-errs
 ftp.info					/var/log/xferlog
 cron.*						/var/log/cron
+!-devd
 *.=debug					/var/log/debug.log
 *.emerg						*
 # uncomment this to log all writes to /dev/console to /var/log/console.log
@@ -27,6 +28,9 @@ cron.*						/var/log/cron
 # news.crit					/var/log/news/news.crit
 # news.err					/var/log/news/news.err
 # news.notice					/var/log/news/news.notice
+# Uncomment this if you wish to see messages produced by devd
+# !devd
+# *.>=info                                       /var/log/devd.log
 !ppp
 *.*						/var/log/ppp.log
 !*

Modified: projects/bhyve_npt_pmap/gnu/usr.bin/patch/pch.c
==============================================================================
--- projects/bhyve_npt_pmap/gnu/usr.bin/patch/pch.c	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/gnu/usr.bin/patch/pch.c	Tue Aug 20 21:43:46 2013	(r254583)
@@ -83,12 +83,17 @@ re_patch(void)
 void
 open_patch_file(char *filename)
 {
+	int nr, nw;
+
 	if (filename == Nullch || !*filename || strEQ(filename, "-")) {
 		pfp = fopen(TMPPATNAME, "w");
 		if (pfp == Nullfp)
 			pfatal2("can't create %s", TMPPATNAME);
-		while (fgets(buf, buf_size, stdin) != Nullch)
-			fputs(buf, pfp);
+		while ((nr = fread(buf, 1, buf_size, stdin)) > 0) {
+			nw = fwrite(buf, 1, nr, pfp);
+			if (nr != nw)
+				pfatal2("write error to %s", TMPPATNAME);
+		}
 		Fclose(pfp);
 		filename = TMPPATNAME;
 	}
@@ -1176,7 +1181,7 @@ pgets(bool do_indent)
 					indent++;
 			}
 		}
-		Strncpy(buf, line, len - skipped);
+		memcpy(buf, line, len - skipped);
 		buf[len - skipped] = '\0';
 	}
 	return len;

Modified: projects/bhyve_npt_pmap/include/Makefile
==============================================================================
--- projects/bhyve_npt_pmap/include/Makefile	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/include/Makefile	Tue Aug 20 21:43:46 2013	(r254583)
@@ -37,7 +37,7 @@ LHDRS=	aio.h errno.h fcntl.h linker_set.
 	syslog.h ucontext.h
 
 LDIRS=	bsm cam geom net net80211 netatalk netgraph netinet netinet6 \
-	netipsec ${_netipx} netnatm \
+	netipsec ${_netipx} netnatm netsmb \
 	nfs nfsclient nfsserver \
 	sys vm
 
@@ -48,7 +48,7 @@ LSUBDIRS=	cam/ata cam/scsi \
 	dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \
 	dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
 	fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \
-	fs/procfs fs/udf fs/unionfs \
+	fs/procfs fs/smbfs fs/udf fs/unionfs \
 	geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
 	geom/mirror geom/mountver geom/multipath geom/nop \
 	geom/raid geom/raid3 geom/shsec geom/stripe geom/virstor \
@@ -80,6 +80,7 @@ INCS+=	iconv.h
 LSUBSUBDIRS+=	netgraph/bluetooth/include
 .endif
 
+# XXX unconditionally needed by <netsmb/netbios.h>
 #.if ${MK_IPX} != "no"
 _netipx=	netipx
 #.endif

Modified: projects/bhyve_npt_pmap/include/gssapi/gssapi.h
==============================================================================
--- projects/bhyve_npt_pmap/include/gssapi/gssapi.h	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/include/gssapi/gssapi.h	Tue Aug 20 21:43:46 2013	(r254583)
@@ -44,6 +44,33 @@ typedef	__ssize_t	ssize_t;
 #define	_SSIZE_T_DECLARED
 #endif
 
+/* Compatibility with Heimdal 1.5.1 */
+#ifndef GSSAPI_CPP_START
+#ifdef __cplusplus
+#define GSSAPI_CPP_START	extern "C" {
+#define GSSAPI_CPP_END		}
+#else
+#define GSSAPI_CPP_START
+#define GSSAPI_CPP_END
+#endif
+#endif
+
+/* Compatibility with Heimdal 1.5.1 */
+#ifndef BUILD_GSSAPI_LIB
+#define GSSAPI_LIB_FUNCTION
+#define GSSAPI_LIB_CALL
+#define GSSAPI_LIB_VARIABLE
+#endif
+
+/* Compatibility with Heimdal 1.5.1 */
+#ifndef GSSAPI_DEPRECATED_FUNCTION
+#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1 )))
+#define GSSAPI_DEPRECATED_FUNCTION(X) __attribute__((deprecated))
+#else
+#define GSSAPI_DEPRECATED_FUNCTION(X)
+#endif
+#endif
+
 #if 0
 /*
  * If the platform supports the xom.h header file, it should be

Modified: projects/bhyve_npt_pmap/include/iconv.h
==============================================================================
--- projects/bhyve_npt_pmap/include/iconv.h	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/include/iconv.h	Tue Aug 20 21:43:46 2013	(r254583)
@@ -43,7 +43,7 @@
 
 #define iconv_open		libiconv_open
 #define iconv_close		libiconv_close
-#define iconv(cd, in, insize, out, outsize)	libiconv(cd, __DECONST(char **, in), insize, out, outsize)
+#define iconv			libiconv
 #define iconv_t			libiconv_t
 
 struct __tag_iconv_t;
@@ -51,7 +51,7 @@ typedef	struct __tag_iconv_t	*iconv_t;
 
 __BEGIN_DECLS
 iconv_t	libiconv_open(const char *, const char *);
-size_t	libiconv(iconv_t, char ** __restrict,
+size_t	libiconv(iconv_t, const char ** __restrict,
 		     size_t * __restrict, char ** __restrict,
 		     size_t * __restrict);
 int	libiconv_close(iconv_t);
@@ -60,7 +60,7 @@ int	libiconv_close(iconv_t);
  */
 int	__iconv_get_list(char ***, size_t *, bool);
 void	__iconv_free_list(char **, size_t);
-size_t	__iconv(iconv_t, char **, size_t *, char **,
+size_t	__iconv(iconv_t, const char **, size_t *, char **,
 		     size_t *, __uint32_t, size_t *);
 #define __ICONV_F_HIDE_INVALID	0x0001
 

Modified: projects/bhyve_npt_pmap/include/paths.h
==============================================================================
--- projects/bhyve_npt_pmap/include/paths.h	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/include/paths.h	Tue Aug 20 21:43:46 2013	(r254583)
@@ -57,6 +57,8 @@
 #define	_PATH_ETC	"/etc"
 #define	_PATH_FTPUSERS	"/etc/ftpusers"
 #define	_PATH_FWMEM	"/dev/fwmem"
+#define	_PATH_GBDE	"/sbin/gbde"
+#define	_PATH_GELI	"/sbin/geli"
 #define	_PATH_HALT	"/sbin/halt"
 #ifdef COMPAT_32BIT
 #define	_PATH_I18NMODULE	"/usr/lib32/i18n"

Modified: projects/bhyve_npt_pmap/include/stdlib.h
==============================================================================
--- projects/bhyve_npt_pmap/include/stdlib.h	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/include/stdlib.h	Tue Aug 20 21:43:46 2013	(r254583)
@@ -69,7 +69,7 @@ typedef struct {
 #define	EXIT_FAILURE	1
 #define	EXIT_SUCCESS	0
 
-#define	RAND_MAX	0x7fffffff
+#define	RAND_MAX	0x7ffffffd
 
 __BEGIN_DECLS
 #ifdef _XLOCALE_H_

Modified: projects/bhyve_npt_pmap/lib/Makefile
==============================================================================
--- projects/bhyve_npt_pmap/lib/Makefile	Tue Aug 20 20:51:32 2013	(r254582)
+++ projects/bhyve_npt_pmap/lib/Makefile	Tue Aug 20 21:43:46 2013	(r254583)
@@ -102,6 +102,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_librtld_db} \
 	${_libsdp} \
 	${_libsm} \
+	${_libsmb} \

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

More information about the svn-src-projects mailing list