Sync with HEAD.

31 files changed, 298 insertions, 153 deletions

diff --git a/etc/Makefile b/etc/Makefile
index bbb5018..81ef45a 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -156,6 +156,9 @@ ETCMAIL=Makefile README mailer.conf access.sample virtusertable.sample \
 # Special top level files for FreeBSD
 FREEBSD=COPYRIGHT
 
+# Sanitize DESTDIR
+DESTDIR:=	${DESTDIR:C://*:/:g}
+
 afterinstall:
 .if ${MK_MAN} != "no"
 	${_+_}cd ${.CURDIR}/../share/man; ${MAKE} makedb
@@ -177,6 +180,10 @@ CAP_MKDB_ENDIAN?=
 PWD_MKDB_ENDIAN?=
 .endif
 
+.if defined(NO_ROOT)
+METALOG.add?=	cat -l >> ${METALOG}
+.endif
+
 distribution:
 .if !defined(DESTDIR)
 	@echo "set DESTDIR before running \"make ${.TARGET}\""
@@ -198,6 +205,14 @@ distribution:
 .endif
 	pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \
 	    ${DESTDIR}/etc/master.passwd
+.if defined(NO_ROOT)
+	( \
+		echo "./etc/login.conf.db type=file mode=0644 uname=root gname=wheel"; \
+		echo "./etc/passwd type=file mode=0644 uname=root gname=wheel"; \
+		echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \
+		echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \
+	) | ${METALOG.add}
+.endif
 .if ${MK_ATF} != "no"
 	${_+_}cd ${.CURDIR}/atf; ${MAKE} install
 .endif
@@ -220,8 +235,7 @@ distribution:
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \
 	    ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR}
 .if ${MK_BIND_MTREE} != "no"
-	@if [ ! -e ${DESTDIR}/etc/namedb ]; then \
-		set -x; \
+	if [ ! -e ${DESTDIR}/etc/namedb ]; then \
 		ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \
 	fi
 .endif
@@ -267,9 +281,8 @@ distribution:
 .if ${MK_MAIL} != "no"
 	cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${ETCMAIL} ${DESTDIR}/etc/mail
-	@if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \
+	if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \
 	      ! -f ${DESTDIR}/etc/aliases ]; then \
-		set -x; \
 		ln -s mail/aliases ${DESTDIR}/etc/aliases; \
 	fi
 .endif
@@ -293,52 +306,77 @@ distribution:
 		${DESTDIR}/etc/nsswitch.conf
 .endif
 
-distrib-dirs:
-	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/
-	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var
-	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr
-	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.include.dist \
-		-p ${DESTDIR}/usr/include
+MTREE_CMD?=	mtree
+
+MTREES=		mtree/BSD.root.dist		/		\
+		mtree/BSD.var.dist		/var		\
+		mtree/BSD.usr.dist		/usr		\
+		mtree/BSD.include.dist		/usr/include
 .if ${MK_BIND_LIBS} != "no"
-	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.include.dist \
-	    -p ${DESTDIR}/usr/include
+MTREES+=	mtree/BIND.include.dist		/usr/include
 .endif
 .if ${MK_BIND_MTREE} != "no"
-	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.chroot.dist \
-	    -p ${DESTDIR}/var/named
+MTREES+=	mtree/BIND.chroot.dist		/var/named
 .endif
 .if ${MK_GROFF} != "no"
-	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.groff.dist -p ${DESTDIR}/usr
+MTREES+=	mtree/BSD.groff.dist		/usr
 .endif
 .if ${MK_SENDMAIL} != "no"
-	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/
+MTREES+=	mtree/BSD.sendmail.dist		/
 .endif
