svn commit: r255742 - in projects/bhyve_npt_pmap: . contrib/llvm/tools/lldb/docs contrib/llvm/tools/lldb/source etc etc/rc.d include lib/clang lib/clang/liblldb lib/clang/liblldbAPI lib/clang/libll...

Neel Natu neel at FreeBSD.org
Fri Sep 20 21:53:15 UTC 2013 

Author: neel
Date: Fri Sep 20 21:53:08 2013
New Revision: 255742
URL: http://svnweb.freebsd.org/changeset/base/255742

Log:
  IFC @r255724

Added:
  projects/bhyve_npt_pmap/contrib/llvm/tools/lldb/docs/
     - copied from r255724, head/contrib/llvm/tools/lldb/docs/
  projects/bhyve_npt_pmap/lib/clang/liblldb/
     - copied from r255724, head/lib/clang/liblldb/
  projects/bhyve_npt_pmap/lib/clang/liblldbAPI/
     - copied from r255724, head/lib/clang/liblldbAPI/
  projects/bhyve_npt_pmap/lib/clang/liblldbBreakpoint/
     - copied from r255724, head/lib/clang/liblldbBreakpoint/
  projects/bhyve_npt_pmap/lib/clang/liblldbCommands/
     - copied from r255724, head/lib/clang/liblldbCommands/
  projects/bhyve_npt_pmap/lib/clang/liblldbCore/
     - copied from r255724, head/lib/clang/liblldbCore/
  projects/bhyve_npt_pmap/lib/clang/liblldbDataFormatters/
     - copied from r255724, head/lib/clang/liblldbDataFormatters/
  projects/bhyve_npt_pmap/lib/clang/liblldbExpression/
     - copied from r255724, head/lib/clang/liblldbExpression/
  projects/bhyve_npt_pmap/lib/clang/liblldbHostCommon/
     - copied from r255724, head/lib/clang/liblldbHostCommon/
  projects/bhyve_npt_pmap/lib/clang/liblldbHostFreeBSD/
     - copied from r255724, head/lib/clang/liblldbHostFreeBSD/
  projects/bhyve_npt_pmap/lib/clang/liblldbInterpreter/
     - copied from r255724, head/lib/clang/liblldbInterpreter/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginABISysV_x86_64/
     - copied from r255724, head/lib/clang/liblldbPluginABISysV_x86_64/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginCXXItaniumABI/
     - copied from r255724, head/lib/clang/liblldbPluginCXXItaniumABI/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginDisassemblerLLVM/
     - copied from r255724, head/lib/clang/liblldbPluginDisassemblerLLVM/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/
     - copied from r255724, head/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginDynamicLoaderStatic/
     - copied from r255724, head/lib/clang/liblldbPluginDynamicLoaderStatic/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginInstructionARM/
     - copied from r255724, head/lib/clang/liblldbPluginInstructionARM/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginObjectContainerBSDArchive/
     - copied from r255724, head/lib/clang/liblldbPluginObjectContainerBSDArchive/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginObjectFileELF/
     - copied from r255724, head/lib/clang/liblldbPluginObjectFileELF/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginPlatformFreeBSD/
     - copied from r255724, head/lib/clang/liblldbPluginPlatformFreeBSD/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginPlatformGDB/
     - copied from r255724, head/lib/clang/liblldbPluginPlatformGDB/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginProcessElfCore/
     - copied from r255724, head/lib/clang/liblldbPluginProcessElfCore/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginProcessFreeBSD/
     - copied from r255724, head/lib/clang/liblldbPluginProcessFreeBSD/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginProcessGDBRemote/
     - copied from r255724, head/lib/clang/liblldbPluginProcessGDBRemote/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginProcessPOSIX/
     - copied from r255724, head/lib/clang/liblldbPluginProcessPOSIX/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginProcessUtility/
     - copied from r255724, head/lib/clang/liblldbPluginProcessUtility/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginSymbolFileDWARF/
     - copied from r255724, head/lib/clang/liblldbPluginSymbolFileDWARF/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginSymbolFileSymtab/
     - copied from r255724, head/lib/clang/liblldbPluginSymbolFileSymtab/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginSymbolVendorELF/
     - copied from r255724, head/lib/clang/liblldbPluginSymbolVendorELF/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/
     - copied from r255724, head/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/
  projects/bhyve_npt_pmap/lib/clang/liblldbPluginUnwindAssemblyX86/
     - copied from r255724, head/lib/clang/liblldbPluginUnwindAssemblyX86/
  projects/bhyve_npt_pmap/lib/clang/liblldbSymbol/
     - copied from r255724, head/lib/clang/liblldbSymbol/
  projects/bhyve_npt_pmap/lib/clang/liblldbTarget/
     - copied from r255724, head/lib/clang/liblldbTarget/
  projects/bhyve_npt_pmap/lib/clang/liblldbUtility/
     - copied from r255724, head/lib/clang/liblldbUtility/
  projects/bhyve_npt_pmap/lib/clang/lldb.lib.mk
     - copied unchanged from r255724, head/lib/clang/lldb.lib.mk
  projects/bhyve_npt_pmap/lib/libc/sys/procctl.2
     - copied unchanged from r255724, head/lib/libc/sys/procctl.2
  projects/bhyve_npt_pmap/sys/mips/conf/WZR-300HP
     - copied unchanged from r255724, head/sys/mips/conf/WZR-300HP
  projects/bhyve_npt_pmap/sys/mips/conf/WZR-300HP.hints
     - copied unchanged from r255724, head/sys/mips/conf/WZR-300HP.hints
  projects/bhyve_npt_pmap/sys/powerpc/pseries/
     - copied from r255724, head/sys/powerpc/pseries/
  projects/bhyve_npt_pmap/sys/sys/procctl.h
     - copied unchanged from r255724, head/sys/sys/procctl.h
  projects/bhyve_npt_pmap/tools/build/options/WITH_LLDB
     - copied unchanged from r255724, head/tools/build/options/WITH_LLDB
  projects/bhyve_npt_pmap/usr.bin/calendar/calcpp.c
     - copied unchanged from r255724, head/usr.bin/calendar/calcpp.c
  projects/bhyve_npt_pmap/usr.bin/clang/lldb/
     - copied from r255724, head/usr.bin/clang/lldb/
  projects/bhyve_npt_pmap/usr.bin/protect/
     - copied from r255724, head/usr.bin/protect/
