svn commit: r244402 - in projects/mtree: . bin/df bin/ps bin/sh cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/lib/libzfs/common contrib/binutils/gas/config contrib/gcc contrib/gcc/confi...

Brooks Davis brooks at FreeBSD.org
Tue Dec 18 17:13:26 UTC 2012 

Author: brooks
Date: Tue Dec 18 17:13:16 2012
New Revision: 244402
URL: http://svnweb.freebsd.org/changeset/base/244402

Log:
  MFH at r244401 to pick up the import of vis/unvis(3).

Added:
  projects/mtree/contrib/libc-vis/
     - copied from r244401, head/contrib/libc-vis/
  projects/mtree/sys/arm/arm/pl190.c
     - copied unchanged from r244401, head/sys/arm/arm/pl190.c
  projects/mtree/sys/arm/conf/VERSATILEPB
     - copied unchanged from r244401, head/sys/arm/conf/VERSATILEPB
  projects/mtree/sys/arm/versatile/
     - copied from r244401, head/sys/arm/versatile/
  projects/mtree/sys/boot/fdt/dts/versatilepb.dts
     - copied unchanged from r244401, head/sys/boot/fdt/dts/versatilepb.dts
  projects/mtree/sys/security/audit/bsm_domain.c
     - copied unchanged from r244401, head/sys/security/audit/bsm_domain.c
  projects/mtree/sys/security/audit/bsm_errno.c
     - copied unchanged from r244401, head/sys/security/audit/bsm_errno.c
  projects/mtree/sys/security/audit/bsm_fcntl.c
     - copied unchanged from r244401, head/sys/security/audit/bsm_fcntl.c
  projects/mtree/sys/security/audit/bsm_socket_type.c
     - copied unchanged from r244401, head/sys/security/audit/bsm_socket_type.c
  projects/mtree/sys/security/audit/bsm_token.c
     - copied unchanged from r244401, head/sys/security/audit/bsm_token.c
  projects/mtree/tools/regression/bin/sh/errors/write-error1.0
     - copied unchanged from r244401, head/tools/regression/bin/sh/errors/write-error1.0
Deleted:
  projects/mtree/lib/libc/gen/unvis.3
  projects/mtree/lib/libc/gen/unvis.c
  projects/mtree/lib/libc/gen/vis.3
  projects/mtree/lib/libc/gen/vis.c
  projects/mtree/sys/security/audit/audit_bsm_domain.c
  projects/mtree/sys/security/audit/audit_bsm_errno.c
  projects/mtree/sys/security/audit/audit_bsm_fcntl.c
  projects/mtree/sys/security/audit/audit_bsm_socket_type.c
  projects/mtree/sys/security/audit/audit_bsm_token.c