-	cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
-	cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ln -sf ../man* .
-	cd ${DESTDIR}/usr/share/man/en.UTF-8; ln -sf ../man* .
+.for mtree in ${LOCAL_MTREE}
+MTREES+=	../${mtree}			/
+.endfor
+
+distrib-dirs:
+	@set ${MTREES}; \
+	while test $$# -ge 2; do \
+		m=${.CURDIR}/$$1; \
+		shift; \
+		d=${DESTDIR}$$1; \
+		shift; \
+		${ECHO} ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} \
+		    -f $$m -p $$d; \
+		${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \
+	done; true
+.if defined(NO_ROOT)
+	@set ${MTREES}; \
+	while test $$# -ge 2; do \
+		m=${.CURDIR}/$$1; \
+		shift; \
+		d=$$1; \
+		test "$$d" == "/" && d=""; \
+		d=${DISTBASE}$$d; \
+		shift; \
+		${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \
+		    "sed s#^\.#.$$d# | ${METALOG.add}" ; \
+		${MTREE_CMD:N-W} -C -f $$m -K uname,gname | sed s#^\.#.$$d# | \
+		    ${METALOG.add} ; \
+	done; true
+.endif
+	${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys
 	cd ${DESTDIR}/usr/share/man; \
-	set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \
-	while [ $$# -gt 0 ] ; \
-	do \
-		rm -rf "$$1"; \
-		ln -s "$$2" "$$1"; \
-		shift; shift; \
+	for mandir in man*; do \
+		${INSTALL_SYMLINK} ../$$mandir \
+		    ${DESTDIR}/usr/share/man/en.ISO8859-1/; \
+		${INSTALL_SYMLINK} ../$$mandir \
+		    ${DESTDIR}/usr/share/man/en.UTF-8/; \
 	done
 	cd ${DESTDIR}/usr/share/openssl/man; \
+	for mandir in man*; do \
+		${INSTALL_SYMLINK} ../$$mandir \
+		    ${DESTDIR}/usr/share/openssl/man/en.ISO8859-1/; \
+	done
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \
-	while [ $$# -gt 0 ] ; \
-	do \
-		rm -rf "$$1"; \
-		ln -s "$$2" "$$1"; \
+	while [ $$# -gt 0 ] ; do \
+		${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/man/$$1"; \
+		${INSTALL_SYMLINK} "$$2" \
+		    "${DESTDIR}/usr/share/openssl/man/$$1"; \
 		shift; shift; \
 	done
-	cd ${DESTDIR}/usr/share/openssl/man/en.ISO8859-1; ln -sf ../man* .
-	cd ${DESTDIR}/usr/share/nls; \
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
-	while [ $$# -gt 0 ] ; \
-	do \
-		rm -rf "$$1"; \
-		ln -s "$$2" "$$1"; \
+	while [ $$# -gt 0 ] ; do \
+		${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/nls/$$1"; \
 		shift; shift; \
 	done
 
diff --git a/etc/atf/FreeBSD.conf b/etc/atf/FreeBSD.conf
index 23c1fa1..e90a6dc 100644
--- a/etc/atf/FreeBSD.conf
+++ b/etc/atf/FreeBSD.conf
@@ -1,6 +1,6 @@
-# $FreeBSD$
 Content-Type: application/X-atf-config; version="1"
 
+# $FreeBSD$
 #
 # Configuration file for the FreeBSD test suite.
 #
diff --git a/etc/atf/common.conf b/etc/atf/common.conf
index 2ac08da..392b57b 100644
--- a/etc/atf/common.conf
+++ b/etc/atf/common.conf
@@ -1,6 +1,6 @@
-# $FreeBSD$
 Content-Type: application/X-atf-config; version="1"
 
+# $FreeBSD$
 #
 # Sample configuration file for properties affecting all test suites.
 #
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 0efaaa1..3760fc0 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -590,6 +590,9 @@ sendmail_rebuild_aliases="NO"	# Run newaliases if necessary (YES/NO).
 auditd_enable="NO"	# Run the audit daemon.
 auditd_program="/usr/sbin/auditd"	# Path to the audit daemon.
 auditd_flags=""		# Which options to pass to the audit daemon.
+auditdistd_enable="NO"	# Run the audit daemon.
+auditdistd_program="/usr/sbin/auditdistd"	# Path to the auditdistd daemon.
+auditdistd_flags=""	# Which options to pass to the auditdistd daemon.
 cron_enable="YES"	# Run the periodic job daemon.
 cron_program="/usr/sbin/cron"	# Which cron executable to run (if enabled).
 cron_dst="YES"		# Handle DST transitions intelligently (YES/NO)
@@ -602,7 +605,9 @@ chkprintcap_enable="NO"	# Run chkprintcap(8) before running lpd.
 chkprintcap_flags="-d"	# Create missing directories by default.
 dumpdev="AUTO"		# Device to crashdump to (device name, AUTO, or NO).
 dumpdir="/var/crash"	# Directory where crash dumps are to be stored
-savecore_flags=""	# Used if dumpdev is enabled above, and present.
+savecore_flags="-m 10"	# Used if dumpdev is enabled above, and present.
+			# By default, only the 10 most recent kernel dumps
+			# are saved.
 crashinfo_enable="YES"	# Automatically generate crash dump summary.
 crashinfo_program="/usr/sbin/crashinfo"	# Script to generate crash dump summary.
 quota_enable="NO"	# turn on quotas on startup (or NO).
diff --git a/etc/devd/usb.conf b/etc/devd/usb.conf
index d4197f2..d3090ab 100644
--- a/etc/devd/usb.conf
+++ b/etc/devd/usb.conf
@@ -52,6 +52,17 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x05ac";
+	match "product" "0x12a8";
+	match "intclass" "0xff";
+	match "intsubclass" "0xfd";
+	match "intprotocol" "0x01";
+	action "kldload -n if_ipheth";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0104";
 	match "product" "0x00be";
 	action "kldload -n uipaq";
@@ -412,6 +423,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x0499";
+	match "product" "(0x1000|0x1001|0x1002|0x1003|0x1004|0x1005|0x1006|0x1007|0x1008|0x1009|0x100a|0x100c|0x100d|0x100e|0x100f|0x1010|0x1011|0x1012|0x1013|0x1014|0x1015|0x1016|0x1017|0x1018|0x1019|0x101a|0x101b|0x101c|0x101d|0x101e|0x101f|0x1020|0x1021|0x1022|0x1023|0x1024|0x1025|0x1026|0x1027|0x1028|0x1029|0x102a|0x102b|0x102e|0x1030|0x1031|0x1032|0x1033|0x1034|0x1035|0x1036|0x1037|0x1038|0x1039|0x103a|0x103b|0x103c|0x103d|0x103e|0x103f|0x1040|0x1041|0x1042|0x1043|0x1044|0x1045|0x104e|0x104f|0x1050|0x1051|0x1052|0x1053|0x1054|0x1055|0x1056|0x1057|0x1058|0x1059|0x105a|0x105b|0x105c|0x105d|0x1503|0x2000|0x2001|0x2002|0x2003|0x5000|0x5001|0x5002|0x5003|0x5004|0x5005|0x5006|0x5007|0x5008|0x5009|0x500a|0x500b|0x500c|0x500d|0x500e|0x500f|0x7000|0x7010)";
+	action "kldload -n snd_uaudio";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x049f";
 	match "product" "(0x0003|0x0032)";
 	action "kldload -n uipaq";
@@ -2636,6 +2655,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x0f3d";
+	match "product" "0x68aa";
+	action "kldload -n u3g";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0f4e";
 	match "product" "0x0200";
 	action "kldload -n uipaq";
@@ -3069,7 +3096,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x12d1";
-	match "product" "(0x1001|0x1003|0x1004|0x1401|0x1402|0x1403|0x1404|0x1405|0x1406|0x1407|0x1408|0x1409|0x140a|0x140b|0x140c|0x140d|0x140e|0x140f|0x1410|0x1411|0x1412|0x1413|0x1414|0x1415|0x1416|0x1417|0x1418|0x1419|0x141a|0x141b|0x141c|0x141d|0x141e|0x141f|0x1420|0x1421|0x1422|0x1423|0x1424|0x1425|0x1426|0x1427|0x1428|0x1429|0x142a|0x142b|0x142c|0x142d|0x142e|0x142f|0x1430|0x1431|0x1432|0x1433|0x1434|0x1435|0x1436|0x1437|0x1438|0x1439|0x143a|0x143b|0x143c|0x143d|0x143e|0x143f|0x1446|0x1465|0x14ac|0x14fe|0x1505|0x1506|0x1520|0x1803|0x1c05|0x1c0b)";
+	match "product" "(0x1001|0x1003|0x1004|0x1401|0x1402|0x1403|0x1404|0x1405|0x1406|0x1407|0x1408|0x1409|0x140a|0x140b|0x140c|0x140d|0x140e|0x140f|0x1410|0x1411|0x1412|0x1413|0x1414|0x1415|0x1416|0x1417|0x1418|0x1419|0x141a|0x141b|0x141c|0x141d|0x141e|0x141f|0x1420|0x1421|0x1422|0x1423|0x1424|0x1425|0x1426|0x1427|0x1428|0x1429|0x142a|0x142b|0x142c|0x142d|0x142e|0x142f|0x1430|0x1431|0x1432|0x1433|0x1434|0x1435|0x1436|0x1437|0x1438|0x1439|0x143a|0x143b|0x143c|0x143d|0x143e|0x143f|0x1446|0x1464|0x1465|0x14ac|0x14c9|0x14d1|0x14fe|0x1505|0x1506|0x1520|0x1521|0x1803|0x1c05|0x1c0b)";
 	action "kldload -n u3g";
 };
 
@@ -4188,6 +4215,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x22de";
+	match "product" "0x6801";
+	action "kldload -n u3g";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x2478";
 	match "product" "0x2008";
 	action "kldload -n uplcom";
@@ -4600,5 +4635,5 @@ nomatch 32 {
 	action "kldload -n umass";
 };
 
-# 2274 USB entries processed
+# 2386 USB entries processed
 
diff --git a/etc/ftpusers b/etc/ftpusers
index 06b3f49..adb9dcf 100644
--- a/etc/ftpusers
+++ b/etc/ftpusers
@@ -19,6 +19,7 @@ _pflogd
 _dhcp
 uucp
 pop
+auditdistd
 www
 hast
 nobody
diff --git a/etc/login.conf b/etc/login.conf
index c62687a..67509f9 100644
--- a/etc/login.conf
+++ b/etc/login.conf
@@ -32,7 +32,7 @@ default:\
 	:cputime=unlimited:\
 	:datasize=unlimited:\
 	:stacksize=unlimited:\
-	:memorylocked=unlimited:\
+	:memorylocked=64K:\
 	:memoryuse=unlimited:\
 	:filesize=unlimited:\
 	:coredumpsize=unlimited:\
@@ -59,6 +59,7 @@ xuser:\
 staff:\
 	:tc=default:
 daemon:\
+	:memorylocked=128M:\
 	:tc=default:
 news:\
 	:tc=default:
@@ -72,6 +73,7 @@ dialer:\
 #       in preference to 'default'.
 root:\
 	:ignorenologin:\
+	:memorylocked=unlimited:\
 	:tc=default:
 
 #
diff --git a/etc/mail/aliases b/etc/mail/aliases
index 5f5cd24..46f5f64 100644
--- a/etc/mail/aliases
+++ b/etc/mail/aliases
@@ -26,6 +26,7 @@ postmaster: root
 # General redirections for pseudo accounts
 _dhcp:	root
 _pflogd: root
+auditdistd:	root
 bin:	root
 bind:	root
 daemon:	root
diff --git a/etc/master.passwd b/etc/master.passwd
index 4e1d113..f979940 100644
--- a/etc/master.passwd
+++ b/etc/master.passwd
@@ -20,6 +20,7 @@ _pflogd:*:64:64::0:0:pflogd privsep user:/var/empty:/usr/sbin/nologin
 _dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin
 uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico
 pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin
+auditdistd:*:78:77::0:0:Auditdistd unprivileged user:/var/empty:/usr/sbin/nologin
 www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin
 hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin
 nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 4a4deee..374889d 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -100,6 +100,8 @@
     dev
         acpica
         ..
+        agp
+        ..
         an
         ..
         bktr
@@ -136,6 +138,8 @@
         ..
         pbio
         ..
+        pci
+        ..
         powermac_nvram
         ..
         ppbus
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 336d055..89ec940 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -756,8 +756,6 @@
 /set uname=man
             cat1
             ..
-            cat1aout
-            ..
             cat2
             ..
             cat3
@@ -795,8 +793,6 @@
             en.ISO8859-1    uname=root
                 cat1
                 ..
-                cat1aout
-                ..
                 cat2
                 ..
                 cat3
@@ -835,8 +831,6 @@
             en.UTF-8        uname=root
                 cat1
                 ..
-                cat1aout
-                ..
                 cat2
                 ..
                 cat3
@@ -913,8 +907,6 @@
             ..
             man1
             ..
-            man1aout
-            ..
             man2
             ..
             man3
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 4481b10..6a9a7f4 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -18,6 +18,10 @@
 /set mode=0750
 /set gname=audit
     audit
+        dist            uname=auditdistd gname=audit mode=0770
+        ..
+        remote          uname=auditdistd gname=wheel mode=0700
+        ..
     ..
 /set gname=wheel
     backups
diff --git a/etc/namedb/named.root b/etc/namedb/named.root
index 1c8facf..adf5e79 100644
--- a/etc/namedb/named.root
+++ b/etc/namedb/named.root
@@ -7,14 +7,14 @@
 ;       (e.g. reference this file in the "cache  .  <file>"
 ;       configuration file of BIND domain name servers).
 ;
-;       This file is made available by InterNIC
+;       This file is made available by InterNIC 
 ;       under anonymous FTP as
-;           file                /domain/named.root
+;           file                /domain/named.cache
 ;           on server           FTP.INTERNIC.NET
 ;       -OR-                    RS.INTERNIC.NET
 ;
-;       last update:    Jun 8, 2011
-;       related version of root zone:   2011060800
+;       last update:    Jan 3, 2013
+;       related version of root zone:   2013010300
 ;
 ; formerly NS.INTERNIC.NET
 ;
@@ -35,7 +35,7 @@ C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
 ; FORMERLY TERP.UMD.EDU
 ;
 .                        3600000      NS    D.ROOT-SERVERS.NET.
-D.ROOT-SERVERS.NET.      3600000      A     128.8.10.90
+D.ROOT-SERVERS.NET.      3600000      A     199.7.91.13
 D.ROOT-SERVERS.NET.	 3600000      AAAA  2001:500:2D::D
 ;
 ; FORMERLY NS.NASA.GOV
diff --git a/etc/newsyslog.conf b/etc/newsyslog.conf
index 44aff12..76e0707 100644
--- a/etc/newsyslog.conf
+++ b/etc/newsyslog.conf
@@ -33,7 +33,7 @@
 /var/log/pflog				600  3	   100	*     JB    /var/run/pflogd.pid
 /var/log/ppp.log	root:network	640  3	   100	*     JC
 /var/log/security			600  10	   100	*     JC
-/var/log/sendmail.st			640  10	   *	168   B
+/var/log/sendmail.st			640  10	   *	168   BN
 /var/log/utx.log			644  3	   *	@01T05 B
-/var/log/weekly.log			640  5	   1	$W6D0 JN
+/var/log/weekly.log			640  5	   *	$W6D0 JN
 /var/log/xferlog			600  7	   100	*     JC
diff --git a/etc/pccard_ether b/etc/pccard_ether
index 841c1a0..5bd9c33 100755
--- a/etc/pccard_ether
+++ b/etc/pccard_ether
@@ -123,4 +123,5 @@ else
 fi
 
 load_rc_config pccard_ether
+load_rc_config network
 run_rc_command $args
diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile
index b324f70..9c7f4d7 100644
--- a/etc/periodic/daily/Makefile
+++ b/etc/periodic/daily/Makefile
@@ -6,7 +6,6 @@ FILES=	100.clean-disks \
 	110.clean-tmps \
 	120.clean-preserve \
 	200.backup-passwd \
-	220.backup-pkgdb \
 	330.news \
 	400.status-disks \
 	405.status-ata-raid \
@@ -41,7 +40,8 @@ FILES+=	480.status-ntpd
 .endif
 
 .if ${MK_PKGTOOLS} != "no"
-FILES+=	490.status-pkg-changes
+FILES+=	220.backup-pkgdb \
+	490.status-pkg-changes
 .endif
 
 .if ${MK_RCMDS} != "no"
diff --git a/etc/pf.os b/etc/pf.os
index 00873a7..699f19a 100644
--- a/etc/pf.os
+++ b/etc/pf.os
@@ -1,5 +1,5 @@
 # $FreeBSD$
-# $OpenBSD: pf.os,v 1.25 2010/10/18 15:55:27 deraadt Exp $
+# $OpenBSD: pf.os,v 1.26 2012/08/03 12:25:16 jsg Exp $
 # passive OS fingerprinting
 # -------------------------
 #
@@ -226,7 +226,13 @@ S2:64:1:60:M*,S,T,N,W0:		Linux:2.4::Linux 2.4 (big boy)
 S3:64:1:60:M*,S,T,N,W0:		Linux:2.4:.18-21:Linux 2.4.18 and newer
 S4:64:1:60:M*,S,T,N,W0:		Linux:2.4::Linux 2.4/2.6 <= 2.6.7
 S4:64:1:60:M*,S,T,N,W0:		Linux:2.6:.1-7:Linux 2.4/2.6 <= 2.6.7
-S4:64:1:60:M*,S,T,N,W7:		Linux:2.6:8:Linux 2.6.8 and newer (?)
+
+S4:64:1:60:M*,S,T,N,W5:		Linux:2.6::Linux 2.6 (newer, 1)
+S4:64:1:60:M*,S,T,N,W6:		Linux:2.6::Linux 2.6 (newer, 2)
+S4:64:1:60:M*,S,T,N,W7:		Linux:2.6::Linux 2.6 (newer, 3)
+T4:64:1:60:M*,S,T,N,W7:		Linux:2.6::Linux 2.6 (newer, 4)
+
+S10:64:1:60:M*,S,T,N,W4:	Linux:3.0::Linux 3.0
 
 S3:64:1:60:M*,S,T,N,W1:		Linux:2.5::Linux 2.5 (sometimes 2.4)
 S4:64:1:60:M*,S,T,N,W1:		Linux:2.5-2.6::Linux 2.5/2.6
@@ -429,6 +435,8 @@ S44:128:1:48:M*,N,N,S:			Windows:XP:SP1:Windows Pro SP1, 2000 SP3
 32767:128:1:48:M*,N,N,S:		Windows:2000:SP4:Windows SP1, 2000 SP4
 32767:128:1:48:M*,N,N,S:		Windows:XP:SP1:Windows SP1, 2000 SP4
 
+8192:128:1:52:M*,N,W2,N,N,S:		Windows:Vista::Windows Vista/7
+
 # Odds, ends, mods:
 
 S52:128:1:48:M1260,N,N,S:		Windows:2000:cisco:Windows XP/2000 via Cisco
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 245b0c9..aace4b1 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -19,6 +19,7 @@ FILES=	DAEMON \
 	atm2 \
 	atm3 \
 	auditd \
+	auditdistd \
 	bgfsck \
 	bluetooth \
 	bootparams \
diff --git a/etc/rc.d/auditdistd b/etc/rc.d/auditdistd
new file mode 100644
index 0000000..f8c8195
--- /dev/null
+++ b/etc/rc.d/auditdistd
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: auditdistd
+# REQUIRE: auditd
+# BEFORE:  DAEMON
+# KEYWORD: nojail shutdown
+
+. /etc/rc.subr
+
+name="auditdistd"
+rcvar="${name}_enable"
+pidfile="/var/run/${name}.pid"
+command="/usr/sbin/${name}"
+required_files="/etc/security/${name}.conf"
+extra_commands="reload"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/etc/rc.d/ip6addrctl b/etc/rc.d/ip6addrctl
index 801d7bb..914ca8c 100755
--- a/etc/rc.d/ip6addrctl
+++ b/etc/rc.d/ip6addrctl
@@ -29,11 +29,15 @@ ip6addrctl_prefer_ipv6()
 	afexists inet6 || return 0
 
 	ip6addrctl flush >/dev/null 2>&1
-	ip6addrctl add ::1/128		50	0
-	ip6addrctl add ::/0		40	1
-	ip6addrctl add 2002::/16	30	2
-	ip6addrctl add ::/96		20	3
-	ip6addrctl add ::ffff:0:0/96	10	4
+	ip6addrctl add ::1/128		 50	 0
+	ip6addrctl add ::/0		 40	 1
+	ip6addrctl add ::ffff:0:0/96	 35	 4
+	ip6addrctl add 2002::/16	 30	 2
+	ip6addrctl add 2001::/32	  5	 5
+	ip6addrctl add fc00::/7		  3	13
+	ip6addrctl add ::/96		  1	 3
+	ip6addrctl add fec0::/10	  1	11
+	ip6addrctl add 3ffe::/16	  1	12
 	checkyesno ip6addrctl_verbose && ip6addrctl
 }
 
@@ -42,11 +46,15 @@ ip6addrctl_prefer_ipv4()
 	afexists inet6 || return 0
 
 	ip6addrctl flush >/dev/null 2>&1
-	ip6addrctl add ::ffff:0:0/96	50	0
-	ip6addrctl add ::1/128		40	1
-	ip6addrctl add ::/0		30	2
-	ip6addrctl add 2002::/16	20	3
-	ip6addrctl add ::/96		10	4
+	ip6addrctl add ::1/128		 50	 0
+	ip6addrctl add ::/0		 40	 1
+	ip6addrctl add ::ffff:0:0/96	100	 4
+	ip6addrctl add 2002::/16	 30	 2
+	ip6addrctl add 2001::/32	  5	 5
+	ip6addrctl add fc00::/7		  3	13
+	ip6addrctl add ::/96		  1	 3
+	ip6addrctl add fec0::/10	  1	11
+	ip6addrctl add 3ffe::/16	  1	12
 	checkyesno ip6addrctl_verbose && ip6addrctl
 }
 
diff --git a/etc/rc.d/jail b/etc/rc.d/jail
index 0718fa8..f19983f 100755
--- a/etc/rc.d/jail
+++ b/etc/rc.d/jail
@@ -509,7 +509,7 @@ jail_handle_ips_option()
 		esac
 		case "${_type}" in
 		inet)	;;
-		inet6)	;;
+		inet6)	ipv6_address_count=$((ipv6_address_count + 1)) ;;
 		*)	warn "Could not determine address family.  Not going" \
 			    "to ${_action} address '${_addr}' for ${_jail}."
 			continue
@@ -546,6 +546,7 @@ jail_ips()
 	esac
 
 	# Handle addresses.
+	ipv6_address_count=0
 	jail_handle_ips_option ${_action} "${_ip}"
 	# Handle jail_xxx_ip_multi<N>
 	alias=0
@@ -558,6 +559,12 @@ jail_ips()
 			;;
 		esac
 	done
+	case ${ipv6_address_count} in
+	0)	;;
+	*)	# Sleep 1 second to let DAD complete before starting services.
+		sleep 1
+		;;
+	esac
 }
 
 jail_prestart()