Modified:
  projects/bhyve_npt_pmap/LOCKS
  projects/bhyve_npt_pmap/Makefile
  projects/bhyve_npt_pmap/Makefile.inc1
  projects/bhyve_npt_pmap/UPDATING
  projects/bhyve_npt_pmap/contrib/llvm/tools/lldb/source/lldb.cpp
  projects/bhyve_npt_pmap/etc/network.subr
  projects/bhyve_npt_pmap/etc/rc.d/sendmail
  projects/bhyve_npt_pmap/include/paths.h
  projects/bhyve_npt_pmap/lib/clang/Makefile
  projects/bhyve_npt_pmap/lib/clang/libllvmmc/Makefile
  projects/bhyve_npt_pmap/lib/clang/libllvmsupport/Makefile
  projects/bhyve_npt_pmap/lib/clang/libllvmx86disassembler/Makefile
  projects/bhyve_npt_pmap/lib/libc/net/sctp_sys_calls.c
  projects/bhyve_npt_pmap/lib/libc/sys/Makefile.inc
  projects/bhyve_npt_pmap/lib/libc/sys/Symbol.map
  projects/bhyve_npt_pmap/release/powerpc/mkisoimages.sh
  projects/bhyve_npt_pmap/release/release.sh
  projects/bhyve_npt_pmap/sbin/hastd/hast.h
  projects/bhyve_npt_pmap/sbin/hastd/primary.c
  projects/bhyve_npt_pmap/sbin/hastd/secondary.c
  projects/bhyve_npt_pmap/share/i18n/csmapper/Makefile
  projects/bhyve_npt_pmap/share/i18n/esdb/Makefile
  projects/bhyve_npt_pmap/share/man/man4/capsicum.4
  projects/bhyve_npt_pmap/share/man/man4/psm.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/mk/bsd.libnames.mk
  projects/bhyve_npt_pmap/share/mk/bsd.own.mk
  projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c
  projects/bhyve_npt_pmap/sys/amd64/amd64/sys_machdep.c
  projects/bhyve_npt_pmap/sys/amd64/conf/GENERIC
  projects/bhyve_npt_pmap/sys/amd64/linux32/linux32_proto.h
  projects/bhyve_npt_pmap/sys/amd64/linux32/linux32_syscall.h
  projects/bhyve_npt_pmap/sys/amd64/linux32/linux32_syscalls.c
  projects/bhyve_npt_pmap/sys/amd64/linux32/linux32_sysent.c
  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/pmap-v6.c
  projects/bhyve_npt_pmap/sys/arm/arm/pmap.c
  projects/bhyve_npt_pmap/sys/arm/arm/sys_machdep.c
  projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32.h
  projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_capability.c
  projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_misc.c
  projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_proto.h
  projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_syscall.h
  projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_sysent.c
  projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_systrace_args.c
  projects/bhyve_npt_pmap/sys/compat/freebsd32/syscalls.master
  projects/bhyve_npt_pmap/sys/conf/files.powerpc
  projects/bhyve_npt_pmap/sys/conf/options.powerpc
  projects/bhyve_npt_pmap/sys/dev/arcmsr/arcmsr.c
  projects/bhyve_npt_pmap/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c   (contents, props changed)
  projects/bhyve_npt_pmap/sys/dev/iscsi/iscsi.c
  projects/bhyve_npt_pmap/sys/dev/iscsi/iscsi_ioctl.h
  projects/bhyve_npt_pmap/sys/dev/nfe/if_nfe.c
  projects/bhyve_npt_pmap/sys/i386/conf/GENERIC
  projects/bhyve_npt_pmap/sys/i386/i386/pmap.c
  projects/bhyve_npt_pmap/sys/i386/i386/sys_machdep.c
  projects/bhyve_npt_pmap/sys/i386/linux/linux_proto.h
  projects/bhyve_npt_pmap/sys/i386/linux/linux_syscall.h
  projects/bhyve_npt_pmap/sys/i386/linux/linux_syscalls.c
  projects/bhyve_npt_pmap/sys/i386/linux/linux_sysent.c
  projects/bhyve_npt_pmap/sys/i386/xen/mp_machdep.c
  projects/bhyve_npt_pmap/sys/i386/xen/pmap.c
  projects/bhyve_npt_pmap/sys/ia64/ia64/pmap.c
  projects/bhyve_npt_pmap/sys/kern/init_main.c
  projects/bhyve_npt_pmap/sys/kern/init_sysent.c
  projects/bhyve_npt_pmap/sys/kern/kern_fork.c
  projects/bhyve_npt_pmap/sys/kern/kern_ktrace.c
  projects/bhyve_npt_pmap/sys/kern/kern_proc.c
  projects/bhyve_npt_pmap/sys/kern/sys_process.c
  projects/bhyve_npt_pmap/sys/kern/syscalls.c
  projects/bhyve_npt_pmap/sys/kern/syscalls.master
  projects/bhyve_npt_pmap/sys/kern/systrace_args.c
  projects/bhyve_npt_pmap/sys/kern/uipc_syscalls.c
  projects/bhyve_npt_pmap/sys/kern/vfs_lookup.c
  projects/bhyve_npt_pmap/sys/mips/conf/TP-WN1043ND
  projects/bhyve_npt_pmap/sys/mips/mips/pmap.c
  projects/bhyve_npt_pmap/sys/powerpc/aim/mmu_oea.c
  projects/bhyve_npt_pmap/sys/powerpc/aim/mmu_oea64.c
  projects/bhyve_npt_pmap/sys/powerpc/booke/pmap.c
  projects/bhyve_npt_pmap/sys/powerpc/conf/DEFAULTS
  projects/bhyve_npt_pmap/sys/powerpc/conf/GENERIC
  projects/bhyve_npt_pmap/sys/powerpc/conf/GENERIC64
  projects/bhyve_npt_pmap/sys/powerpc/include/spr.h
  projects/bhyve_npt_pmap/sys/powerpc/ofw/ofw_syscons.c
  projects/bhyve_npt_pmap/sys/powerpc/powerpc/busdma_machdep.c
  projects/bhyve_npt_pmap/sys/powerpc/powerpc/cpu.c
  projects/bhyve_npt_pmap/sys/powerpc/powerpc/pmap_dispatch.c
  projects/bhyve_npt_pmap/sys/sparc64/sparc64/pmap.c
  projects/bhyve_npt_pmap/sys/sparc64/sparc64/sys_machdep.c
  projects/bhyve_npt_pmap/sys/sys/proc.h
  projects/bhyve_npt_pmap/sys/sys/syscall.h
  projects/bhyve_npt_pmap/sys/sys/syscall.mk
  projects/bhyve_npt_pmap/sys/sys/syscallsubr.h
  projects/bhyve_npt_pmap/sys/sys/sysproto.h
  projects/bhyve_npt_pmap/sys/sys/user.h
  projects/bhyve_npt_pmap/sys/vm/pmap.h
  projects/bhyve_npt_pmap/sys/vm/uma_int.h
  projects/bhyve_npt_pmap/sys/vm/vm_mmap.c
  projects/bhyve_npt_pmap/sys/vm/vm_page.c
  projects/bhyve_npt_pmap/sys/vm/vm_page.h
  projects/bhyve_npt_pmap/sys/vm/vm_reserv.c
  projects/bhyve_npt_pmap/tools/tools/sysbuild/sysbuild.sh
  projects/bhyve_npt_pmap/usr.bin/Makefile
  projects/bhyve_npt_pmap/usr.bin/calendar/Makefile   (contents, props changed)
  projects/bhyve_npt_pmap/usr.bin/calendar/calendar.1   (contents, props changed)
  projects/bhyve_npt_pmap/usr.bin/calendar/calendar.h   (contents, props changed)
  projects/bhyve_npt_pmap/usr.bin/calendar/io.c   (contents, props changed)
  projects/bhyve_npt_pmap/usr.bin/calendar/pathnames.h   (contents, props changed)
  projects/bhyve_npt_pmap/usr.bin/clang/Makefile
  projects/bhyve_npt_pmap/usr.bin/iscsictl/iscsictl.c
  projects/bhyve_npt_pmap/usr.bin/kdump/kdump.c
  projects/bhyve_npt_pmap/usr.bin/kdump/mksubr
  projects/bhyve_npt_pmap/usr.bin/procstat/procstat.1
  projects/bhyve_npt_pmap/usr.bin/svn/lib/libapr/apr.h
  projects/bhyve_npt_pmap/usr.bin/truss/syscall.h
  projects/bhyve_npt_pmap/usr.bin/truss/syscalls.c
  projects/bhyve_npt_pmap/usr.sbin/bhyve/mevent.c
  projects/bhyve_npt_pmap/usr.sbin/bhyve/mevent.h
  projects/bhyve_npt_pmap/usr.sbin/bhyve/mevent_test.c
  projects/bhyve_npt_pmap/usr.sbin/bhyve/pit_8254.c
  projects/bhyve_npt_pmap/usr.sbin/bhyve/rtc.c
  projects/bhyve_npt_pmap/usr.sbin/bhyve/virtio.c
  projects/bhyve_npt_pmap/usr.sbin/ctld/ctld.c
  projects/bhyve_npt_pmap/usr.sbin/ctld/kernel.c
  projects/bhyve_npt_pmap/usr.sbin/daemon/daemon.c
  projects/bhyve_npt_pmap/usr.sbin/gpioctl/gpioctl.8
  projects/bhyve_npt_pmap/usr.sbin/gpioctl/gpioctl.c
  projects/bhyve_npt_pmap/usr.sbin/iscsid/iscsid.c
  projects/bhyve_npt_pmap/usr.sbin/iscsid/login.c