Modified:
  projects/mtree/UPDATING
  projects/mtree/bin/df/df.c
  projects/mtree/bin/ps/ps.c
  projects/mtree/bin/sh/eval.c
  projects/mtree/bin/sh/output.c
  projects/mtree/bin/sh/output.h
  projects/mtree/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  projects/mtree/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  projects/mtree/contrib/binutils/gas/config/tc-arm.c
  projects/mtree/contrib/gcc/config/arm/arm.h
  projects/mtree/contrib/gcc/longlong.h
  projects/mtree/contrib/openbsm/INSTALL
  projects/mtree/contrib/openbsm/NEWS
  projects/mtree/contrib/openbsm/VERSION
  projects/mtree/contrib/openbsm/bin/auditdistd/auditdistd.conf.5
  projects/mtree/contrib/openbsm/config/config.h
  projects/mtree/contrib/openbsm/configure
  projects/mtree/contrib/openbsm/configure.ac
  projects/mtree/contrib/openbsm/etc/audit_event
  projects/mtree/contrib/openbsm/sys/bsm/audit_kevents.h
  projects/mtree/contrib/openbsm/sys/bsm/audit_record.h
  projects/mtree/contrib/top/top.h
  projects/mtree/etc/defaults/rc.conf
  projects/mtree/etc/devd/usb.conf
  projects/mtree/etc/login.conf
  projects/mtree/etc/pf.os
  projects/mtree/etc/rc.d/auditdistd
  projects/mtree/etc/rc.d/savecore
  projects/mtree/etc/rc.d/sysctl
  projects/mtree/gnu/lib/libgcc/Makefile
  projects/mtree/gnu/usr.bin/binutils/as/Makefile
  projects/mtree/include/Makefile
  projects/mtree/lib/clang/Makefile
  projects/mtree/lib/libc/gen/Makefile.inc
  projects/mtree/lib/libc/gen/sysctlbyname.c
  projects/mtree/lib/libc/iconv/citrus_mmap.c
  projects/mtree/lib/libc/locale/collate.c
  projects/mtree/lib/libc/locale/setrunelocale.c
  projects/mtree/lib/libc/nls/msgcat.c
  projects/mtree/lib/libcompiler_rt/Makefile
  projects/mtree/lib/libdevstat/devstat.3
  projects/mtree/lib/libdevstat/devstat.c
  projects/mtree/lib/libdevstat/devstat.h
  projects/mtree/sbin/growfs/growfs.c
  projects/mtree/sbin/route/route.c
  projects/mtree/sbin/savecore/savecore.8
  projects/mtree/sbin/savecore/savecore.c
  projects/mtree/sbin/setkey/setkey.8
  projects/mtree/sbin/sysctl/sysctl.8
  projects/mtree/sbin/sysctl/sysctl.c
  projects/mtree/share/examples/etc/make.conf
  projects/mtree/share/i18n/csmapper/Makefile.part
  projects/mtree/share/misc/committers-src.dot
  projects/mtree/share/mk/bsd.lib.mk
  projects/mtree/share/mk/bsd.prog.mk
  projects/mtree/share/mk/sys.mk
  projects/mtree/share/syscons/keymaps/spanish.dvorak.kbd
  projects/mtree/sys/amd64/amd64/fpu.c
  projects/mtree/sys/amd64/include/bus.h
  projects/mtree/sys/amd64/include/fpu.h
  projects/mtree/sys/boot/arm/uboot/Makefile
  projects/mtree/sys/boot/forth/beastie.4th.8
  projects/mtree/sys/boot/forth/check-password.4th
  projects/mtree/sys/boot/forth/check-password.4th.8
  projects/mtree/sys/boot/forth/loader.4th.8
  projects/mtree/sys/boot/forth/loader.conf.5
  projects/mtree/sys/boot/forth/menu.4th.8
  projects/mtree/sys/boot/i386/efi/ldscript.amd64
  projects/mtree/sys/boot/sparc64/boot1/boot1.c
  projects/mtree/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c
  projects/mtree/sys/cddl/compat/opensolaris/sys/kstat.h
  projects/mtree/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  projects/mtree/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
  projects/mtree/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  projects/mtree/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/mtree/sys/conf/files
  projects/mtree/sys/conf/files.arm
  projects/mtree/sys/dev/agp/agp_i810.c
  projects/mtree/sys/dev/ahci/ahci.c
  projects/mtree/sys/dev/ale/if_ale.c
  projects/mtree/sys/dev/arcmsr/arcmsr.c
  projects/mtree/sys/dev/ata/ata-pci.h
  projects/mtree/sys/dev/ata/chipsets/ata-ati.c
  projects/mtree/sys/dev/ath/if_ath_tx.c
  projects/mtree/sys/dev/ath/if_athvar.h
  projects/mtree/sys/dev/smc/if_smc.c
  projects/mtree/sys/dev/sound/pci/hda/hdaa_patches.c
  projects/mtree/sys/dev/sound/pci/hda/hdac.h
  projects/mtree/sys/dev/sym/sym_hipd.c
  projects/mtree/sys/dev/uart/uart_bus_fdt.c
  projects/mtree/sys/dev/virtio/block/virtio_blk.c
  projects/mtree/sys/dev/virtio/network/if_vtnet.c
  projects/mtree/sys/dev/virtio/scsi/virtio_scsi.c
  projects/mtree/sys/dev/wbwd/wbwd.c
  projects/mtree/sys/dev/wtap/if_wtap.c
  projects/mtree/sys/i386/include/bus.h
  projects/mtree/sys/kern/kern_fork.c
  projects/mtree/sys/kern/kern_mib.c
  projects/mtree/sys/kern/kern_priv.c
  projects/mtree/sys/kern/kern_shutdown.c
  projects/mtree/sys/kern/kern_sig.c
  projects/mtree/sys/kern/subr_witness.c
  projects/mtree/sys/kern/vfs_export.c
  projects/mtree/sys/kern/vfs_subr.c
  projects/mtree/sys/kgssapi/gss_accept_sec_context.c
  projects/mtree/sys/kgssapi/gss_acquire_cred.c
  projects/mtree/sys/kgssapi/gss_canonicalize_name.c
  projects/mtree/sys/kgssapi/gss_delete_sec_context.c
  projects/mtree/sys/kgssapi/gss_display_status.c
  projects/mtree/sys/kgssapi/gss_export_name.c
  projects/mtree/sys/kgssapi/gss_impl.c
  projects/mtree/sys/kgssapi/gss_import_name.c
  projects/mtree/sys/kgssapi/gss_init_sec_context.c
  projects/mtree/sys/kgssapi/gss_pname_to_uid.c
  projects/mtree/sys/kgssapi/gss_release_cred.c
  projects/mtree/sys/kgssapi/gss_release_name.c
  projects/mtree/sys/kgssapi/gss_set_cred_option.c
  projects/mtree/sys/kgssapi/gssapi_impl.h
  projects/mtree/sys/net/if_bridge.c
  projects/mtree/sys/net/if_llatbl.c
  projects/mtree/sys/netinet/if_ether.c
  projects/mtree/sys/netinet/tcp_input.c
  projects/mtree/sys/netinet6/in6.c
  projects/mtree/sys/netinet6/in6_var.h
  projects/mtree/sys/netinet6/ip6_input.c
  projects/mtree/sys/netinet6/ip6_var.h
  projects/mtree/sys/netinet6/nd6.c
  projects/mtree/sys/netpfil/pf/if_pfsync.c
  projects/mtree/sys/netpfil/pf/pf.c
  projects/mtree/sys/netpfil/pf/pf_if.c
  projects/mtree/sys/netpfil/pf/pf_ioctl.c
  projects/mtree/sys/netpfil/pf/pf_norm.c
  projects/mtree/sys/sparc64/conf/GENERIC
  projects/mtree/sys/sys/fnv_hash.h
  projects/mtree/sys/sys/kdb.h
  projects/mtree/sys/sys/mount.h
  projects/mtree/sys/sys/sysctl.h
  projects/mtree/sys/sys/systm.h
  projects/mtree/sys/ufs/ufs/ufs_quota.c
  projects/mtree/sys/vm/vm.h
  projects/mtree/sys/vm/vm_map.c
  projects/mtree/sys/vm/vm_mmap.c
  projects/mtree/sys/vm/vm_unix.c
  projects/mtree/sys/x86/include/bus.h
  projects/mtree/tools/tools/sysbuild/sysbuild.sh
  projects/mtree/usr.bin/calendar/parsedata.c
  projects/mtree/usr.bin/sort/sort.c
  projects/mtree/usr.bin/sort/sort.h
  projects/mtree/usr.sbin/gssd/gssd.c
  projects/mtree/usr.sbin/iostat/iostat.8
  projects/mtree/usr.sbin/iostat/iostat.c
  projects/mtree/usr.sbin/ndp/ndp.8
  projects/mtree/usr.sbin/portsnap/portsnap/portsnap.sh
  projects/mtree/usr.sbin/service/service.8
  projects/mtree/usr.sbin/service/service.sh
Directory Properties:
  projects/mtree/   (props changed)
  projects/mtree/cddl/contrib/opensolaris/   (props changed)
  projects/mtree/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/mtree/contrib/binutils/   (props changed)
  projects/mtree/contrib/gcc/   (props changed)
  projects/mtree/contrib/openbsm/   (props changed)
  projects/mtree/contrib/top/   (props changed)
  projects/mtree/gnu/lib/   (props changed)
  projects/mtree/gnu/usr.bin/binutils/   (props changed)
  projects/mtree/lib/libc/   (props changed)
  projects/mtree/sbin/   (props changed)
  projects/mtree/sys/   (props changed)
  projects/mtree/sys/boot/   (props changed)
  projects/mtree/sys/boot/i386/efi/   (props changed)
  projects/mtree/sys/cddl/contrib/opensolaris/   (props changed)
  projects/mtree/sys/conf/   (props changed)
  projects/mtree/sys/powerpc/wii/locore.S   (props changed)
  projects/mtree/usr.bin/calendar/   (props changed)