@@ -656,7 +663,8 @@ jail_start()
 		done
 
 		eval ${_setfib} jail -n ${_jail} ${_flags} -i -c path=${_rootdir} host.hostname=${_hostname} \
-			ip4.addr=\"${_addrl}\" ip6.addr=\"${_addr6l}\" ${_parameters} command=${_exec_start} > ${_tmp_jail} 2>&1 \
+			${_addrl:+ip4.addr=\"${_addrl}\"} ${_addr6l:+ip6.addr=\"${_addr6l}\"} \
+			${_parameters} command=${_exec_start} > ${_tmp_jail} 2>&1 \
 			</dev/null
 
 		if [ "$?" -eq 0 ] ; then
diff --git a/etc/rc.d/pfsync b/etc/rc.d/pfsync
index fa89b30..3dab3a8 100755
--- a/etc/rc.d/pfsync
+++ b/etc/rc.d/pfsync
@@ -35,6 +35,7 @@ pfsync_start()
 	if [ -n "${pfsync_syncpeer}" ]; then
 		_syncpeer="syncpeer ${pfsync_syncpeer}"
 	fi
+	load_kld pfsync
 	ifconfig pfsync0 $_syncpeer syncdev $pfsync_syncdev $pfsync_ifconfig up
 }
 
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 7e4a8ff..0fe86c7 100755
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -139,29 +139,20 @@ static_inet()
 
 static_inet6()
 {
-	local _action i fibs
+	local _action fibmod fibs
 	_action=$1
 
 	# get the number of FIBs supported.
-	fibs=`sysctl -n net.fibs`
-	: ${fibs:=1}
+	fibs=$((`${SYSCTL_N} net.fibs` - 1))
+	if [ "$fibs" -gt 0 ]; then
+		fibmod="-fib 0-$fibs"
+	else
+		fibmod=
+	fi
 
 	# disallow "internal" addresses to appear on the wire
-	route ${_action} -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject
-	route ${_action} -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject
-	i=1
-	if test ${i} -lt ${fibs}; then
-		printf "Also installing reject routes for FIBs"
-		while test ${i} -lt ${fibs}; do
-			setfib -F ${i} route -q ${_action} \
-			    -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject
-			setfib -F ${i} route -q ${_action} \
-			    -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject
-			printf " %d" ${i}
-			i=$((i + 1))
-		done
-		printf "\n"
-	fi
+	route ${_action} -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject ${fibmod}
+	route ${_action} -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject ${fibmod}
 
 	case ${ipv6_defaultrouter} in
 	[Nn][Oo] | '')