Directory Properties:
  projects/bhyve_npt_pmap/   (props changed)
  projects/bhyve_npt_pmap/contrib/llvm/   (props changed)
  projects/bhyve_npt_pmap/lib/libc/   (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/conf/   (props changed)
  projects/bhyve_npt_pmap/sys/dev/hyperv/   (props changed)
  projects/bhyve_npt_pmap/usr.bin/calendar/   (props changed)
  projects/bhyve_npt_pmap/usr.bin/procstat/   (props changed)
  projects/bhyve_npt_pmap/usr.sbin/bhyve/   (props changed)

Modified: projects/bhyve_npt_pmap/LOCKS
==============================================================================
--- projects/bhyve_npt_pmap/LOCKS	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/LOCKS	Fri Sep 20 21:53:08 2013	(r255742)
@@ -12,3 +12,7 @@ releng/5.*	Requires Security Officer app
 releng/6.*	Requires Security Officer approval.
 releng/7.*	Requires Security Officer approval.
 releng/8.*	Requires Security Officer approval.
+head/sys/dev/random			Requires Security Officer approval.
+head/sys/libkern/arc4random.c		Requires Security Officer approval.
+stable/*/sys/dev/random			Requires Security Officer approval.
+stable/*/sys/libkern/arc4random.c	Requires Security Officer approval.

Modified: projects/bhyve_npt_pmap/Makefile
==============================================================================
--- projects/bhyve_npt_pmap/Makefile	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/Makefile	Fri Sep 20 21:53:08 2013	(r255742)
@@ -341,7 +341,7 @@ MMAKEENV=	MAKEOBJDIRPREFIX=${MYMAKE:H} \
 MMAKE=		${MMAKEENV} ${MAKE} \
 		-D_UPGRADING \
 		-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
-		-DNO_CPU_CFLAGS -DNO_WERROR
+		-DNO_CPU_CFLAGS -DNO_WERROR DESTDIR= PROGNAME=${MYMAKE:T}
 
 make bmake: .PHONY
 	@echo
@@ -349,10 +349,10 @@ make bmake: .PHONY
 	@echo ">>> Building an up-to-date make(1)"
 	@echo "--------------------------------------------------------------"
 	${_+_}@cd ${.CURDIR}/usr.bin/${.TARGET}; \
-		${MMAKE} obj DESTDIR= && \
-		${MMAKE} depend DESTDIR= && \
-		${MMAKE} all DESTDIR= PROGNAME=${MYMAKE:T} && \
-		${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= PROGNAME=${MYMAKE:T}
+		${MMAKE} obj && \
+		${MMAKE} depend && \
+		${MMAKE} all && \
+		${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR=
 
 tinderbox toolchains kernel-toolchains: upgrade_checks
 

Modified: projects/bhyve_npt_pmap/Makefile.inc1
==============================================================================
--- projects/bhyve_npt_pmap/Makefile.inc1	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/Makefile.inc1	Fri Sep 20 21:53:08 2013	(r255742)
@@ -676,8 +676,9 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_inc
 #
 # Checks to be sure system is ready for installworld/installkernel.
 #
-installcheck:
-installcheck_UGID:
+installcheck: _installcheck_world _installcheck_kernel
+_installcheck_world:
+_installcheck_kernel:
 
 #
 # Require DESTDIR to be set if installing for a different architecture or
@@ -686,8 +687,9 @@ installcheck_UGID:
 .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} || \
     defined(DB_FROM_SRC)
 .if !make(distributeworld)
-installcheck: installcheck_DESTDIR
-installcheck_DESTDIR:
+_installcheck_world: __installcheck_DESTDIR
+_installcheck_kernel: __installcheck_DESTDIR
+__installcheck_DESTDIR:
 .if !defined(DESTDIR) || empty(DESTDIR)
 	@echo "ERROR: Please set DESTDIR!"; \
 	false
@@ -709,7 +711,12 @@ CHECK_GIDS+=	smmsp
 CHECK_UIDS+=	proxy
 CHECK_GIDS+=	proxy authpf
 .endif
-installcheck_UGID:
+.if ${MK_UNBOUND} != "no"
+CHECK_UIDS+=	unbound
+CHECK_GIDS+=	unbound
+.endif
+_installcheck_world: __installcheck_UGID
+__installcheck_UGID:
 .for uid in ${CHECK_UIDS}
 	@if ! `id -u ${uid} >/dev/null 2>&1`; then \
 		echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \
@@ -764,7 +771,7 @@ EXTRA_DISTRIBUTIONS+=	lib32
 
 MTREE_MAGIC?=	mtree 2.0
 
-distributeworld installworld: installcheck installcheck_UGID
+distributeworld installworld: _installcheck_world
 	mkdir -p ${INSTALLTMP}
 	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \
@@ -1042,7 +1049,7 @@ buildkernel:
 # Install the kernel defined by INSTALLKERNEL
 #
 installkernel installkernel.debug \
-reinstallkernel reinstallkernel.debug: installcheck
+reinstallkernel reinstallkernel.debug: _installcheck_kernel
 .if empty(INSTALLKERNEL)
 	@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
 	false

Modified: projects/bhyve_npt_pmap/UPDATING
==============================================================================
--- projects/bhyve_npt_pmap/UPDATING	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/UPDATING	Fri Sep 20 21:53:08 2013	(r255742)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20130916:
+	With the addition of unbound(8), a new unbound user is now
+	required during installworld.  "mergemaster -p" can be used to
+	add the user prior to installworld, as documented in the handbook.
+
 20130911:
 	OpenSSH is now built with DNSSEC support, and will by default
 	silently trust signed SSHFP records.  This can be controlled with
@@ -58,9 +63,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	kdump, procstat, rwho, rwhod, uniq.
 
 20130903:
-       AES-NI intrinsic support has been added to gcc.  The AES-NI module
-       has been updated to use this support.  A new gcc is required to build
-       the aesni module on both i386 and amd64.
+	AES-NI intrinsic support has been added to gcc.  The AES-NI module
+	has been updated to use this support.  A new gcc is required to build
+	the aesni module on both i386 and amd64.
 
 20130827:
         Thomas Dickey (vendor author thereof) reports that dialog(1) since
@@ -302,8 +307,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 
 20121201:
 	With the addition of auditdistd(8), a new auditdistd user is now
-	depended on during installworld.  "mergemaster -p" can be used to add
-	the user prior to installworld, as documented in the handbook.
+	required during installworld.  "mergemaster -p" can be used to
+	add the user prior to installworld, as documented in the handbook.
 
 20121117:
 	The sin6_scope_id member variable in struct sockaddr_in6 is now

Modified: projects/bhyve_npt_pmap/contrib/llvm/tools/lldb/source/lldb.cpp
==============================================================================
--- projects/bhyve_npt_pmap/contrib/llvm/tools/lldb/source/lldb.cpp	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/contrib/llvm/tools/lldb/source/lldb.cpp	Fri Sep 20 21:53:08 2013	(r255742)
@@ -24,8 +24,6 @@
 
 #include "llvm/ADT/StringRef.h"
 
-#include "Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h"
-#include "Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h"
 #include "Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h"
 #include "Plugins/Disassembler/llvm/DisassemblerLLVMC.h"
 #include "Plugins/Instruction/ARM/EmulateInstructionARM.h"
@@ -92,8 +90,6 @@ lldb_private::Initialize ()
         Timer::Initialize ();
         Timer scoped_timer (__PRETTY_FUNCTION__, __PRETTY_FUNCTION__);
         
-        ABIMacOSX_i386::Initialize();
-        ABIMacOSX_arm::Initialize();
         ABISysV_x86_64::Initialize();
         DisassemblerLLVMC::Initialize();
         ObjectContainerBSDArchive::Initialize();
@@ -172,8 +168,6 @@ lldb_private::Terminate ()
     // Terminate and unload and loaded system or user LLDB plug-ins
     PluginManager::Terminate();
 
-    ABIMacOSX_i386::Terminate();
-    ABIMacOSX_arm::Terminate();
     ABISysV_x86_64::Terminate();
     DisassemblerLLVMC::Terminate();
     ObjectContainerBSDArchive::Terminate();

Modified: projects/bhyve_npt_pmap/etc/network.subr
==============================================================================
--- projects/bhyve_npt_pmap/etc/network.subr	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/etc/network.subr	Fri Sep 20 21:53:08 2013	(r255742)
@@ -654,18 +654,16 @@ ipv4_down()
 
 	ifalias ${_if} inet -alias && _ret=0
 
-	inetList="`${IFCONFIG_CMD} ${_if} | grep 'inet ' | tr "\n" "$_ifs"`"
+	inetList="`${IFCONFIG_CMD} ${_if} | grep 'inet ' | tr "\n\t" "$_ifs"`"
 
 	oldifs="$IFS"
 	IFS="$_ifs"
 	for _inet in $inetList ; do
 		# get rid of extraneous line
 		case $_inet in
-		"")				break ;;
-		\	inet\ *|inet\ *)	;;
-		*)				continue ;;
+		inet\ *)	;;
+		*)		continue ;;
 		esac