Modified: projects/mtree/UPDATING
==============================================================================
--- projects/mtree/UPDATING	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/UPDATING	Tue Dec 18 17:13:16 2012	(r244402)
@@ -26,6 +26,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20121217:
+	By default, only the 10 most recent kernel dumps will be saved.  To
+	restore the previous behaviour (no limit on the number of kernel dumps
+	stored in the dump directory) add the following line to /etc/rc.conf:
+
+		savecore_flags=""
+
 20121201:
 	With the addition of auditdistd(8), a new auditdistd user is now
 	depended on during installworld.  "mergemaster -p" can be used to add

Modified: projects/mtree/bin/df/df.c
==============================================================================
--- projects/mtree/bin/df/df.c	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/bin/df/df.c	Tue Dec 18 17:13:16 2012	(r244402)
@@ -397,7 +397,7 @@ prthumanvalinode(int64_t bytes)
 static intmax_t
 fsbtoblk(int64_t num, uint64_t fsbs, u_long bs)
 {
-	return (num * (intmax_t) fsbs / bs);
+	return (num * (intmax_t) fsbs / (int64_t) bs);
 }
 
 /*

Modified: projects/mtree/bin/ps/ps.c
==============================================================================
--- projects/mtree/bin/ps/ps.c	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/bin/ps/ps.c	Tue Dec 18 17:13:16 2012	(r244402)
@@ -109,6 +109,7 @@ static int	 needcomm;	/* -o "command" */
 static int	 needenv;	/* -e */
 static int	 needuser;	/* -o "user" */
 static int	 optfatal;	/* Fatal error parsing some list-option. */
+static int	 pid_max;	/* kern.max_pid */
 
 static enum sort { DEFAULT, SORTMEM, SORTCPU } sortby = DEFAULT;
 