@@ -233,21 +224,8 @@ static_inet6()
 	# for the host case, you will allow to omit the identifiers.
 	# Under this configuration, the packets will go to the default
 	# interface.
-	route ${_action} -inet6 fe80:: -prefixlen 10 ::1 -reject
-	route ${_action} -inet6 ff02:: -prefixlen 16 ::1 -reject
-	i=1
-	if test ${i} -lt ${fibs}; then
-		printf "Also installing reject routes for FIBs"
-		while test ${i} -lt ${fibs}; do
-			setfib -F ${i} route -q ${_action} \
-			    -inet6 fe80:: -prefixlen 10 ::1 -reject
-			setfib -F ${i} route -q ${_action} \
-			    -inet6 ff02:: -prefixlen 16 ::1 -reject
-			printf " %d" ${i}
-			i=$((i + 1))
-		done
-		printf "\n"
-	fi
+	route ${_action} -inet6 fe80:: -prefixlen 10 ::1 -reject ${fibmod}
+	route ${_action} -inet6 ff02:: -prefixlen 16 ::1 -reject ${fibmod}
 
 	case ${ipv6_default_interface} in
 	'')
diff --git a/etc/rc.d/savecore b/etc/rc.d/savecore
index 4efb7db..3e61adc 100755
--- a/etc/rc.d/savecore
+++ b/etc/rc.d/savecore
@@ -62,7 +62,7 @@ savecore_start()
 		;;
 	esac
 