-		[ -z "$_inet" ] && break
 
 		_inet=`expr "$_inet" : '.*\(inet \([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}\).*'`
 
@@ -696,13 +694,16 @@ ipv6_down()
 	ipv6_prefix_hostid_addr_common ${_if} -alias && _ret=0
 	ifalias ${_if} inet6 -alias && _ret=0
 
-	inetList="`${IFCONFIG_CMD} ${_if} | grep 'inet6 ' | tr "\n" "$_ifs"`"
+	inetList="`${IFCONFIG_CMD} ${_if} | grep 'inet6 ' | tr "\n\t" "$_ifs"`"
 
 	oldifs="$IFS"
 	IFS="$_ifs"
 	for _inet6 in $inetList ; do
 		# get rid of extraneous line
-		[ -z "$_inet6" ] && break
+		case $_inet in
+		inet6\ *)	;;
+		*)		continue ;;
+		esac
 
 		_inet6=`expr "$_inet6" : '.*\(inet6 \([0-9a-f:]*\)\).*'`
 

Modified: projects/bhyve_npt_pmap/etc/rc.d/sendmail
==============================================================================
--- projects/bhyve_npt_pmap/etc/rc.d/sendmail	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/etc/rc.d/sendmail	Fri Sep 20 21:53:08 2013	(r255742)
@@ -80,20 +80,17 @@ required_files=
 if checkyesno sendmail_submit_enable; then
 	name="sendmail_submit"
 	rcvar="sendmail_submit_enable"
-	start_cmd="${command} ${sendmail_submit_flags}"
 	run_rc_command "$1"
 fi
 
 if checkyesno sendmail_outbound_enable; then
 	name="sendmail_outbound"
 	rcvar="sendmail_outbound_enable"
-	start_cmd="${command} ${sendmail_outbound_flags}"
 	run_rc_command "$1"
 fi
 
-name="sendmail_clientmqueue"
+name="sendmail_msp_queue"
 rcvar="sendmail_msp_queue_enable"
-start_cmd="${command} ${sendmail_msp_queue_flags}"
-pidfile="${sendmail_mspq_pidfile:-/var/spool/clientmqueue/sm-client.pid}"
+pidfile="${sendmail_msp_queue_pidfile:-/var/spool/clientmqueue/sm-client.pid}"
 required_files="/etc/mail/submit.cf"
 run_rc_command "$1"

Modified: projects/bhyve_npt_pmap/include/paths.h
==============================================================================
--- projects/bhyve_npt_pmap/include/paths.h	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/include/paths.h	Fri Sep 20 21:53:08 2013	(r255742)
@@ -50,6 +50,7 @@
 #define	_PATH_CSHELL	"/bin/csh"
 #define	_PATH_CSMAPPER	"/usr/share/i18n/csmapper"
 #define	_PATH_DEFTAPE	"/dev/sa0"
+#define	_PATH_DEVGPIOC	"/dev/gpioc"
 #define	_PATH_DEVNULL	"/dev/null"
 #define	_PATH_DEVZERO	"/dev/zero"
 #define	_PATH_DRUM	"/dev/drum"

Modified: projects/bhyve_npt_pmap/lib/clang/Makefile
==============================================================================
--- projects/bhyve_npt_pmap/lib/clang/Makefile	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/lib/clang/Makefile	Fri Sep 20 21:53:08 2013	(r255742)
@@ -3,17 +3,22 @@
 .include <bsd.own.mk>
 
 .if !make(install)
-.if !defined(EARLY_BUILD) && defined(MK_CLANG_FULL) && ${MK_CLANG_FULL} != "no"
+.if !defined(EARLY_BUILD)
+.if defined(MK_CLANG_FULL) && ${MK_CLANG_FULL} != "no"
 _libclangstaticanalyzer= \
 	libclangstaticanalyzercheckers \
 	libclangstaticanalyzercore \
 	libclangstaticanalyzerfrontend
 _libclangarcmigrate= \
 	libclangarcmigrate
+.endif # MK_CLANG_FULL
+.if (defined(MK_CLANG_FULL) && ${MK_CLANG_FULL} != "no") || \
+    (defined(MK_LLDB) && ${MK_LLDB} != "no")
 _libclangrewriter= \
 	libclangrewritecore \
 	libclangrewritefrontend
-.endif # !EARLY_BUILD && MK_CLANG_FULL
+.endif # (MK_CLANG_FULL || MK_LLDB)
+.endif # !EARLY_BUILD
 
 SUBDIR=	libclanganalysis \
 	${_libclangarcmigrate} \
@@ -82,14 +87,55 @@ SUBDIR=	libclanganalysis \
 	libllvmx86utils
 
 .if ${MK_CLANG_EXTRAS} != "no"
-SUBDIR+=libllvmdebuginfo \
-	libllvmexecutionengine \
+SUBDIR+=libllvmdebuginfo
+.endif # MK_CLANG_EXTRAS
+.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
+SUBDIR+=libllvmexecutionengine \
 	libllvminterpreter \
 	libllvmjit \
 	libllvmmcdisassembler \
 	libllvmmcjit \
 	libllvmruntimedyld