@@ -148,6 +149,7 @@ static int	 pscomp(const void *, const v
 static void	 saveuser(KINFO *);
 static void	 scanvars(void);
 static void	 sizevars(void);
+static void	 pidmax_init(void);
 static void	 usage(void);
 
 static char dfmt[] = "pid,tt,state,time,command";
@@ -200,6 +202,8 @@ main(int argc, char *argv[])
 	if (argc > 1)
 		argv[1] = kludge_oldps_options(PS_ARGS, argv[1], argv[2]);
 
+	pidmax_init();
+
 	all = descendancy = _fmt = nselectors = optfatal = 0;
 	prtheader = showthreads = wflag = xkeep_implied = 0;
 	xkeep = -1;			/* Neither -x nor -X. */
@@ -722,7 +726,6 @@ addelem_gid(struct listinfo *inf, const 
 	return (1);
 }
 
-#define	BSD_PID_MAX	99999		/* Copy of PID_MAX from sys/proc.h. */
 static int
 addelem_pid(struct listinfo *inf, const char *elem)
 {
@@ -740,7 +743,7 @@ addelem_pid(struct listinfo *inf, const 
 	if (*endp != '\0' || tempid < 0 || elem == endp) {
 		warnx("Invalid %s: %s", inf->lname, elem);
 		errno = ERANGE;
-	} else if (errno != 0 || tempid > BSD_PID_MAX) {
+	} else if (errno != 0 || tempid > pid_max) {
 		warnx("%s too large: %s", inf->lname, elem);
 		errno = ERANGE;
 	}
@@ -753,7 +756,6 @@ addelem_pid(struct listinfo *inf, const 
 	inf->l.pids[(inf->count)++] = tempid;
 	return (1);
 }
-#undef	BSD_PID_MAX
 
 /*-
  * The user can specify a device via one of three formats:
@@ -1352,6 +1354,18 @@ kludge_oldps_options(const char *optlist
 }
 
 static void
+pidmax_init(void)
+{
+	size_t intsize;
+
+	intsize = sizeof(pid_max);
+	if (sysctlbyname("kern.pid_max", &pid_max, &intsize, NULL, 0) < 0) {
+		warn("unable to read kern.pid_max");
+		pid_max = 99999;
+	}
+}
+
+static void
 usage(void)
 {
 #define	SINGLE_OPTS	"[-aCcde" OPT_LAZY_f "HhjlmrSTuvwXxZ]"

Modified: projects/mtree/bin/sh/eval.c
==============================================================================
--- projects/mtree/bin/sh/eval.c	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/bin/sh/eval.c	Tue Dec 18 17:13:16 2012	(r244402)
@@ -1070,6 +1070,7 @@ evalcommand(union node *cmd, int flags, 
 		}
 		handler = &jmploc;
 		redirect(cmd->ncmd.redirect, mode);
+		outclearerror(out1);
 		/*
 		 * If there is no command word, redirection errors should
 		 * not be fatal but assignment errors should.
@@ -1085,6 +1086,11 @@ evalcommand(union node *cmd, int flags, 
 		builtin_flags = flags;
 		exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv);
 		flushall();
+		if (outiserror(out1)) {
+			warning("write error on stdout");
+			if (exitstatus == 0 || exitstatus == 1)
+				exitstatus = 2;
+		}
 cmddone:
 		if (argc > 0)
 			bltinunsetlocale();

Modified: projects/mtree/bin/sh/output.c
==============================================================================
--- projects/mtree/bin/sh/output.c	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/bin/sh/output.c	Tue Dec 18 17:13:16 2012	(r244402)
@@ -239,6 +239,20 @@ freestdout(void)
 }
 
 
+int
+outiserror(struct output *file)
+{
+	return (file->flags & OUTPUT_ERR);
+}
+
+
+void
+outclearerror(struct output *file)
+{
+	file->flags &= ~OUTPUT_ERR;
+}
+
+
 void
 outfmt(struct output *file, const char *fmt, ...)
 {

Modified: projects/mtree/bin/sh/output.h
==============================================================================
--- projects/mtree/bin/sh/output.h	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/bin/sh/output.h	Tue Dec 18 17:13:16 2012	(r244402)
@@ -66,6 +66,8 @@ void emptyoutbuf(struct output *);
 void flushall(void);
 void flushout(struct output *);
 void freestdout(void);
+int outiserror(struct output *);
+void outclearerror(struct output *);
 void outfmt(struct output *, const char *, ...) __printflike(2, 3);
 void out1fmt(const char *, ...) __printflike(1, 2);
 void out2fmt_flush(const char *, ...) __printflike(1, 2);

Modified: projects/mtree/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/mtree/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Tue Dec 18 17:13:16 2012	(r244402)
@@ -61,14 +61,16 @@
 #undef verify
 #include <libzfs.h>
 
-#define	ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ? \
-    zio_compress_table[(idx)].ci_name : "UNKNOWN")
-#define	ZDB_CHECKSUM_NAME(idx) ((idx) < ZIO_CHECKSUM_FUNCTIONS ? \
-    zio_checksum_table[(idx)].ci_name : "UNKNOWN")
-#define	ZDB_OT_NAME(idx) ((idx) < DMU_OT_NUMTYPES ? \
-    dmu_ot[(idx)].ot_name : DMU_OT_IS_VALID(idx) ? \
-    dmu_ot_byteswap[DMU_OT_BYTESWAP(idx)].ob_name : "UNKNOWN")
-#define	ZDB_OT_TYPE(idx) ((idx) < DMU_OT_NUMTYPES ? (idx) : DMU_OT_NUMTYPES)
+#define	ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ?	\
+	zio_compress_table[(idx)].ci_name : "UNKNOWN")
+#define	ZDB_CHECKSUM_NAME(idx) ((idx) < ZIO_CHECKSUM_FUNCTIONS ?	\
+	zio_checksum_table[(idx)].ci_name : "UNKNOWN")
+#define	ZDB_OT_NAME(idx) ((idx) < DMU_OT_NUMTYPES ?	\
+	dmu_ot[(idx)].ot_name : DMU_OT_IS_VALID(idx) ?	\
+	dmu_ot_byteswap[DMU_OT_BYTESWAP(idx)].ob_name : "UNKNOWN")
+#define	ZDB_OT_TYPE(idx) ((idx) < DMU_OT_NUMTYPES ? (idx) :		\
+	(((idx) == DMU_OTN_ZAP_DATA || (idx) == DMU_OTN_ZAP_METADATA) ?	\
+	DMU_OT_ZAP_OTHER : DMU_OT_NUMTYPES))
 
 #ifndef lint
 extern int zfs_recover;
@@ -3194,7 +3196,13 @@ main(int argc, char **argv)
 					    argv[i], strerror(errno));
 			}
 		}
-		(os != NULL) ? dump_dir(os) : dump_zpool(spa);
+		if (os != NULL) {
+			dump_dir(os);
+		} else if (zopt_objects > 0 && !dump_opt['m']) {
+			dump_dir(spa->spa_meta_objset);
+		} else {
+			dump_zpool(spa);
+		}
 	} else {
 		flagbits['b'] = ZDB_FLAG_PRINT_BLKPTR;
 		flagbits['c'] = ZDB_FLAG_CHECKSUM;

Modified: projects/mtree/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- projects/mtree/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Tue Dec 18 17:13:16 2012	(r244402)
@@ -727,7 +727,7 @@ send_iterate_fs(zfs_handle_t *zhp, void 
 	sd->parent_fromsnap_guid = 0;
 	VERIFY(0 == nvlist_alloc(&sd->parent_snaps, NV_UNIQUE_NAME, 0));
 	VERIFY(0 == nvlist_alloc(&sd->snapprops, NV_UNIQUE_NAME, 0));
-	(void) zfs_iter_snapshots(zhp, B_FALSE, send_iterate_snap, sd);
+	(void) zfs_iter_snapshots_sorted(zhp, send_iterate_snap, sd);
 	VERIFY(0 == nvlist_add_nvlist(nvfs, "snaps", sd->parent_snaps));
 	VERIFY(0 == nvlist_add_nvlist(nvfs, "snapprops", sd->snapprops));
 	nvlist_free(sd->parent_snaps);
@@ -1945,11 +1945,12 @@ recv_incremental_replication(libzfs_hand
     recvflags_t *flags, nvlist_t *stream_nv, avl_tree_t *stream_avl,
     nvlist_t *renamed)
 {
-	nvlist_t *local_nv;
+	nvlist_t *local_nv, *deleted = NULL;
 	avl_tree_t *local_avl;
 	nvpair_t *fselem, *nextfselem;
 	char *fromsnap;
 	char newname[ZFS_MAXNAMELEN];
+	char guidname[32];
 	int error;
 	boolean_t needagain, progress, recursive;
 	char *s1, *s2;
@@ -1965,6 +1966,8 @@ recv_incremental_replication(libzfs_hand
 again:
 	needagain = progress = B_FALSE;
 
+	VERIFY(0 == nvlist_alloc(&deleted, NV_UNIQUE_NAME, 0));
+
 	if ((error = gather_nvlist(hdl, tofs, fromsnap, NULL,
 	    recursive, &local_nv, &local_avl)) != 0)
 		return (error);
@@ -2079,6 +2082,8 @@ again:
 					needagain = B_TRUE;
 				else
 					progress = B_TRUE;
+				sprintf(guidname, "%lu", thisguid);
+				nvlist_add_boolean(deleted, guidname);
 				continue;
 			}
 
@@ -2134,6 +2139,8 @@ again:
 				needagain = B_TRUE;
 			else
 				progress = B_TRUE;
+			sprintf(guidname, "%lu", parent_fromsnap_guid);
+			nvlist_add_boolean(deleted, guidname);
 			continue;
 		}
 
@@ -2156,6 +2163,24 @@ again:
 		s2 = strrchr(stream_fsname, '/');
 
 		/*
+		 * Check if we're going to rename based on parent guid change
+		 * and the current parent guid was also deleted. If it was then
+		 * rename will fail and is likely unneeded, so avoid this and
+		 * force an early retry to determine the new
+		 * parent_fromsnap_guid.
+		 */
+		if (stream_parent_fromsnap_guid != 0 &&
+                    parent_fromsnap_guid != 0 &&
+                    stream_parent_fromsnap_guid != parent_fromsnap_guid) {
+			sprintf(guidname, "%lu", parent_fromsnap_guid);
+			if (nvlist_exists(deleted, guidname)) {
+				progress = B_TRUE;
+				needagain = B_TRUE;
+				goto doagain;
+			}
+		}
+
+		/*
 		 * Check for rename. If the exact receive path is specified, it
 		 * does not count as a rename, but we still need to check the
 		 * datasets beneath it.
@@ -2209,8 +2234,10 @@ again:
 		}
 	}
 
+doagain:
 	fsavl_destroy(local_avl);
 	nvlist_free(local_nv);
+	nvlist_free(deleted);
 
 	if (needagain && progress) {
 		/* do another pass to fix up temporary names */

Modified: projects/mtree/contrib/binutils/gas/config/tc-arm.c
==============================================================================
--- projects/mtree/contrib/binutils/gas/config/tc-arm.c	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/contrib/binutils/gas/config/tc-arm.c	Tue Dec 18 17:13:16 2012	(r244402)
@@ -20107,6 +20107,7 @@ static const struct arm_option_cpu_value
   {"softvfp",		FPU_ARCH_VFP},
   {"softvfp+vfp",	FPU_ARCH_VFP_V2},
   {"vfp",		FPU_ARCH_VFP_V2},
+  {"vfpv2",		FPU_ARCH_VFP_V2},
   {"vfp9",		FPU_ARCH_VFP_V2},
   {"vfp3",              FPU_ARCH_VFP_V3},
   {"vfpv3",             FPU_ARCH_VFP_V3},

Modified: projects/mtree/contrib/gcc/config/arm/arm.h
==============================================================================
--- projects/mtree/contrib/gcc/config/arm/arm.h	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/contrib/gcc/config/arm/arm.h	Tue Dec 18 17:13:16 2012	(r244402)
@@ -1866,8 +1866,10 @@ typedef struct
 #   define DTOR_LIST_BEGIN asm (ARM_EABI_DTORS_SECTION_OP)
 #   define DTOR_LIST_END /* empty */
 # else /* !defined (__ARM_EABI__) */
+#  ifndef __clang__
 #   define CTORS_SECTION_ASM_OP ARM_CTORS_SECTION_OP
 #   define DTORS_SECTION_ASM_OP ARM_DTORS_SECTION_OP
+#  endif
 # endif /* !defined (__ARM_EABI__) */
 #endif /* !defined (IN_LIBCC2) */
 

Modified: projects/mtree/contrib/gcc/longlong.h
==============================================================================
--- projects/mtree/contrib/gcc/longlong.h	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/contrib/gcc/longlong.h	Tue Dec 18 17:13:16 2012	(r244402)
@@ -205,7 +205,7 @@ UDItype __umulsidi3 (USItype, USItype);
 	     "rI" ((USItype) (bl)) __CLOBBER_CC)
 #define umul_ppmm(xh, xl, a, b) \
 {register USItype __t0, __t1, __t2;					\
-  __asm__ ("%@ Inlined umul_ppmm\n"					\
+  __asm__ ("/* Inlined umul_ppmm */\n"					\
 	   "	mov	%2, %5, lsr #16\n"				\
 	   "	mov	%0, %6, lsr #16\n"				\
 	   "	bic	%3, %5, %2, lsl #16\n"				\

Modified: projects/mtree/contrib/openbsm/INSTALL
==============================================================================
--- projects/mtree/contrib/openbsm/INSTALL	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/contrib/openbsm/INSTALL	Tue Dec 18 17:13:16 2012	(r244402)
@@ -9,8 +9,8 @@ suppport is found.  Typical builds will 
     make
 
 If doing development work on OpenBSM with gcc, the following invocation of
-configure may be preferred in order to generate full compiler warnings and
-force the compile to fail if a warning is found:
+configure is preferred in order to generate full compiler warnings and force
+the compile to fail if a warning is found:
 
     CFLAGS="-Wall -Werror" ./configure
 

Modified: projects/mtree/contrib/openbsm/NEWS
==============================================================================
--- projects/mtree/contrib/openbsm/NEWS	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/contrib/openbsm/NEWS	Tue Dec 18 17:13:16 2012	(r244402)
@@ -1,5 +1,11 @@
 OpenBSM Version History
 
+OpenBSM 1.2 alpha 3
+
+- Various minor tweaks to the auditdistd build to make it fit the FreeBSD
+  build environment better.
+- AUE_WAIT6 merged from FreeBSD 9.
+
 OpenBSM 1.2 alpha 2
 
 - auditdistd, a distributed audit trail management daemon, has now been
@@ -489,4 +495,4 @@ OpenBSM 1.0 alpha 1
   to support reloading of kernel event table.
 - Allow comments in /etc/security configuration files.
 
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#53 $
+$P4: //depot/projects/trustedbsd/openbsm/NEWS#55 $

Modified: projects/mtree/contrib/openbsm/VERSION
==============================================================================
--- projects/mtree/contrib/openbsm/VERSION	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/contrib/openbsm/VERSION	Tue Dec 18 17:13:16 2012	(r244402)
@@ -1 +1 @@
-OPENBSM_1_2alpha2
+OPENBSM_1_2_alpha3

Modified: projects/mtree/contrib/openbsm/bin/auditdistd/auditdistd.conf.5
==============================================================================
--- projects/mtree/contrib/openbsm/bin/auditdistd/auditdistd.conf.5	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/contrib/openbsm/bin/auditdistd/auditdistd.conf.5	Tue Dec 18 17:13:16 2012	(r244402)
@@ -355,7 +355,7 @@ receiver {
 .Xr auditdistd 8 .
 .Sh AUTHORS
 The
-.Nm
-was written by
+.Nm auditdistd
+was developed by
 .An Pawel Jakub Dawidek Aq pawel at dawidek.net
 under sponsorship of the FreeBSD Foundation.

Modified: projects/mtree/contrib/openbsm/config/config.h
==============================================================================
--- projects/mtree/contrib/openbsm/config/config.h	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/contrib/openbsm/config/config.h	Tue Dec 18 17:13:16 2012	(r244402)
@@ -235,7 +235,7 @@
 #define PACKAGE_NAME "OpenBSM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "OpenBSM 1.2alpha2"
+#define PACKAGE_STRING "OpenBSM 1.2-alpha3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "openbsm"
@@ -244,7 +244,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2alpha2"
+#define PACKAGE_VERSION "1.2-alpha3"
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
@@ -280,7 +280,7 @@
 #define USE_SYS_ENDIAN_H /**/
 
 /* Version number of package */
-#define VERSION "1.2alpha2"
+#define VERSION "1.2-alpha3"
 
 /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
    `char[]'. */

Modified: projects/mtree/contrib/openbsm/configure
==============================================================================
--- projects/mtree/contrib/openbsm/configure	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/contrib/openbsm/configure	Tue Dec 18 17:13:16 2012	(r244402)
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#62 .
+# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#65 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OpenBSM 1.2alpha2.
+# Generated by GNU Autoconf 2.69 for OpenBSM 1.2-alpha3.
 #
 # Report bugs to <trustedbsd-audit at TrustesdBSD.org>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='OpenBSM'
 PACKAGE_TARNAME='openbsm'
-PACKAGE_VERSION='1.2alpha2'
-PACKAGE_STRING='OpenBSM 1.2alpha2'
+PACKAGE_VERSION='1.2-alpha3'
+PACKAGE_STRING='OpenBSM 1.2-alpha3'
 PACKAGE_BUGREPORT='trustedbsd-audit at TrustesdBSD.org'
 PACKAGE_URL=''
 
@@ -1327,7 +1327,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenBSM 1.2alpha2 to adapt to many kinds of systems.
+\`configure' configures OpenBSM 1.2-alpha3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1397,7 +1397,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenBSM 1.2alpha2:";;
+     short | recursive ) echo "Configuration of OpenBSM 1.2-alpha3:";;
    esac
   cat <<\_ACEOF
 
@@ -1511,7 +1511,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenBSM configure 1.2alpha2
+OpenBSM configure 1.2-alpha3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1991,7 +1991,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenBSM $as_me 1.2alpha2, which was
+It was created by OpenBSM $as_me 1.2-alpha3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -11552,7 +11552,7 @@ fi
 # Define the identity of the package.
 
  PACKAGE=OpenBSM
- VERSION=1.2alpha2
+ VERSION=1.2-alpha3
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13559,12 +13559,14 @@ int
 main ()
 {
 
-	bswap16(0);
-	bswap32(0);
-	bswap64(0);
+	int i;
+
+	i = bswap16(0);
+	i = bswap32(0);
+	i = bswap64(0);
 	be32enc(NULL, 0);
-	htole64(0);
-	le64toh(0);
+	i = htole64(0);
+	i = le64toh(0);
 
   ;
   return 0;
@@ -14172,7 +14174,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenBSM $as_me 1.2alpha2, which was
+This file was extended by OpenBSM $as_me 1.2-alpha3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14238,7 +14240,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-OpenBSM config.status 1.2alpha2
+OpenBSM config.status 1.2-alpha3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: projects/mtree/contrib/openbsm/configure.ac
==============================================================================
--- projects/mtree/contrib/openbsm/configure.ac	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/contrib/openbsm/configure.ac	Tue Dec 18 17:13:16 2012	(r244402)
@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([OpenBSM], [1.2alpha2], [trustedbsd-audit at TrustesdBSD.org],[openbsm])
-AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#63 $])
+AC_INIT([OpenBSM], [1.2-alpha3], [trustedbsd-audit at TrustesdBSD.org],[openbsm])
+AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#66 $])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c])
 AC_CONFIG_AUX_DIR(config)
@@ -217,12 +217,14 @@ AC_TRY_LINK([
 	#endif
 	#include <stdlib.h>
 ], [
-	bswap16(0);
-	bswap32(0);
-	bswap64(0);
+	int i;
+
+	i = bswap16(0);
+	i = bswap32(0);
+	i = bswap64(0);
 	be32enc(NULL, 0);
-	htole64(0);
-	le64toh(0);
+	i = htole64(0);
+	i = le64toh(0);
 ], [], [
 	AC_DEFINE(USE_COMPAT_ENDIAN_ENC_H,, Define if compat/endian_enc.h is required)
 	AC_MSG_RESULT([using compat/endian_enc.h])

Modified: projects/mtree/contrib/openbsm/etc/audit_event
==============================================================================
--- projects/mtree/contrib/openbsm/etc/audit_event	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/contrib/openbsm/etc/audit_event	Tue Dec 18 17:13:16 2012	(r244402)
@@ -1,5 +1,5 @@
 #
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#42 $
+# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#43 $
 # $FreeBSD$
 #
 # The mapping between event identifiers and values is also hard-coded in
@@ -562,6 +562,7 @@
 43198:AUE_PDKILL:pdkill(2):pc
 43199:AUE_PDGETPID:pdgetpid(2):pc
 43200:AUE_PDWAIT:pdwait(2):pc
+43201:AUE_WAIT6:wait6(2):pc
 #
 # Solaris userspace events.
 #

Modified: projects/mtree/contrib/openbsm/sys/bsm/audit_kevents.h
==============================================================================
--- projects/mtree/contrib/openbsm/sys/bsm/audit_kevents.h	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/contrib/openbsm/sys/bsm/audit_kevents.h	Tue Dec 18 17:13:16 2012	(r244402)
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#9 $
+ * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#10 $
  */
 
 #ifndef _BSM_AUDIT_KEVENTS_H_
@@ -601,6 +601,7 @@
 #define	AUE_PDKILL		43198	/* FreeBSD. */
 #define	AUE_PDGETPID		43199	/* FreeBSD. */
 #define	AUE_PDWAIT		43200	/* FreeBSD. */
+#define	AUE_WAIT6		43201	/* FreeBSD. */
 
 /*
  * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the

Modified: projects/mtree/contrib/openbsm/sys/bsm/audit_record.h
==============================================================================
--- projects/mtree/contrib/openbsm/sys/bsm/audit_record.h	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/contrib/openbsm/sys/bsm/audit_record.h	Tue Dec 18 17:13:16 2012	(r244402)
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#10 $
+ * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#12 $
  */
 
 #ifndef _BSM_AUDIT_RECORD_H_
@@ -233,6 +233,7 @@ token_t	*au_to_ipc_perm(struct ipc_perm 
 token_t	*au_to_iport(uint16_t iport);
 token_t	*au_to_opaque(const char *data, uint16_t bytes);
 token_t	*au_to_path(const char *path);
+token_t	*au_to_privset(char *privtypestr, char *privstr);
 token_t	*au_to_process(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
 	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
 token_t	*au_to_process32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
@@ -278,6 +279,7 @@ token_t	*au_to_exec_env(char **envp);
 token_t	*au_to_text(const char *text);
 token_t	*au_to_kevent(struct kevent *kev);
 token_t	*au_to_trailer(int rec_size);
+token_t	*au_to_upriv(char sorf, char *priv);
 token_t	*au_to_zonename(const char *zonename);
 
 /*

Modified: projects/mtree/contrib/top/top.h
==============================================================================
--- projects/mtree/contrib/top/top.h	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/contrib/top/top.h	Tue Dec 18 17:13:16 2012	(r244402)
@@ -14,7 +14,7 @@
 extern int Header_lines;	/* 7 */
 
 /* Maximum number of columns allowed for display */
-#define MAX_COLS	128
+#define MAX_COLS	512
 
 /* Log base 2 of 1024 is 10 (2^10 == 1024) */
 #define LOG1024		10

Modified: projects/mtree/etc/defaults/rc.conf
==============================================================================
--- projects/mtree/etc/defaults/rc.conf	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/etc/defaults/rc.conf	Tue Dec 18 17:13:16 2012	(r244402)
@@ -605,7 +605,9 @@ chkprintcap_enable="NO"	# Run chkprintca
 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).

Modified: projects/mtree/etc/devd/usb.conf
==============================================================================
--- projects/mtree/etc/devd/usb.conf	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/etc/devd/usb.conf	Tue Dec 18 17:13:16 2012	(r244402)
@@ -423,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";
@@ -2647,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";
@@ -4199,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";
@@ -4611,5 +4635,5 @@ nomatch 32 {
 	action "kldload -n umass";
 };
 
-# 2279 USB entries processed
+# 2386 USB entries processed
 

Modified: projects/mtree/etc/login.conf
==============================================================================
--- projects/mtree/etc/login.conf	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/etc/login.conf	Tue Dec 18 17:13:16 2012	(r244402)
@@ -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=64M:\
 	:tc=default:
 news:\
 	:tc=default:
@@ -72,6 +73,7 @@ dialer:\
 #       in preference to 'default'.
 root:\
 	:ignorenologin:\
+	:memorylocked=unlimited:\
 	:tc=default:
 
 #

Modified: projects/mtree/etc/pf.os
==============================================================================
--- projects/mtree/etc/pf.os	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/etc/pf.os	Tue Dec 18 17:13:16 2012	(r244402)
@@ -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::Linu
 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:
 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

Modified: projects/mtree/etc/rc.d/auditdistd
==============================================================================
--- projects/mtree/etc/rc.d/auditdistd	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/etc/rc.d/auditdistd	Tue Dec 18 17:13:16 2012	(r244402)
@@ -14,7 +14,7 @@ name="auditdistd"
 rcvar="${name}_enable"
 pidfile="/var/run/${name}.pid"
 command="/usr/sbin/${name}"
-required_files="/etc/${name}.conf"
+required_files="/etc/security/${name}.conf"
 extra_commands="reload"
 
 load_rc_config $name

Modified: projects/mtree/etc/rc.d/savecore
==============================================================================
--- projects/mtree/etc/rc.d/savecore	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/etc/rc.d/savecore	Tue Dec 18 17:13:16 2012	(r244402)
@@ -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}

Modified: projects/mtree/etc/rc.d/sysctl
==============================================================================
--- projects/mtree/etc/rc.d/sysctl	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/etc/rc.d/sysctl	Tue Dec 18 17:13:16 2012	(r244402)
@@ -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

Modified: projects/mtree/gnu/lib/libgcc/Makefile
==============================================================================
--- projects/mtree/gnu/lib/libgcc/Makefile	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/gnu/lib/libgcc/Makefile	Tue Dec 18 17:13:16 2012	(r244402)
@@ -38,13 +38,16 @@ OBJS=		# added to below in various ways 
 #
 # Library members defined in libgcc2.c.
 LIB2FUNCS= _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 \
-	_cmpdi2 _ucmpdi2 _clear_cache \
+	_cmpdi2 _ucmpdi2 \
 	_enable_execute_stack _trampoline __main _absvsi2 _absvdi2 _addvsi3 \
 	_addvdi3 _subvsi3 _subvdi3 _mulvsi3 _mulvdi3 _negvsi2 _negvdi2 _ctors \
 	_ffssi2 _ffsdi2 _clz _clzsi2 _clzdi2 _ctzsi2 _ctzdi2 _popcount_tab \
 	_popcountsi2 _popcountdi2 _paritysi2 _paritydi2 _powisf2 _powidf2 \
 	_powixf2 _powitf2 _mulsc3 _muldc3 _mulxc3 _multc3 _divsc3 _divdc3 \
 	_divxc3 _divtc3
+.if ${COMPILER_TYPE} != "clang" || ${TARGET_CPUARCH} != "arm"
+LIB2FUNCS+= _clear_cache
+.endif
 
 # The floating-point conversion routines that involve a single-word integer.
 .for mode in sf df xf
@@ -106,6 +109,10 @@ LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udi
 .if ${TARGET_CPUARCH} == "arm"
 #	from config/arm/t-strongarm-elf
 CFLAGS+=	-Dinhibit_libc -fno-inline
+.if ${COMPILER_TYPE} == "clang"
+CFLAGS+=	-fheinous-gnu-extensions
+.endif
+
 LIB1ASMSRC =	lib1funcs.asm
 LIB1ASMFUNCS =  _dvmd_tls _bb_init_func
 LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c

Modified: projects/mtree/gnu/usr.bin/binutils/as/Makefile
==============================================================================
--- projects/mtree/gnu/usr.bin/binutils/as/Makefile	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/gnu/usr.bin/binutils/as/Makefile	Tue Dec 18 17:13:16 2012	(r244402)
@@ -8,7 +8,7 @@
 
 .PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config
 
-.if ${TARGET_ARCH} == "powerpc64"
+.if ${TARGET_ARCH:Marm*} || ${TARGET_ARCH} == "powerpc64"
 NO_WERROR.clang=
 .endif
 

Modified: projects/mtree/include/Makefile
==============================================================================
--- projects/mtree/include/Makefile	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/include/Makefile	Tue Dec 18 17:13:16 2012	(r244402)
@@ -23,9 +23,12 @@ INCS=	a.out.h ar.h assert.h bitstring.h 
 	stdnoreturn.h stdio.h stdlib.h string.h stringlist.h \
 	strings.h sysexits.h tar.h termios.h tgmath.h \
 	time.h timeconv.h timers.h ttyent.h \
-	ulimit.h unistd.h utime.h utmpx.h uuid.h varargs.h vis.h \
+	ulimit.h unistd.h utime.h utmpx.h uuid.h varargs.h \
 	wchar.h wctype.h wordexp.h xlocale.h
 
+.PATH: ${.CURDIR}/../contrib/libc-vis
+INCS+=	vis.h
+
 MHDRS=	float.h floatingpoint.h stdarg.h
 
 PHDRS=	sched.h _semaphore.h

Modified: projects/mtree/lib/clang/Makefile
==============================================================================
--- projects/mtree/lib/clang/Makefile	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/lib/clang/Makefile	Tue Dec 18 17:13:16 2012	(r244402)
@@ -71,15 +71,12 @@ SUBDIR=	libclanganalysis \
 	libllvmx86utils
 
 .if ${MK_CLANG_EXTRAS} != "no"
-SUBDIR+=libllvmarchive \
-	libllvmdebuginfo \
+SUBDIR+=libllvmdebuginfo \
 	libllvmexecutionengine \
 	libllvminterpreter \
 	libllvmjit \
-	libllvmlinker \
 	libllvmmcdisassembler \
 	libllvmmcjit \
-	libllvmobject \
 	libllvmruntimedyld
 .endif
 .endif

Modified: projects/mtree/lib/libc/gen/Makefile.inc
==============================================================================
--- projects/mtree/lib/libc/gen/Makefile.inc	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/lib/libc/gen/Makefile.inc	Tue Dec 18 17:13:16 2012	(r244402)
@@ -32,14 +32,16 @@ SRCS+=  __getosreldate.c __xuname.c \
 	sigsetops.c sleep.c srand48.c statvfs.c stringlist.c strtofflags.c \
 	sysconf.c sysctl.c sysctlbyname.c sysctlnametomib.c \
 	syslog.c telldir.c termios.c time.c times.c timezone.c tls.c \
-	ttyname.c ttyslot.c ualarm.c ulimit.c uname.c unvis.c unvis-compat.c \
-	usleep.c utime.c utxdb.c valloc.c vis.c \
-	wait.c wait3.c waitpid.c \
+	ttyname.c ttyslot.c ualarm.c ulimit.c uname.c unvis-compat.c \
+	usleep.c utime.c utxdb.c valloc.c wait.c wait3.c waitpid.c \
 	waitid.c wordexp.c
 
 .PATH: ${.CURDIR}/../../contrib/libc-pwcache
 SRCS+=	pwcache.c pwcache.h
 
+.PATH: ${.CURDIR}/../../contrib/libc-vis
+SRCS+=	unvis.c vis.c
+
 MISRCS+=modf.c
 
 CANCELPOINTS_SRCS=sem.c sem_new.c

Modified: projects/mtree/lib/libc/gen/sysctlbyname.c
==============================================================================
--- projects/mtree/lib/libc/gen/sysctlbyname.c	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/lib/libc/gen/sysctlbyname.c	Tue Dec 18 17:13:16 2012	(r244402)
@@ -19,13 +19,10 @@ sysctlbyname(const char *name, void *old
     const void *newp, size_t newlen)
 {
 	int real_oid[CTL_MAXNAME+2];
-	int error;
 	size_t oidlen;
 
 	oidlen = sizeof(real_oid) / sizeof(int);
-	error = sysctlnametomib(name, real_oid, &oidlen);
-	if (error < 0) 
-		return (error);
-	error = sysctl(real_oid, oidlen, oldp, oldlenp, newp, newlen);
-	return (error);
+	if (sysctlnametomib(name, real_oid, &oidlen) < 0)
+		return (-1);
+	return (sysctl(real_oid, oidlen, oldp, oldlenp, newp, newlen));
 }

Modified: projects/mtree/lib/libc/iconv/citrus_mmap.c
==============================================================================
--- projects/mtree/lib/libc/iconv/citrus_mmap.c	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/lib/libc/iconv/citrus_mmap.c	Tue Dec 18 17:13:16 2012	(r244402)
@@ -57,12 +57,8 @@ _citrus_map_file(struct _citrus_region *
 
 	_region_init(r, NULL, 0);
 
-	if ((fd = open(path, O_RDONLY)) == -1)
+	if ((fd = open(path, O_RDONLY | O_CLOEXEC)) == -1)
 		return (errno);
-	if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) {
-		ret = errno;
-		goto error;
-	}
 
 	if (fstat(fd, &st)  == -1) {
 		ret = errno;

Modified: projects/mtree/lib/libc/locale/collate.c
==============================================================================
--- projects/mtree/lib/libc/locale/collate.c	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/lib/libc/locale/collate.c	Tue Dec 18 17:13:16 2012	(r244402)
@@ -135,7 +135,7 @@ __collate_load_tables_l(const char *enco
 	(void)strcat(buf, "/");
 	(void)strcat(buf, encoding);
 	(void)strcat(buf, "/LC_COLLATE");
-	if ((fp = fopen(buf, "r")) == NULL)
+	if ((fp = fopen(buf, "re")) == NULL)
 		return (_LDP_ERROR);
 
 	if (fread(strbuf, sizeof(strbuf), 1, fp) != 1) {

Modified: projects/mtree/lib/libc/locale/setrunelocale.c
==============================================================================
--- projects/mtree/lib/libc/locale/setrunelocale.c	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/lib/libc/locale/setrunelocale.c	Tue Dec 18 17:13:16 2012	(r244402)
@@ -129,7 +129,7 @@ __setrunelocale(struct xlocale_ctype *l,
 	(void) strcat(name, encoding);
 	(void) strcat(name, "/LC_CTYPE");
 
-	if ((fp = fopen(name, "r")) == NULL)
+	if ((fp = fopen(name, "re")) == NULL)
 		return (errno == 0 ? ENOENT : errno);
 
 	if ((rl = _Read_RuneMagi(fp)) == NULL) {

Modified: projects/mtree/lib/libc/nls/msgcat.c
==============================================================================
--- projects/mtree/lib/libc/nls/msgcat.c	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/lib/libc/nls/msgcat.c	Tue Dec 18 17:13:16 2012	(r244402)
@@ -82,6 +82,7 @@ __FBSDID("$FreeBSD$");
 				  if (np != NULL) {				\
 				  	np->name = strdup(n);			\
 					np->path = NULL;			\
+					np->catd = NLERR;			\
 					np->lang = (l == NULL) ? NULL :		\
 					    strdup(l);				\
 					np->caterrno = e;			\

Modified: projects/mtree/lib/libcompiler_rt/Makefile
==============================================================================
--- projects/mtree/lib/libcompiler_rt/Makefile	Tue Dec 18 16:37:24 2012	(r244401)
+++ projects/mtree/lib/libcompiler_rt/Makefile	Tue Dec 18 17:13:16 2012	(r244402)
@@ -28,7 +28,6 @@ SRCF=	absvdi2 \
 	ashlti3 \
 	ashrdi3 \
 	ashrti3 \
-	clear_cache \
 	clzdi2 \

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

More information about the svn-src-projects mailing list