-	if savecore -C "${dumpdir}" "${dev}" >/dev/null; then
+	if savecore -C "${dev}" >/dev/null; then
 		savecore ${savecore_flags} ${dumpdir} ${dumpdev}
 		if checkyesno crashinfo_enable; then
 			${crashinfo_program} -d ${dumpdir}
diff --git a/etc/rc.d/sysctl b/etc/rc.d/sysctl
index 34fb3b5..cc3e801 100755
--- a/etc/rc.d/sysctl
+++ b/etc/rc.d/sysctl
@@ -8,51 +8,27 @@
 . /etc/rc.subr
 
 name="sysctl"
+command="/sbin/sysctl"
 stop_cmd=":"
 start_cmd="sysctl_start"
 reload_cmd="sysctl_start"
 lastload_cmd="sysctl_start last"
 extra_commands="reload lastload"
 
-#
-# Read in a file containing sysctl settings and set things accordingly.
-#
-parse_file()
-{
-	if [ -f $1 ]; then
-		while read var comments
-		do
-			case ${var} in
-			\#*|'')
-				;;
-			*)
-				mib=${var%=*}
-				val=${var#*=}
-
-				if current_value=`${SYSCTL} -n ${mib} 2>/dev/null`; then
-					case ${current_value} in
-					${val})
-						;;
-					*)
-						if ! sysctl "${var}" >/dev/null 2>&1; then
-							warn "unable to set ${var}"
-						fi
-						;;
-					esac
-				elif [ "$2" = "last" ]; then
-					warn "sysctl ${mib} does not exist."
-				fi
-				;;
-			esac
-		done < $1
-	fi
-}
-
 sysctl_start()
 {
-
-	parse_file /etc/sysctl.conf $1
-	parse_file /etc/sysctl.conf.local $1
+	case $1 in
+	last)
+		command_args="-i -f"
+	;;
+	*)
+		command_args="-f"
+	;;
+	esac
+
+	for _f in /etc/sysctl.conf /etc/sysctl.conf.local; do
+		[ -r ${_f} ] && ${command} ${command_args} ${_f} > /dev/null
+	done
 }
 
 load_rc_config $name