-.endif # MK_CLANG_EXTRAS
+.endif # MK_CLANG_EXTRAS | LLDB
+
+.if !defined(EARLY_BUILD) && ${MK_LLDB} != "no"
+SUBDIR+=liblldb \
+	\
+	liblldbAPI \
+	liblldbBreakpoint \
+	liblldbCommands \
+	liblldbCore \
+	liblldbDataFormatters \
+	liblldbExpression \
+	liblldbHostCommon \
+	liblldbHostFreeBSD \
+	liblldbInterpreter \
+	liblldbSymbol \
+	liblldbTarget \
+	liblldbUtility \
+	\
+	liblldbPluginABISysV_x86_64 \
+	liblldbPluginCXXItaniumABI \
+	liblldbPluginDisassemblerLLVM \
+	liblldbPluginDynamicLoaderStatic \
+	liblldbPluginDynamicLoaderPosixDYLD \
+	liblldbPluginInstructionARM \
+	liblldbPluginObjectContainerBSDArchive \
+	liblldbPluginObjectFileELF \
+	liblldbPluginPlatformFreeBSD \
+	liblldbPluginPlatformGDB \
+	liblldbPluginProcessElfCore \
+	liblldbPluginProcessFreeBSD \
+	liblldbPluginProcessGDBRemote \
+	liblldbPluginProcessPOSIX \
+	liblldbPluginProcessUtility \
+	liblldbPluginSymbolFileDWARF \
+	liblldbPluginSymbolFileSymtab \
+	liblldbPluginSymbolVendorELF \
+	liblldbPluginUnwindAssemblyInstEmulation \
+	liblldbPluginUnwindAssemblyX86
+.endif # !EARLY_BUILD && MK_LLDB
+
 .endif # !make(install)
 
 SUBDIR+= include

Modified: projects/bhyve_npt_pmap/lib/clang/libllvmmc/Makefile
==============================================================================
--- projects/bhyve_npt_pmap/lib/clang/libllvmmc/Makefile	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/lib/clang/libllvmmc/Makefile	Fri Sep 20 21:53:08 2013	(r255742)
@@ -48,7 +48,7 @@ SRCS=	ELFObjectWriter.cpp \
 	WinCOFFObjectWriter.cpp \
 	WinCOFFStreamer.cpp
 
-.if ${MK_CLANG_EXTRAS} != "no"
+.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
 SRCS+=	MCDisassembler.cpp
 .endif
 

Modified: projects/bhyve_npt_pmap/lib/clang/libllvmsupport/Makefile
==============================================================================
--- projects/bhyve_npt_pmap/lib/clang/libllvmsupport/Makefile	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/lib/clang/libllvmsupport/Makefile	Fri Sep 20 21:53:08 2013	(r255742)
@@ -84,11 +84,14 @@ SRCS=	APFloat.cpp \
 	regstrlcpy.c \
 	system_error.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
+SRCS+=	DataExtractor.cpp \
+	Disassembler.cpp
+.endif
+
 .if ${MK_CLANG_EXTRAS} != "no"
 SRCS+=	Compression.cpp \
-	DataExtractor.cpp \
 	DataStream.cpp \
-	Disassembler.cpp \
 	FileUtilities.cpp \
 	SystemUtils.cpp
 .endif

Modified: projects/bhyve_npt_pmap/lib/clang/libllvmx86disassembler/Makefile
==============================================================================
--- projects/bhyve_npt_pmap/lib/clang/libllvmx86disassembler/Makefile	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/lib/clang/libllvmx86disassembler/Makefile	Fri Sep 20 21:53:08 2013	(r255742)
@@ -8,7 +8,7 @@ SRCDIR=	lib/Target/X86/Disassembler
 INCDIR=	lib/Target/X86
 SRCS=	X86Disassembler.cpp
 
-.if ${MK_CLANG_EXTRAS} != "no"
+.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
 SRCS+=	X86DisassemblerDecoder.c
 .endif
 

Copied: projects/bhyve_npt_pmap/lib/clang/lldb.lib.mk (from r255724, head/lib/clang/lldb.lib.mk)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve_npt_pmap/lib/clang/lldb.lib.mk	Fri Sep 20 21:53:08 2013	(r255742, copy of r255724, head/lib/clang/lldb.lib.mk)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+LLDB_SRCS= ${.CURDIR}/../../../contrib/llvm/tools/lldb
+
+CFLAGS+=-I${LLDB_SRCS}/include -I${LLDB_SRCS}/source
+CXXFLAGS+=-std=c++11 -DLLDB_DISABLE_PYTHON                      
+
+.include "clang.lib.mk"