diff --git a/etc/rc.subr b/etc/rc.subr
index 5c94097..9bff68b 100644
--- a/etc/rc.subr
+++ b/etc/rc.subr
@@ -290,7 +290,7 @@ _find_processes()
 		_interpbn=${1##*/}
 		_fp_args='_argv'
 		_fp_match='case "$_argv" in
-		    ${_interp}|"${_interp} "*|"${_interpbn}: ${_procname}"*)'
+		    ${_interp}|"${_interp} "*|"[${_interpbn}]"|"${_interpbn}: ${_procname}"*)'
 	else					# a normal daemon
 		_procnamebn=${_procname##*/}
 		_fp_args='_arg0 _argv'
@@ -704,7 +704,10 @@ run_rc_command()
 
 		start)
 			if [ -z "$rc_fast" -a -n "$rc_pid" ]; then
-				echo 1>&2 "${name} already running? (pid=$rc_pid)."
+				if [ -z "$rc_quiet" ]; then
+					echo 1>&2 "${name} already running? " \
+					    "(pid=$rc_pid)."
+				fi
 				return 1
 			fi
 
@@ -1724,6 +1727,23 @@ check_kern_features()
 	fi
 }
 
+# check_namevarlist var
+#	Return "0" if ${name}_var is reserved in rc.subr.
+
+_rc_namevarlist="program chroot chdir flags fib nice user group groups"
+check_namevarlist()
+{
+	local _v
+
+	for _v in $_rc_namevarlist; do
+	case $1 in
+	$_v)	return 0 ;;
+	esac
+	done
+
+	return 1
+}
+
 # _echoonce var msg mode
 #	mode=0: Echo $msg if ${$var} is empty.
 #	        After doing echo, a string is set to ${$var}.
diff --git a/etc/regdomain.xml b/etc/regdomain.xml
index ff57113..126f03a 100644
--- a/etc/regdomain.xml
+++ b/etc/regdomain.xml
@@ -1303,6 +1303,29 @@
     </band>
   </netband>
 </rd>
+
+<rd id="xc900m">
+  <name>XC900M</name>
+  <sku>0x29b</sku>
+  <netband mode="11g">
+    <band>
+      <freqband ref="S1_905_925_5"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S1_910_920_10"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S1_915_915"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+  </netband>
+</rd>
+
 </regulatory-domains>
 
 <country-codes>
@@ -1896,6 +1919,25 @@
   <flags>IEEE80211_CHAN_GSM</flags>
 </freqband>
 
+<freqband id="S1_905_925_5">
+  <freqstart>905</freqstart> <freqend>925</freqend>
+  <chanwidth>5</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_QUARTER</flags>
+</freqband>
+<freqband id="S1_910_920_10">
+  <freqstart>910</freqstart> <freqend>920</freqend>
+  <chanwidth>10</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_HALF</flags>
+</freqband>
+<freqband id="S1_915_915">
+  <freqstart>915</freqstart> <freqend>915</freqend>
+  <chanwidth>20</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+</freqband>
+
+
 </shared-frequency-bands>
 
 </regulatory-data>