Modified: projects/bhyve_npt_pmap/lib/libc/net/sctp_sys_calls.c
==============================================================================
--- projects/bhyve_npt_pmap/lib/libc/net/sctp_sys_calls.c	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/lib/libc/net/sctp_sys_calls.c	Fri Sep 20 21:53:08 2013	(r255742)
@@ -101,10 +101,10 @@ sctp_connectx(int sd, const struct socka
     sctp_assoc_t * id)
 {
 	char *buf;
-	int i, ret, cnt, *aa;
+	int i, ret, *aa;
 	char *cpto;
 	const struct sockaddr *at;
-	size_t len = sizeof(int);
+	size_t len;
 
 	/* validate the address count and list */
 	if ((addrs == NULL) || (addrcnt <= 0)) {
@@ -115,8 +115,8 @@ sctp_connectx(int sd, const struct socka
 		errno = E2BIG;
 		return (-1);
 	}
+	len = sizeof(int);
 	at = addrs;
-	cnt = 0;
 	cpto = buf + sizeof(int);
 	/* validate all the addresses and get the size */
 	for (i = 0; i < addrcnt; i++) {
@@ -161,6 +161,7 @@ sctp_connectx(int sd, const struct socka
 	if ((ret == 0) && (id != NULL)) {
 		*id = *(sctp_assoc_t *) buf;
 	}
+	free(buf);
 	return (ret);
 }
 

Modified: projects/bhyve_npt_pmap/lib/libc/sys/Makefile.inc
==============================================================================
--- projects/bhyve_npt_pmap/lib/libc/sys/Makefile.inc	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/lib/libc/sys/Makefile.inc	Fri Sep 20 21:53:08 2013	(r255742)
@@ -197,6 +197,7 @@ MAN+=	abort2.2 \
 	posix_fadvise.2 \
 	posix_fallocate.2 \
 	posix_openpt.2 \
+	procctl.2 \
 	profil.2 \
 	pselect.2 \
 	ptrace.2 \

Modified: projects/bhyve_npt_pmap/lib/libc/sys/Symbol.map
==============================================================================
--- projects/bhyve_npt_pmap/lib/libc/sys/Symbol.map	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/lib/libc/sys/Symbol.map	Fri Sep 20 21:53:08 2013	(r255742)
@@ -395,6 +395,7 @@ FBSD_1.3 {
 	ffclock_setestimate;
 	pipe2;
 	posix_fadvise;
+	procctl;
 	wait6;
 };
 
@@ -822,6 +823,8 @@ FBSDprivate_1.0 {
 	__sys_poll;
 	_preadv;
 	__sys_preadv;
+	_procctl;
+	__sys_procctl;
 	_profil;
 	__sys_profil;
 	_pselect;

Copied: projects/bhyve_npt_pmap/lib/libc/sys/procctl.2 (from r255724, head/lib/libc/sys/procctl.2)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve_npt_pmap/lib/libc/sys/procctl.2	Fri Sep 20 21:53:08 2013	(r255742, copy of r255724, head/lib/libc/sys/procctl.2)
@@ -0,0 +1,142 @@
+.\" Copyright (c) 2013 Advanced Computing Technologies LLC
+.\" Written by: John H. Baldwin <jhb at FreeBSD.org>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd September 19, 2013
+.Dt PROCCTL 2
+.Os
+.Sh NAME
+.Nm procctl
+.Nd control processes
+.Sh LIBRARY
+.Lb libc
+.Sh SYNOPSIS
+.In sys/procctl.h
+.Ft int
+.Fn procctl "idtype_t idtype" "id_t id" "int cmd" "void *arg"
+.Sh DESCRIPTION
+The
+.Fn procctl
+system call provides for control over processes.
+The
+.Fa idtype
+and
+.Fa id
+arguments specify the set of processes to control.
+If multiple processes match the identifier,
+.Nm
+will make a
+.Dq best effort
+to control as many of the selected possibles as possible.
+An error is only returned if no selected processes successfully complete
+the request.
+The following identifier types are supported:
+.Bl -tag -width "Dv P_PGID"
+.It Dv P_PID
+Control the process with the process ID
+.Fa id .
+.It Dv P_PGID
+Control processes belonging to the process group with the ID
+.Fa id .
+.El
+.Pp
+The control request to perform is specified by the
+.Fa cmd
+argument.
+The following commands are supported:
+.Bl -tag -width "Dv PROC_SPROTECT"
+.It Dv PROC_SPROTECT
+Set process protection state.
+This is used to mark a process as protected from being killed if the system
+exhausts available memory and swap.
+The
+.Fa arg
+parameter must point to an integer containing an operation and zero or more
+optional flags.
+The following operations are supported:
+.Bl -tag -width "Dv PPROT_CLEAR"
+.It Dv PPROT_SET
+Mark the selected processes as protected.
+.It Dv PPROT_CLEAR
+Clear the protected state of selected processes.
+.El
+.Pp
+The following optional flags are supported:
+.Bl -tag -width "Dv PPROT_DESCE"
+.It Dv PPROT_DESCEND
+Apply the requested operation to all child processes of each selected process
+in addition to each selected process.
+.It Dv PPROT_INHERIT
+When used with
+.Dv PPROT_SET ,
+mark all future child processes of each selected process as protected.
+Future child processes will also mark all of their future child processes.
+.El
+.El
+.Sh RETURN VALUES
+If an error occurs, a value of -1 is returned and
+.Va errno
+is set to indicate the error.
+.Sh ERRORS
+The
+.Fn procctl
+system call
+will fail if:
+.Bl -tag -width Er
+.It Bq Er EFAULT
+The
+.Fa arg
+points outside the process's allocated address space.
+.It Bq Er EINVAL
+The
+.Fa cmd
+argument specifies an unsupported command.
+.Pp
+The
+.Fa idtype
+argument specifies an unsupported identifier type.
+.It Bq Er EPERM
+The calling process does not have permission to perform the requested
+operation on any of the selected processes.
+.It Bq Er ESRCH
+No processes matched the requested
+.Fa idtype
+and
+.Fa id .
+.It Bq Er EINVAL
+An invalid operation or flag was passed in
+.Fa arg
+for a
+.Dv PROC_SPROTECT
+command.
+.El
+.Sh SEE ALSO
+.Xr ptrace 2
+.Sh HISTORY
+The
+.Fn procctl
+function appeared in
+.Fx 10 .

Modified: projects/bhyve_npt_pmap/release/powerpc/mkisoimages.sh
==============================================================================
--- projects/bhyve_npt_pmap/release/powerpc/mkisoimages.sh	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/release/powerpc/mkisoimages.sh	Fri Sep 20 21:53:08 2013	(r255742)
@@ -40,7 +40,7 @@ if [ "x$1" = "x-b" ]; then
 <chrp-boot>
 <description>FreeBSD Install</description>
 <os-name>FreeBSD</os-name>
-<boot-script>boot &device;:&partition;,\ppc\chrp\loader</boot-script>
+<boot-script>boot &device;:,\ppc\chrp\loader</boot-script>
 </chrp-boot>
 EOF
 	bootable="$bootable -o chrp-boot"

Modified: projects/bhyve_npt_pmap/release/release.sh
==============================================================================
--- projects/bhyve_npt_pmap/release/release.sh	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/release/release.sh	Fri Sep 20 21:53:08 2013	(r255742)
@@ -71,7 +71,6 @@ KERNEL="GENERIC"
 # ports/ checkout also forces NODOC to be set.
 NODOC=
 NOPORTS=
-MAKE_FLAGS="${MAKE_FLAGS}"
 
 usage() {
 	echo "Usage: $0 [-c release.conf]"

Modified: projects/bhyve_npt_pmap/sbin/hastd/hast.h
==============================================================================
--- projects/bhyve_npt_pmap/sbin/hastd/hast.h	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/sbin/hastd/hast.h	Fri Sep 20 21:53:08 2013	(r255742)
@@ -226,8 +226,10 @@ struct hast_resource {
 
 	/* Activemap structure. */
 	struct activemap *hr_amp;
-	/* Locked used to synchronize access to hr_amp. */
+	/* Lock used to synchronize access to hr_amp. */
 	pthread_mutex_t hr_amp_lock;
+	/* Lock used to synchronize access to hr_amp diskmap. */
+	pthread_mutex_t hr_amp_diskmap_lock;
 
 	/* Number of BIO_READ requests. */
 	uint64_t	hr_stat_read;

Modified: projects/bhyve_npt_pmap/sbin/hastd/primary.c
==============================================================================
--- projects/bhyve_npt_pmap/sbin/hastd/primary.c	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/sbin/hastd/primary.c	Fri Sep 20 21:53:08 2013	(r255742)
@@ -172,7 +172,7 @@ static pthread_mutex_t metadata_lock;
 	    hio_next[(ncomp)]);						\
 	mtx_unlock(&hio_##name##_list_lock[ncomp]);			\
 	if (_wakeup)							\
-		cv_signal(&hio_##name##_list_cond[(ncomp)]);		\
+		cv_broadcast(&hio_##name##_list_cond[(ncomp)]);		\
 } while (0)
 #define	QUEUE_INSERT2(hio, name)	do {				\
 	bool _wakeup;							\
@@ -182,7 +182,7 @@ static pthread_mutex_t metadata_lock;
 	TAILQ_INSERT_TAIL(&hio_##name##_list, (hio), hio_##name##_next);\
 	mtx_unlock(&hio_##name##_list_lock);				\
 	if (_wakeup)							\
-		cv_signal(&hio_##name##_list_cond);			\
+		cv_broadcast(&hio_##name##_list_cond);			\
 } while (0)
 #define	QUEUE_TAKE1(hio, name, ncomp, timeout)	do {			\
 	bool _last;							\
@@ -291,22 +291,28 @@ primary_exitx(int exitcode, const char *
 	exit(exitcode);
 }
 
+/* Expects res->hr_amp locked, returns unlocked. */
 static int
 hast_activemap_flush(struct hast_resource *res)
 {
 	const unsigned char *buf;
 	size_t size;
+	int ret;
 
+	mtx_lock(&res->hr_amp_diskmap_lock);
 	buf = activemap_bitmap(res->hr_amp, &size);
+	mtx_unlock(&res->hr_amp_lock);
 	PJDLOG_ASSERT(buf != NULL);
 	PJDLOG_ASSERT((size % res->hr_local_sectorsize) == 0);
+	ret = 0;
 	if (pwrite(res->hr_localfd, buf, size, METADATA_SIZE) !=
 	    (ssize_t)size) {
 		pjdlog_errno(LOG_ERR, "Unable to flush activemap to disk");
 		res->hr_stat_activemap_write_error++;
-		return (-1);
+		ret = -1;
 	}
-	if (res->hr_metaflush == 1 && g_flush(res->hr_localfd) == -1) {
+	if (ret == 0 && res->hr_metaflush == 1 &&
+	    g_flush(res->hr_localfd) == -1) {
 		if (errno == EOPNOTSUPP) {
 			pjdlog_warning("The %s provider doesn't support flushing write cache. Disabling it.",
 			    res->hr_localpath);
@@ -315,10 +321,11 @@ hast_activemap_flush(struct hast_resourc
 			pjdlog_errno(LOG_ERR,
 			    "Unable to flush disk cache on activemap update");
 			res->hr_stat_activemap_flush_error++;
-			return (-1);
+			ret = -1;
 		}
 	}
-	return (0);
+	mtx_unlock(&res->hr_amp_diskmap_lock);
+	return (ret);
 }
 
 static bool
@@ -783,6 +790,7 @@ init_remote(struct hast_resource *res, s
 		 * Now that we merged bitmaps from both nodes, flush it to the
 		 * disk before we start to synchronize.
 		 */
+		mtx_lock(&res->hr_amp_lock);
 		(void)hast_activemap_flush(res);
 	}
 	nv_free(nvin);
@@ -1288,8 +1296,9 @@ ggate_recv_thread(void *arg)
 			    ggio->gctl_offset, ggio->gctl_length)) {
 				res->hr_stat_activemap_update++;
 				(void)hast_activemap_flush(res);
+			} else {
+				mtx_unlock(&res->hr_amp_lock);
 			}
-			mtx_unlock(&res->hr_amp_lock);
 			break;
 		case BIO_DELETE:
 			res->hr_stat_delete++;
@@ -1650,8 +1659,9 @@ done_queue:
 			if (activemap_need_sync(res->hr_amp, ggio->gctl_offset,
 			    ggio->gctl_length)) {
 				(void)hast_activemap_flush(res);
+			} else {
+				mtx_unlock(&res->hr_amp_lock);
 			}
-			mtx_unlock(&res->hr_amp_lock);
 			if (hio->hio_replication == HAST_REPLICATION_MEMSYNC)
 				(void)refcnt_release(&hio->hio_countdown);
 		}
@@ -1918,8 +1928,9 @@ ggate_send_thread(void *arg)
 			    ggio->gctl_offset, ggio->gctl_length)) {
 				res->hr_stat_activemap_update++;
 				(void)hast_activemap_flush(res);
+			} else {
+				mtx_unlock(&res->hr_amp_lock);
 			}
-			mtx_unlock(&res->hr_amp_lock);
 		}
 		if (ggio->gctl_cmd == BIO_WRITE) {
 			/*
@@ -2015,8 +2026,11 @@ sync_thread(void *arg __unused)
 			 */
 			if (activemap_extent_complete(res->hr_amp, syncext))
 				(void)hast_activemap_flush(res);
+			else
+				mtx_unlock(&res->hr_amp_lock);
+		} else {
+			mtx_unlock(&res->hr_amp_lock);
 		}
-		mtx_unlock(&res->hr_amp_lock);
 		if (dorewind) {
 			dorewind = false;
 			if (offset == -1)

Modified: projects/bhyve_npt_pmap/sbin/hastd/secondary.c
==============================================================================
--- projects/bhyve_npt_pmap/sbin/hastd/secondary.c	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/sbin/hastd/secondary.c	Fri Sep 20 21:53:08 2013	(r255742)
@@ -85,14 +85,13 @@ static TAILQ_HEAD(, hio) hio_free_list;
 static pthread_mutex_t hio_free_list_lock;
 static pthread_cond_t hio_free_list_cond;
 /*
- * Disk thread (the one that do I/O requests) takes requests from this list.
+ * Disk thread (the one that does I/O requests) takes requests from this list.
  */
 static TAILQ_HEAD(, hio) hio_disk_list;
 static pthread_mutex_t hio_disk_list_lock;
 static pthread_cond_t hio_disk_list_cond;
 /*
- * There is one recv list for every component, although local components don't
- * use recv lists as local requests are done synchronously.
+ * Thread that sends requests back to primary takes requests from this list.
  */
 static TAILQ_HEAD(, hio) hio_send_list;
 static pthread_mutex_t hio_send_list_lock;
@@ -115,7 +114,7 @@ static void *send_thread(void *arg);
 	TAILQ_INSERT_TAIL(&hio_##name##_list, (hio), hio_next);		\
 	mtx_unlock(&hio_##name##_list_lock);				\
 	if (_wakeup)							\
-		cv_signal(&hio_##name##_list_cond);			\
+		cv_broadcast(&hio_##name##_list_cond);			\
 } while (0)
 #define	QUEUE_TAKE(name, hio)	do {					\
 	mtx_lock(&hio_##name##_list_lock);				\

Modified: projects/bhyve_npt_pmap/share/i18n/csmapper/Makefile
==============================================================================
--- projects/bhyve_npt_pmap/share/i18n/csmapper/Makefile	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/share/i18n/csmapper/Makefile	Fri Sep 20 21:53:08 2013	(r255742)
@@ -7,10 +7,11 @@ SUBDIR=	APPLE AST BIG5 CNS CP EBCDIC GB 
 	KAZAKH KOI KS MISC TCVN
 
 mapper.dir: ${SUBDIR}
-	> ${.TARGET}
-.for i in ${SUBDIR}
-	cat ${i}/mapper.dir.${i} >> ${.TARGET}
-.endfor
+	newfile=$$(for i in ${SUBDIR}; do \
+		cat $$i/mapper.dir.$$i; \
+	done); \
+	[ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \
+		printf '%s\n' "$$newfile" >${.TARGET}
 mapper.dir.db: mapper.dir
 	${MKCSMAPPER} -m -o ${.TARGET} ${.ALLSRC}
 
@@ -18,10 +19,11 @@ FILES+=	mapper.dir mapper.dir.db
 CLEANFILES+= mapper.dir mapper.dir.db
 
 charset.pivot: ${SUBDIR}
-	> ${.TARGET}
-.for i in ${SUBDIR}
-	cat ${i}/charset.pivot.${i} >> ${.TARGET}
-.endfor
+	newfile=$$(for i in ${SUBDIR}; do \
+		cat $$i/charset.pivot.$$i; \
+	done); \
+	[ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \
+		printf '%s\n' "$$newfile" >${.TARGET}
 charset.pivot.pvdb: charset.pivot
 	${MKCSMAPPER} -p -o ${.TARGET} ${.ALLSRC}
 

Modified: projects/bhyve_npt_pmap/share/i18n/esdb/Makefile
==============================================================================
--- projects/bhyve_npt_pmap/share/i18n/esdb/Makefile	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/share/i18n/esdb/Makefile	Fri Sep 20 21:53:08 2013	(r255742)
@@ -10,18 +10,20 @@ FILES+=	esdb.dir esdb.dir.db esdb.alias 
 CLEANFILES= ${FILES}
 
 esdb.dir: ${SUBDIR}
-	> $@
-.for i in ${SUBDIR}
-	cat ${i}/esdb.dir.${i} >>${.TARGET}
-.endfor
+	newfile=$$(for i in ${SUBDIR}; do \
+		cat $$i/esdb.dir.$$i; \
+	done); \
+	[ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \
+		printf '%s\n' "$$newfile" >${.TARGET}
 esdb.dir.db: esdb.dir
 	${MKESDB} -m -o ${.TARGET} ${.ALLSRC}
 
 esdb.alias: ${SUBDIR}
-	> $@
-.for i in ${SUBDIR}
-	cat ${i}/esdb.alias.${i} >>${.TARGET}
-.endfor
+	newfile=$$(for i in ${SUBDIR}; do \
+		cat $$i/esdb.alias.$$i; \
+	done); \
+	[ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \
+		printf '%s\n' "$$newfile" >${.TARGET}
 esdb.alias.db: esdb.alias
 	${MKESDB} -m -o ${.TARGET} ${.ALLSRC}
 

Modified: projects/bhyve_npt_pmap/share/man/man4/capsicum.4
==============================================================================
--- projects/bhyve_npt_pmap/share/man/man4/capsicum.4	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/share/man/man4/capsicum.4	Fri Sep 20 21:53:08 2013	(r255742)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 21, 2013
+.Dd September 17, 2013
 .Dt CAPSICUM 4
 .Os
 .Sh NAME
@@ -62,7 +62,7 @@ File descriptors that wrap other file de
 be called on them; for example, a file descriptor returned by
 .Xr open 2
 may be refined using
-.Xr cap_new 2
+.Xr cap_rights_limit 2
 so that only
 .Xr read 2
 and
@@ -89,8 +89,8 @@ associated with file descriptors; descri
 .Sh SEE ALSO
 .Xr cap_enter 2 ,
 .Xr cap_getmode 2 ,
-.Xr cap_getrights 2 ,
-.Xr cap_new 2 ,
+.Xr cap_rights_get 2 ,
+.Xr cap_rights_limit 2 ,
 .Xr fchmod 2 ,
 .Xr open 2 ,
 .Xr pdfork 2 ,

Modified: projects/bhyve_npt_pmap/share/man/man4/psm.4
==============================================================================
--- projects/bhyve_npt_pmap/share/man/man4/psm.4	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/share/man/man4/psm.4	Fri Sep 20 21:53:08 2013	(r255742)
@@ -460,7 +460,7 @@ typedef struct synapticshw {
     int infoHardware;	/* hardware model */
     int infoNewAbs;	/* supports the newabs format */
     int capPen;		/* can detect a pen */
-    int infoSimpleC;	/* supports simple commands */
+    int infoSimplC;	/* supports simple commands */
     int infoGeometry;	/* touchpad dimensions */
     int capExtended;	/* supports extended packets */
     int capSleep;	/* can be suspended/resumed */
@@ -468,6 +468,9 @@ typedef struct synapticshw {
     int capMultiFinger;	/* can detect multiple fingers */
     int capPalmDetect;	/* can detect a palm */
     int capPassthrough;	/* can passthrough guest packets */
+    int capMiddle;	/* has a physical middle button */
+    int nExtendedButtons; /* has N additionnal buttons */
+    int nExtendedQueries; /* supports N extended queries */
 } synapticshw_t;
 .Ed
 .Pp

Modified: projects/bhyve_npt_pmap/share/man/man5/fstab.5
==============================================================================
--- projects/bhyve_npt_pmap/share/man/man5/fstab.5	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/share/man/man5/fstab.5	Fri Sep 20 21:53:08 2013	(r255742)
@@ -32,7 +32,7 @@
 .\"     @(#)fstab.5	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd July 15, 2013
+.Dd September 10, 2013
 .Dt FSTAB 5
 .Os
 .Sh NAME
@@ -378,9 +378,45 @@ The file
 resides in
 .Pa /etc .
 .El
+.Sh EXAMPLES
+.Bd -literal
+# Device	Mountpoint	FStype	Options		Dump	Pass#
+#
+# UFS file system.
+/dev/da0p2	/		ufs	rw		1	1
+#
+# Swap space on a block device.
+/dev/da0p1	none		swap	sw		0	0
+#
+# Swap space using a block device with GBDE/GELI encyption.
+# aalgo, ealgo, keylen, sectorsize options are available
+# for .eli devices.
+/dev/da1p1.bde	none		swap	sw		0	0
+/dev/da1p2.eli	none		swap	sw		0	0
+#
+# tmpfs.
+tmpfs		/tmp		tmpfs	rw,size=1g,mode=1777	0 0
+#
+# UFS file system on a swap-backed md(4).  /dev/md10 is
+# automatically created.  If it is "md", a unit number
+# will be automatically selected.
+md10		/scratch	mfs	rw,-s1g		0	0
+#
+# Swap space on a vnode-backed md(4).
+md11		none		swap	sw,file=/swapfile	0 0
+#
+# CDROM.  "noauto" option is typically used because the
+# media is removable.
+/dev/cd0	/cdrom		cd9660	ro,noauto	0	0
+#
+# NFS-exported file system.  "serv" is an NFS server name
+# or IP address.
+serv:/export	/nfs		nfs	rw,noinet6	0	0
+.Ed
 .Sh SEE ALSO
 .Xr getfsent 3 ,
 .Xr getvfsbyname 3 ,
+.Xr strunvis 3 ,
 .Xr ccd 4 ,
 .Xr dump 8 ,
 .Xr fsck 8 ,
@@ -388,7 +424,6 @@ resides in
 .Xr mount 8 ,
 .Xr quotacheck 8 ,
 .Xr quotaon 8 ,
-.Xr strunvis 3 ,
 .Xr swapon 8 ,
 .Xr umount 8
 .Sh HISTORY

Modified: projects/bhyve_npt_pmap/share/man/man5/rc.conf.5
==============================================================================
--- projects/bhyve_npt_pmap/share/man/man5/rc.conf.5	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/share/man/man5/rc.conf.5	Fri Sep 20 21:53:08 2013	(r255742)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 22, 2013
+.Dd September 10, 2013
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -1192,10 +1192,8 @@ be added since the search would
 stop with the missing
 .Dq Li alias3
 entry.
-Due to this difficult to manage behavior, the
-.Va ifconfig_ Ns Ao Ar interface Ac Ns Va _alias Ns Aq Ar n
-form is deprecated.
-There is
+Because of this difficult to manage behavior,
+there is
 .Va ifconfig_ Ns Ao Ar interface Ac Ns Va _aliases
 variable, which has the same functionality as
 .Va ifconfig_ Ns Ao Ar interface Ac Ns Va _alias Ns Aq Ar n

Modified: projects/bhyve_npt_pmap/share/man/man5/src.conf.5
==============================================================================
--- projects/bhyve_npt_pmap/share/man/man5/src.conf.5	Fri Sep 20 21:52:33 2013	(r255741)
+++ projects/bhyve_npt_pmap/share/man/man5/src.conf.5	Fri Sep 20 21:53:08 2013	(r255742)
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 253304 2013-07-12 23:08:44Z bapt
 .\" $FreeBSD$
-.Dd September 15, 2013
+.Dd September 19, 2013
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -295,6 +295,8 @@ When set, it also enforces the following
 .Va WITHOUT_CLANG_FULL
 .It
 .Va WITHOUT_CLANG_IS_CC
+.It
+.Va WITHOUT_LLDB
 .El
 .It Va WITH_CLANG
 .\" from FreeBSD: head/tools/build/options/WITH_CLANG 221730 2011-05-10 11:14:40Z ru
@@ -329,6 +331,12 @@ and
 .Pp
 It is a default setting on
 arm/armeb, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+When set, it also enforces the following options:
+.Pp
+.Bl -item -compact
+.It

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

More information about the svn-src-projects mailing list