diff --git a/etc/root/dot.cshrc b/etc/root/dot.cshrc
index 8f75be4..3e94371 100644
--- a/etc/root/dot.cshrc
+++ b/etc/root/dot.cshrc
@@ -23,10 +23,7 @@ setenv	BLOCKSIZE	K
 
 if ($?prompt) then
 	# An interactive shell -- set some stuff up
-	if ($uid == 0) then
-		set user = root
-	endif
-	set prompt = "%n@%m:%/ %# "
+	set prompt = "%N@%m:%~ %# "
 	set promptchars = "%#"
 
 	set filec
diff --git a/etc/sendmail/freebsd.mc b/etc/sendmail/freebsd.mc
index 1e28c47..92efee1 100644
--- a/etc/sendmail/freebsd.mc
+++ b/etc/sendmail/freebsd.mc
@@ -63,13 +63,13 @@ dnl DNS based black hole lists
 dnl --------------------------------
 dnl DNS based black hole lists come and go on a regular basis
 dnl so this file will not serve as a database of the available servers.
-dnl For that, visit
-dnl http://www.google.com/Top/Computers/Internet/E-mail/Spam/Blacklists/
+dnl For more information, visit
+dnl http://en.wikipedia.org/wiki/DNSBL
 
 dnl Uncomment to activate your chosen DNS based blacklist
 dnl FEATURE(dnsbl, `dnsbl.example.com')
 dnl Alternatively, you can provide your own server and rejection message:
-dnl FEATURE(dnsbl, `dnsbl.example.com', ``"550 Mail from " $&{client_addr} " rejected'')
+dnl FEATURE(dnsbl, `dnsbl.example.com', ``"550 Mail from " $&{client_addr} " rejected"'')
 
 dnl Dialup users should uncomment and define this appropriately
 dnl define(`SMART_HOST', `your.isp.mail.server')
diff --git a/etc/sendmail/freebsd.submit.mc b/etc/sendmail/freebsd.submit.mc
index c6ec655..fbb036c 100644
--- a/etc/sendmail/freebsd.submit.mc
+++ b/etc/sendmail/freebsd.submit.mc
@@ -9,6 +9,7 @@ divert(-1)
 #
 #
 
+
 #
 #  This is the FreeBSD configuration for a set-group-ID sm-msp sendmail
 #  that acts as a initial mail submission program.
diff --git a/etc/sendmail/freefall.mc b/etc/sendmail/freefall.mc
index 74bc0f5..df07fea 100644
--- a/etc/sendmail/freefall.mc
+++ b/etc/sendmail/freefall.mc
@@ -43,5 +43,5 @@ divert(0)dnl
 VERSIONID(`$FreeBSD$')
 
 OSTYPE(freebsd6)
-FEATURE(nullclient, smarthost.ysv.$m)
+FEATURE(nullclient, smarthost.ysv.freebsd.org)
 MASQUERADE_AS(FreeBSD.org)