svn commit: r245541 - in projects/arm_eabi: . bin/cp bin/pwait bin/sh cddl/contrib/opensolaris/lib/libzfs/common contrib/gcc/config/arm contrib/libcxxrt etc etc/mtree etc/rc.d gnu/lib/libgcc includ...

Andrew Turner andrew at FreeBSD.org
Thu Jan 17 06:08:57 UTC 2013 

Author: andrew
Date: Thu Jan 17 06:08:49 2013
New Revision: 245541
URL: http://svnweb.freebsd.org/changeset/base/245541

Log:
  MFC to r245539

Added:
  projects/arm_eabi/sys/arm/allwinner/
     - copied from r245539, head/sys/arm/allwinner/
  projects/arm_eabi/sys/arm/conf/CUBIEBOARD
     - copied unchanged from r245539, head/sys/arm/conf/CUBIEBOARD
  projects/arm_eabi/sys/boot/fdt/dts/cubieboard.dts
     - copied unchanged from r245539, head/sys/boot/fdt/dts/cubieboard.dts
  projects/arm_eabi/sys/dev/altera/avgen/altera_avgen_fdt.c
     - copied unchanged from r245539, head/sys/dev/altera/avgen/altera_avgen_fdt.c
  projects/arm_eabi/sys/dev/altera/avgen/altera_avgen_nexus.c
     - copied unchanged from r245539, head/sys/dev/altera/avgen/altera_avgen_nexus.c
  projects/arm_eabi/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c
     - copied unchanged from r245539, head/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c
  projects/arm_eabi/sys/dev/altera/sdcard/altera_sdcard_fdt.c
     - copied unchanged from r245539, head/sys/dev/altera/sdcard/altera_sdcard_fdt.c
  projects/arm_eabi/sys/dev/isf/isf_fdt.c
     - copied unchanged from r245539, head/sys/dev/isf/isf_fdt.c
  projects/arm_eabi/sys/dev/terasic/de4led/terasic_de4led_fdt.c
     - copied unchanged from r245539, head/sys/dev/terasic/de4led/terasic_de4led_fdt.c
  projects/arm_eabi/sys/dev/terasic/mtl/terasic_mtl_fdt.c
     - copied unchanged from r245539, head/sys/dev/terasic/mtl/terasic_mtl_fdt.c
  projects/arm_eabi/sys/mips/mips/bus_space_fdt.c
     - copied unchanged from r245539, head/sys/mips/mips/bus_space_fdt.c
  projects/arm_eabi/tools/build/options/WITH_ARM_EABI
     - copied unchanged from r245539, head/tools/build/options/WITH_ARM_EABI
  projects/arm_eabi/tools/build/options/WITH_OPENSSH_NONE_CIPHER
     - copied unchanged from r245539, head/tools/build/options/WITH_OPENSSH_NONE_CIPHER
  projects/arm_eabi/tools/regression/bin/sh/execution/subshell1.0
     - copied unchanged from r245539, head/tools/regression/bin/sh/execution/subshell1.0
  projects/arm_eabi/tools/regression/bin/sh/execution/subshell1.0.stdout
     - copied unchanged from r245539, head/tools/regression/bin/sh/execution/subshell1.0.stdout
  projects/arm_eabi/tools/regression/bin/sh/execution/subshell2.0
     - copied unchanged from r245539, head/tools/regression/bin/sh/execution/subshell2.0
  projects/arm_eabi/tools/regression/bin/sh/execution/subshell3.0
     - copied unchanged from r245539, head/tools/regression/bin/sh/execution/subshell3.0
  projects/arm_eabi/tools/regression/bin/sh/execution/subshell4.0
     - copied unchanged from r245539, head/tools/regression/bin/sh/execution/subshell4.0
  projects/arm_eabi/tools/regression/bin/sh/expansion/cmdsubst14.0
     - copied unchanged from r245539, head/tools/regression/bin/sh/expansion/cmdsubst14.0
  projects/arm_eabi/tools/regression/bin/sh/expansion/cmdsubst15.0
     - copied unchanged from r245539, head/tools/regression/bin/sh/expansion/cmdsubst15.0
  projects/arm_eabi/tools/regression/bin/sh/expansion/cmdsubst16.0
     - copied unchanged from r245539, head/tools/regression/bin/sh/expansion/cmdsubst16.0
  projects/arm_eabi/tools/regression/bin/sh/expansion/cmdsubst17.0
     - copied unchanged from r245539, head/tools/regression/bin/sh/expansion/cmdsubst17.0
  projects/arm_eabi/tools/regression/bin/sh/parser/empty-braces1.0
     - copied unchanged from r245539, head/tools/regression/bin/sh/parser/empty-braces1.0
Deleted:
  projects/arm_eabi/sys/dev/cxgbe/common/jhash.h
Modified:
  projects/arm_eabi/Makefile.inc1
  projects/arm_eabi/ObsoleteFiles.inc
  projects/arm_eabi/bin/cp/cp.c
  projects/arm_eabi/bin/pwait/pwait.c
  projects/arm_eabi/bin/sh/eval.c
  projects/arm_eabi/bin/sh/exec.c
  projects/arm_eabi/bin/sh/parser.c
  projects/arm_eabi/bin/sh/sh.1
  projects/arm_eabi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c
  projects/arm_eabi/contrib/gcc/config/arm/freebsd.h
  projects/arm_eabi/contrib/libcxxrt/atomic.h
  projects/arm_eabi/etc/Makefile
  projects/arm_eabi/etc/mtree/BSD.usr.dist
  projects/arm_eabi/etc/rc.d/jail
  projects/arm_eabi/gnu/lib/libgcc/Makefile
  projects/arm_eabi/include/time.h
  projects/arm_eabi/lib/libc/sys/chroot.2
  projects/arm_eabi/lib/libedit/editline.3
  projects/arm_eabi/lib/libedit/editrc.5
  projects/arm_eabi/lib/libutil/gr_util.c
  projects/arm_eabi/release/generate-release.sh
  projects/arm_eabi/release/ia64/mkisoimages.sh
  projects/arm_eabi/sbin/geom/class/raid/graid.8
  projects/arm_eabi/sbin/geom/class/raid3/geom_raid3.c
  projects/arm_eabi/sbin/geom/class/raid3/graid3.8
  projects/arm_eabi/sbin/setkey/Makefile
  projects/arm_eabi/sbin/sysctl/sysctl.c
  projects/arm_eabi/secure/lib/libssh/Makefile
  projects/arm_eabi/secure/usr.bin/ssh/Makefile
  projects/arm_eabi/secure/usr.sbin/sshd/Makefile
  projects/arm_eabi/share/man/man4/rl.4
  projects/arm_eabi/share/man/man4/stf.4
  projects/arm_eabi/share/man/man5/src.conf.5
  projects/arm_eabi/share/misc/committers-doc.dot
  projects/arm_eabi/share/misc/committers-ports.dot
  projects/arm_eabi/share/misc/committers-src.dot
  projects/arm_eabi/share/mk/bsd.man.mk
  projects/arm_eabi/share/mk/bsd.own.mk
  projects/arm_eabi/share/mk/bsd.prog.mk
  projects/arm_eabi/sys/amd64/conf/GENERIC
  projects/arm_eabi/sys/amd64/conf/NOTES
  projects/arm_eabi/sys/arm/arm/cpufunc.c
  projects/arm_eabi/sys/arm/arm/locore.S
  projects/arm_eabi/sys/arm/arm/swtch.S
  projects/arm_eabi/sys/arm/broadcom/bcm2835/bcm2835_fb.c
  projects/arm_eabi/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
  projects/arm_eabi/sys/arm/include/atomic.h
  projects/arm_eabi/sys/boot/i386/libi386/bootinfo64.c
  projects/arm_eabi/sys/boot/i386/libi386/devicename.c
  projects/arm_eabi/sys/boot/i386/libi386/pxe.c
  projects/arm_eabi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  projects/arm_eabi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/arm_eabi/sys/conf/files
  projects/arm_eabi/sys/conf/files.amd64
  projects/arm_eabi/sys/conf/files.i386
  projects/arm_eabi/sys/conf/files.mips
  projects/arm_eabi/sys/conf/options
  projects/arm_eabi/sys/dev/altera/avgen/altera_avgen.c
  projects/arm_eabi/sys/dev/altera/avgen/altera_avgen.h
  projects/arm_eabi/sys/dev/altera/jtag_uart/altera_jtag_uart.h
  projects/arm_eabi/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c
  projects/arm_eabi/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c
  projects/arm_eabi/sys/dev/altera/sdcard/altera_sdcard.c
  projects/arm_eabi/sys/dev/altera/sdcard/altera_sdcard.h
  projects/arm_eabi/sys/dev/altera/sdcard/altera_sdcard_nexus.c
  projects/arm_eabi/sys/dev/ata/ata-raid.c
  projects/arm_eabi/sys/dev/ath/if_ath.c
  projects/arm_eabi/sys/dev/ath/if_ath_misc.h
  projects/arm_eabi/sys/dev/ath/if_ath_rx.c
  projects/arm_eabi/sys/dev/ath/if_ath_sysctl.c
  projects/arm_eabi/sys/dev/ath/if_ath_tx.c
  projects/arm_eabi/sys/dev/ath/if_athvar.h
  projects/arm_eabi/sys/dev/ciss/ciss.c
  projects/arm_eabi/sys/dev/ciss/cissreg.h
  projects/arm_eabi/sys/dev/ciss/cissvar.h
  projects/arm_eabi/sys/dev/cxgbe/adapter.h
  projects/arm_eabi/sys/dev/cxgbe/offload.h
  projects/arm_eabi/sys/dev/cxgbe/t4_l2t.c
  projects/arm_eabi/sys/dev/cxgbe/t4_l2t.h
  projects/arm_eabi/sys/dev/cxgbe/t4_main.c
  projects/arm_eabi/sys/dev/cxgbe/tom/t4_connect.c
  projects/arm_eabi/sys/dev/cxgbe/tom/t4_listen.c
  projects/arm_eabi/sys/dev/cxgbe/tom/t4_tom.c
  projects/arm_eabi/sys/dev/cxgbe/tom/t4_tom.h
  projects/arm_eabi/sys/dev/cxgbe/tom/t4_tom_l2t.c
  projects/arm_eabi/sys/dev/e1000/if_igb.c
  projects/arm_eabi/sys/dev/fdt/fdt_mips.c
  projects/arm_eabi/sys/dev/hwpmc/hwpmc_mod.c
  projects/arm_eabi/sys/dev/hwpmc/hwpmc_soft.c
  projects/arm_eabi/sys/dev/isf/isf.c
  projects/arm_eabi/sys/dev/isf/isf.h
  projects/arm_eabi/sys/dev/isf/isf_nexus.c
  projects/arm_eabi/sys/dev/puc/puc.c
  projects/arm_eabi/sys/dev/terasic/de4led/terasic_de4led.c
  projects/arm_eabi/sys/dev/terasic/de4led/terasic_de4led.h
  projects/arm_eabi/sys/dev/terasic/de4led/terasic_de4led_nexus.c
  projects/arm_eabi/sys/dev/terasic/mtl/terasic_mtl.c
  projects/arm_eabi/sys/dev/terasic/mtl/terasic_mtl.h
  projects/arm_eabi/sys/dev/terasic/mtl/terasic_mtl_nexus.c
  projects/arm_eabi/sys/dev/usb/serial/u3g.c
  projects/arm_eabi/sys/dev/usb/storage/umass.c
  projects/arm_eabi/sys/dev/usb/usbdevs
  projects/arm_eabi/sys/fs/nfs/nfs_commonkrpc.c
  projects/arm_eabi/sys/fs/nfs/nfs_commonsubs.c
  projects/arm_eabi/sys/fs/nfsclient/nfs_clport.c
  projects/arm_eabi/sys/fs/nullfs/null_subr.c
  projects/arm_eabi/sys/fs/nullfs/null_vfsops.c
  projects/arm_eabi/sys/geom/mirror/g_mirror.c
  projects/arm_eabi/sys/geom/raid/g_raid.c
  projects/arm_eabi/sys/geom/raid/g_raid.h
  projects/arm_eabi/sys/geom/raid/md_intel.c
  projects/arm_eabi/sys/geom/raid/md_promise.c
  projects/arm_eabi/sys/geom/raid/tr_concat.c
  projects/arm_eabi/sys/geom/raid3/g_raid3.c
  projects/arm_eabi/sys/geom/raid3/g_raid3_ctl.c
  projects/arm_eabi/sys/i386/conf/GENERIC
  projects/arm_eabi/sys/i386/conf/NOTES
  projects/arm_eabi/sys/kern/subr_param.c
  projects/arm_eabi/sys/kern/vfs_hash.c
  projects/arm_eabi/sys/kern/vfs_subr.c
  projects/arm_eabi/sys/mips/beri/beri_machdep.c
  projects/arm_eabi/sys/mips/beri/files.beri
  projects/arm_eabi/sys/mips/include/bus.h
  projects/arm_eabi/sys/mips/include/fdt.h
  projects/arm_eabi/sys/mips/include/metadata.h
  projects/arm_eabi/sys/mips/include/vmparam.h
  projects/arm_eabi/sys/modules/cxgbe/tom/Makefile
  projects/arm_eabi/sys/net80211/ieee80211_power.c
  projects/arm_eabi/sys/nfsclient/nfs_krpc.c
  projects/arm_eabi/sys/nfsclient/nfs_subs.c
  projects/arm_eabi/sys/pci/if_rl.c
  projects/arm_eabi/sys/pci/if_rlreg.h
  projects/arm_eabi/sys/sys/bufobj.h
  projects/arm_eabi/sys/sys/vnode.h
  projects/arm_eabi/sys/vm/vm_map.c
  projects/arm_eabi/sys/vm/vm_map.h
  projects/arm_eabi/tools/build/options/WITH_NMTREE
  projects/arm_eabi/tools/tools/cxgbetool/cxgbetool.c
  projects/arm_eabi/tools/tools/notescheck/notescheck.py
  projects/arm_eabi/usr.bin/calendar/calendars/calendar.freebsd
  projects/arm_eabi/usr.bin/man/man.1
  projects/arm_eabi/usr.bin/man/man.sh
  projects/arm_eabi/usr.bin/procstat/procstat.c
  projects/arm_eabi/usr.bin/stdbuf/stdbuf.c
  projects/arm_eabi/usr.sbin/bsdconfig/bsdconfig
  projects/arm_eabi/usr.sbin/bsdconfig/console/ttys
  projects/arm_eabi/usr.sbin/bsdconfig/networking/share/device.subr
  projects/arm_eabi/usr.sbin/bsdconfig/networking/share/hostname.subr
  projects/arm_eabi/usr.sbin/bsdconfig/networking/share/routing.subr
  projects/arm_eabi/usr.sbin/bsdconfig/password/password
  projects/arm_eabi/usr.sbin/bsdconfig/password/share/password.subr
  projects/arm_eabi/usr.sbin/bsdconfig/security/kern_securelevel
  projects/arm_eabi/usr.sbin/bsdconfig/share/common.subr
  projects/arm_eabi/usr.sbin/bsdconfig/share/mustberoot.subr
  projects/arm_eabi/usr.sbin/bsdconfig/share/variable.subr
  projects/arm_eabi/usr.sbin/bsdconfig/startup/misc
  projects/arm_eabi/usr.sbin/bsdconfig/startup/rcdelete
  projects/arm_eabi/usr.sbin/bsdconfig/startup/rcvar
  projects/arm_eabi/usr.sbin/bsdconfig/startup/share/rcconf.subr
  projects/arm_eabi/usr.sbin/bsdconfig/startup/share/rcedit.subr
  projects/arm_eabi/usr.sbin/bsdconfig/usermgmt/groupinput
  projects/arm_eabi/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
  projects/arm_eabi/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
  projects/arm_eabi/usr.sbin/bsdconfig/usermgmt/userinput
  projects/arm_eabi/usr.sbin/bsdconfig/usermgmt/usermgmt
  projects/arm_eabi/usr.sbin/bsdinstall/partedit/sade.8
  projects/arm_eabi/usr.sbin/bsdinstall/scripts/services
  projects/arm_eabi/usr.sbin/cpucontrol/intel.c
  projects/arm_eabi/usr.sbin/cpucontrol/via.c
  projects/arm_eabi/usr.sbin/pkg/dns_utils.c
  projects/arm_eabi/usr.sbin/pw/pw_log.c
Directory Properties:
  projects/arm_eabi/   (props changed)
  projects/arm_eabi/cddl/contrib/opensolaris/   (props changed)
  projects/arm_eabi/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/arm_eabi/contrib/gcc/   (props changed)
  projects/arm_eabi/contrib/libcxxrt/   (props changed)
  projects/arm_eabi/gnu/lib/   (props changed)
  projects/arm_eabi/gnu/usr.bin/cc/cc_tools/   (props changed)
  projects/arm_eabi/lib/libc/   (props changed)
  projects/arm_eabi/lib/libutil/   (props changed)
  projects/arm_eabi/sbin/   (props changed)
  projects/arm_eabi/share/man/man4/   (props changed)
  projects/arm_eabi/sys/   (props changed)
  projects/arm_eabi/sys/boot/   (props changed)
  projects/arm_eabi/sys/cddl/contrib/opensolaris/   (props changed)
  projects/arm_eabi/sys/conf/   (props changed)
  projects/arm_eabi/usr.bin/calendar/   (props changed)
  projects/arm_eabi/usr.bin/procstat/   (props changed)

Modified: projects/arm_eabi/Makefile.inc1
==============================================================================
--- projects/arm_eabi/Makefile.inc1	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/Makefile.inc1	Thu Jan 17 06:08:49 2013	(r245541)
@@ -13,6 +13,8 @@
 #	-DNO_PORTSUPDATE do not update ports in ${MAKE} update
 #	-DNO_DOCUPDATE do not update doc in ${MAKE} update
 #	-DNO_WWWUPDATE do not update www in ${MAKE} update
+#	-DDB_FROM_SRC use the user/group databases in src/etc instead of
+#	    the system database when installing.
 #	-DNO_CTF do not run the DTrace CTF conversion tools on built objects
 #	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
 #	LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target
@@ -340,12 +342,13 @@ LIB32WMAKEFLAGS+=	\
 
 LIB32WMAKE=	${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
 		-DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML
-LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS
+LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \
+		${IMAKE_INSTALL}
 .endif
 
-# install stage
 IMAKEENV=	${CROSSENV:N_LDSCRIPTROOT=*}
-IMAKE=		${IMAKEENV} ${MAKE} -f Makefile.inc1
+IMAKE=		${IMAKEENV} ${MAKE} -f Makefile.inc1 \
+		${IMAKE_INSTALL} ${IMAKE_MTREE}
 .if empty(.MAKEFLAGS:M-n)
 IMAKEENV+=	PATH=${STRICTTMPPATH}:${INSTALLTMP} \
 		LD_LIBRARY_PATH=${INSTALLTMP} \
@@ -354,6 +357,10 @@ IMAKE+=		__MAKE_SHELL=${INSTALLTMP}/sh
 .else
 IMAKEENV+=	PATH=${TMPPATH}:${INSTALLTMP}
 .endif
+.if defined(DB_FROM_SRC)
+IMAKE_INSTALL=	INSTALL="install -N ${.CURDIR}/etc"
+IMAKE_MTREE=	MTREE_CMD="nmtree -N ${.CURDIR}/etc"
+.endif
 
 # kernel stage
 KMAKEENV=	${WMAKEENV}
@@ -595,9 +602,11 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_inc
 installcheck:
 
 #
-# Require DESTDIR to be set if installing for a different architecture.
+# Require DESTDIR to be set if installing for a different architecture or
+# using the user/group database in the source tree.
 #
-.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE}
+.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} || \
+    defined(DB_FROM_SRC)
 .if !make(distributeworld)
 installcheck: installcheck_DESTDIR
 installcheck_DESTDIR:
@@ -608,6 +617,7 @@ installcheck_DESTDIR:
 .endif
 .endif
 
+.if !defined(DB_FROM_SRC)
 #
 # Check for missing UIDs/GIDs.
 #
@@ -635,6 +645,7 @@ installcheck_UGID:
 		false; \
 	fi
 .endfor
+.endif
 
 #
 # Required install tools to be saved in a scratch dir for safety.
@@ -692,6 +703,7 @@ distributeworld installworld: installche
 	    done); \
 	cp $$libs $$progs ${INSTALLTMP}
 	cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
+	rm -f ${METALOG}
 .if make(distributeworld)
 .for dist in ${EXTRA_DISTRIBUTIONS}
 	-mkdir ${DESTDIR}/${DISTDIR}/${dist}
@@ -753,7 +765,8 @@ redistribute:
 .endif
 
 distrib-dirs distribution:
-	cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} ${.TARGET}
+	cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
+	    ${IMAKE_INSTALL} ${.TARGET}
 
 #
 # buildkernel and installkernel
@@ -1059,6 +1072,11 @@ _lex=		usr.bin/lex
 _yacc=		usr.bin/yacc
 .endif
 
+.if defined(DB_FROM_SRC) && ${BOOTSTRAPPING} < 1000026
+_nmtree=	lib/libnetbsd \
+		usr.sbin/nmtree
+.endif
+
 .if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
 _awk=		usr.bin/awk
 .endif
@@ -1120,7 +1138,8 @@ bootstrap-tools:
     ${_lex} \
     usr.bin/xinstall \
     ${_gensnmptree} \
-    usr.sbin/config
+    usr.sbin/config \
+    ${_nmtree}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \

Modified: projects/arm_eabi/ObsoleteFiles.inc
==============================================================================
--- projects/arm_eabi/ObsoleteFiles.inc	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/ObsoleteFiles.inc	Thu Jan 17 06:08:49 2013	(r245541)
@@ -38,6 +38,13 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20130116: removed long unused directories for .1aout section manpages
+OLD_FILES+=usr/share/man/en.ISO8859-1/man1aout
+OLD_FILES+=usr/share/man/en.UTF-8/man1aout
+OLD_DIRS+=usr/share/man/man1aout
+OLD_DIRS+=usr/share/man/cat1aout
+OLD_DIRS+=usr/share/man/en.ISO8859-1/cat1aout
+OLD_DIRS+=usr/share/man/en.UTF-8/cat1aout
 # 20121230: libdisk removed
 OLD_FILES+=usr/share/man/man3/libdisk.3.gz usr/include/libdisk.h
 OLD_FILES+=usr/lib/libdisk.a usr/lib32/libdisk.a
@@ -1201,12 +1208,6 @@ OLD_FILES+=usr/include/sys/linedisc.h
 OLD_FILES+=usr/share/man/man3/posix_openpt.3.gz
 # 20080725: sgtty.h removed
 OLD_FILES+=usr/include/sgtty.h
-# 20080719: sade(8) removed on all but amd64, i386 and sparc64
-.if ${TARGET_ARCH} != "amd64" && ${TARGET_ARCH} != "i386" && \
-    ${TARGET_ARCH} != "sparc64"
-OLD_FILES+=usr/sbin/sade
-OLD_FILES+=usr/share/man/man8/sade.8.gz
-.endif
 # 20080706: bsdlabel(8) removed on powerpc
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=sbin/bsdlabel

Modified: projects/arm_eabi/bin/cp/cp.c
==============================================================================
--- projects/arm_eabi/bin/cp/cp.c	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/bin/cp/cp.c	Thu Jan 17 06:08:49 2013	(r245541)
@@ -98,30 +98,28 @@ main(int argc, char *argv[])
 {
 	struct stat to_stat, tmp_stat;
 	enum op type;
-	int Hflag, Lflag, Pflag, ch, fts_options, r, have_trailing_slash;
+	int Hflag, Lflag, ch, fts_options, r, have_trailing_slash;
 	char *target;
 
 	fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
-	Hflag = Lflag = Pflag = 0;
+	Hflag = Lflag = 0;
 	while ((ch = getopt(argc, argv, "HLPRafilnprvx")) != -1)
 		switch (ch) {
 		case 'H':
 			Hflag = 1;
-			Lflag = Pflag = 0;
+			Lflag = 0;
 			break;
 		case 'L':
 			Lflag = 1;
-			Hflag = Pflag = 0;
+			Hflag = 0;
 			break;
 		case 'P':
-			Pflag = 1;
 			Hflag = Lflag = 0;
 			break;
 		case 'R':
 			Rflag = 1;
 			break;
 		case 'a':
-			Pflag = 1;
 			pflag = 1;
 			Rflag = 1;
 			Hflag = Lflag = 0;
@@ -146,7 +144,7 @@ main(int argc, char *argv[])
 			break;
 		case 'r':
 			rflag = Lflag = 1;
-			Hflag = Pflag = 0;
+			Hflag = 0;
 			break;
 		case 'v':
 			vflag = 1;

Modified: projects/arm_eabi/bin/pwait/pwait.c
==============================================================================
--- projects/arm_eabi/bin/pwait/pwait.c	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/bin/pwait/pwait.c	Thu Jan 17 06:08:49 2013	(r245541)
@@ -141,5 +141,5 @@ main(int argc, char *argv[])
 		nleft -= n;
 	}
 
-	return 0;
+	exit(EX_OK);
 }

Modified: projects/arm_eabi/bin/sh/eval.c
==============================================================================
--- projects/arm_eabi/bin/sh/eval.c	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/bin/sh/eval.c	Thu Jan 17 06:08:49 2013	(r245541)
@@ -624,8 +624,8 @@ evalbackcmd(union node *n, struct backcm
 		exitstatus = 0;
 		goto out;
 	}
+	exitstatus = oexitstatus;
 	if (is_valid_fast_cmdsubst(n)) {
-		exitstatus = oexitstatus;
 		savelocalvars = localvars;
 		localvars = NULL;
 		forcelocal++;
@@ -649,7 +649,6 @@ evalbackcmd(union node *n, struct backcm
 		poplocalvars();
 		localvars = savelocalvars;
 	} else {
-		exitstatus = 0;
 		if (pipe(pip) < 0)
 			error("Pipe call failed: %s", strerror(errno));
 		jp = makejob(n, 1);

Modified: projects/arm_eabi/bin/sh/exec.c
==============================================================================
--- projects/arm_eabi/bin/sh/exec.c	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/bin/sh/exec.c	Thu Jan 17 06:08:49 2013	(r245541)
@@ -86,12 +86,12 @@ struct tblentry {
 	union param param;	/* definition of builtin function */
 	int special;		/* flag for special builtin commands */
 	signed char cmdtype;	/* index identifying command */
-	char rehash;		/* if set, cd done since entry created */
 	char cmdname[];		/* name of command */
 };
 
 
 static struct tblentry *cmdtable[CMDTABLESIZE];
+static int cmdtable_cd = 0;	/* cmdtable contains cd-dependent entries */
 int exerrno = 0;			/* Last exec error */
 
 
@@ -305,8 +305,6 @@ printentry(struct tblentry *cmdp, int ve
 		error("internal error: cmdtype %d", cmdp->cmdtype);
 #endif
 	}
-	if (cmdp->rehash)
-		out1c('*');
 	out1c('\n');
 }
 
@@ -323,12 +321,12 @@ find_command(const char *name, struct cm
 {
 	struct tblentry *cmdp, loc_cmd;
 	int idx;
-	int prev;
 	char *fullname;
 	struct stat statb;
 	int e;
 	int i;
 	int spec;
+	int cd;
 
 	/* If name contains a slash, don't use the hash table */
 	if (strchr(name, '/') != NULL) {
@@ -337,8 +335,10 @@ find_command(const char *name, struct cm
 		return;
 	}
 
+	cd = 0;
+
 	/* If name is in the table, and not invalidated by cd, we're done */
-	if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->rehash == 0) {
+	if ((cmdp = cmdlookup(name, 0)) != NULL) {
 		if (cmdp->cmdtype == CMDFUNCTION && act & DO_NOFUNC)
 			cmdp = NULL;
 		else
@@ -359,13 +359,6 @@ find_command(const char *name, struct cm
 	}
 
 	/* We have to search path. */
-	prev = -1;		/* where to start */
-	if (cmdp) {		/* doing a rehash */
-		if (cmdp->cmdtype == CMDBUILTIN)
-			prev = -1;
-		else
-			prev = cmdp->param.index;
-	}
 
 	e = ENOENT;
 	idx = -1;
@@ -380,13 +373,8 @@ loop:
 				goto loop;	/* ignore unimplemented options */
 			}
 		}
-		/* if rehash, don't redo absolute path names */
-		if (fullname[0] == '/' && idx <= prev) {
-			if (idx < prev)
-				goto loop;
-			TRACE(("searchexec \"%s\": no change\n", name));
-			goto success;
-		}
+		if (fullname[0] != '/')
+			cd = 1;
 		if (stat(fullname, &statb) < 0) {
 			if (errno != ENOENT && errno != ENOTDIR)
 				e = errno;
@@ -426,9 +414,6 @@ loop:
 		goto success;
 	}
 
-	/* We failed.  If there was an entry for this command, delete it */
-	if (cmdp && cmdp->cmdtype != CMDFUNCTION)
-		delete_cmd_entry();
 	if (act & DO_ERR) {
 		if (e == ENOENT || e == ENOTDIR)
 			outfmt(out2, "%s: not found\n", name);
@@ -440,7 +425,8 @@ loop:
 	return;
 
 success:
-	cmdp->rehash = 0;
+	if (cd)
+		cmdtable_cd = 1;
 	entry->cmdtype = cmdp->cmdtype;
 	entry->u = cmdp->param;
 	entry->special = cmdp->special;
@@ -469,22 +455,15 @@ find_builtin(const char *name, int *spec
 
 
 /*
- * Called when a cd is done.  Marks all commands so the next time they
- * are executed they will be rehashed.
+ * Called when a cd is done.  If any entry in cmdtable depends on the current
+ * directory, simply clear cmdtable completely.
  */
 
 void
 hashcd(void)
 {
-	struct tblentry **pp;
-	struct tblentry *cmdp;
-
-	for (pp = cmdtable ; pp < &cmdtable[CMDTABLESIZE] ; pp++) {
-		for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) {
-			if (cmdp->cmdtype == CMDNORMAL)
-				cmdp->rehash = 1;
-		}
-	}
+	if (cmdtable_cd)
+		clearcmdentry();
 }
 
 
@@ -526,6 +505,7 @@ clearcmdentry(void)
 			}
 		}
 	}
+	cmdtable_cd = 0;
 	INTON;
 }
 
@@ -566,7 +546,6 @@ cmdlookup(const char *name, int add)
 					+ strlen(name) + 1);
 		cmdp->next = NULL;
 		cmdp->cmdtype = CMDUNKNOWN;
-		cmdp->rehash = 0;
 		strcpy(cmdp->cmdname, name);
 		INTON;
 	}

Modified: projects/arm_eabi/bin/sh/parser.c
==============================================================================
--- projects/arm_eabi/bin/sh/parser.c	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/bin/sh/parser.c	Thu Jan 17 06:08:49 2013	(r245541)
@@ -240,9 +240,9 @@ list(int nlflag, int erflag)
 		n2 = andor();
 		tok = readtoken();
 		if (tok == TBACKGND) {
-			if (n2->type == NPIPE) {
+			if (n2 != NULL && n2->type == NPIPE) {
 				n2->npipe.backgnd = 1;
-			} else if (n2->type == NREDIR) {
+			} else if (n2 != NULL && n2->type == NREDIR) {
 				n2->type = NBACKGND;
 			} else {
 				n3 = (union node *)stalloc(sizeof (struct nredir));
@@ -286,7 +286,8 @@ list(int nlflag, int erflag)
 				tokpushback++;
 			}
 			checkkwd = CHKNL | CHKKWD | CHKALIAS;
-			if (!nlflag && !erflag && tokendlist[peektoken()])
+			if (!nlflag && (erflag ? peektoken() == TEOF :
+			    tokendlist[peektoken()]))
 				return ntop;
 			break;
 		case TEOF:

Modified: projects/arm_eabi/bin/sh/sh.1
==============================================================================
--- projects/arm_eabi/bin/sh/sh.1	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/bin/sh/sh.1	Thu Jan 17 06:08:49 2013	(r245541)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd July 15, 2012
+.Dd January 14, 2013
 .Dt SH 1
 .Os
 .Sh NAME
@@ -2219,10 +2219,6 @@ The shell maintains a hash table which r
 With no arguments whatsoever, the
 .Ic hash
 command prints out the contents of this table.
-Entries which have not been looked at since the last
-.Ic cd
-command are marked with an asterisk;
-it is possible for these entries to be invalid.
 .Pp
 With arguments, the
 .Ic hash

Modified: projects/arm_eabi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c
==============================================================================
--- projects/arm_eabi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c	Thu Jan 17 06:08:49 2013	(r245541)
@@ -150,6 +150,16 @@ find_vdev_problem(nvlist_t *vdev, int (*
 			return (B_TRUE);
 	}
 
+	/*
+	 * Check any L2 cache devs
+	 */
+	if (nvlist_lookup_nvlist_array(vdev, ZPOOL_CONFIG_L2CACHE, &child,
+	    &children) == 0) {
+		for (c = 0; c < children; c++)
+			if (find_vdev_problem(child[c], func))
+				return (B_TRUE);
+	}
+
 	return (B_FALSE);
 }
 

Modified: projects/arm_eabi/contrib/gcc/config/arm/freebsd.h
==============================================================================
--- projects/arm_eabi/contrib/gcc/config/arm/freebsd.h	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/contrib/gcc/config/arm/freebsd.h	Thu Jan 17 06:08:49 2013	(r245541)
@@ -84,7 +84,6 @@
   while (false)
 #else
 /* Default it to use ATPCS with soft-VFP.  */
-#undef TARGET_DEFAULT
 #define TARGET_DEFAULT			\
   (MASK_APCS_FRAME			\
    | TARGET_ENDIAN_DEFAULT)

Modified: projects/arm_eabi/contrib/libcxxrt/atomic.h
==============================================================================
--- projects/arm_eabi/contrib/libcxxrt/atomic.h	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/contrib/libcxxrt/atomic.h	Thu Jan 17 06:08:49 2013	(r245541)
@@ -11,7 +11,7 @@
  */
 #if __has_feature(cxx_atomic)
 #define ATOMIC_SWAP(addr, val)\
-	__atomic_exchange(addr, val, __ATOMIC_ACQ_REL)
+	__c11_atomic_exchange((_Atomic(__typeof__(val))*)addr, val, __ATOMIC_ACQ_REL)
 #elif __has_builtin(__sync_swap)
 #define ATOMIC_SWAP(addr, val)\
 	__sync_swap(addr, val)
@@ -22,7 +22,7 @@
 
 #if __has_feature(cxx_atomic)
 #define ATOMIC_LOAD(addr)\
-	__atomic_load(addr, __ATOMIC_ACQUIRE)
+	__c11_atomic_load((_Atomic(__typeof__(*addr))*)addr, __ATOMIC_ACQUIRE)
 #else
 #define ATOMIC_LOAD(addr)\
 	(__sync_synchronize(), *addr)

Modified: projects/arm_eabi/etc/Makefile
==============================================================================
--- projects/arm_eabi/etc/Makefile	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/etc/Makefile	Thu Jan 17 06:08:49 2013	(r245541)
@@ -291,25 +291,27 @@ distribution:
 		${DESTDIR}/etc/nsswitch.conf
 .endif
 
+MTREE_CMD?=	mtree
+
 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 \
+	${MTREE_CMD} -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/
+	${MTREE_CMD} -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var
+	${MTREE_CMD} -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr
+	${MTREE_CMD} -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.include.dist \
 		-p ${DESTDIR}/usr/include
 .if ${MK_BIND_LIBS} != "no"
-	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.include.dist \
+	${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.include.dist \
 	    -p ${DESTDIR}/usr/include
 .endif
 .if ${MK_BIND_MTREE} != "no"
-	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.chroot.dist \
+	${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.chroot.dist \
 	    -p ${DESTDIR}/var/named
 .endif
 .if ${MK_GROFF} != "no"
-	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.groff.dist -p ${DESTDIR}/usr
+	${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.groff.dist -p ${DESTDIR}/usr
 .endif
 .if ${MK_SENDMAIL} != "no"
-	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/
+	${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/
 .endif
 	cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
 	cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ln -sf ../man* .

Modified: projects/arm_eabi/etc/mtree/BSD.usr.dist
==============================================================================
--- projects/arm_eabi/etc/mtree/BSD.usr.dist	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/etc/mtree/BSD.usr.dist	Thu Jan 17 06:08:49 2013	(r245541)
@@ -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

Modified: projects/arm_eabi/etc/rc.d/jail
==============================================================================
--- projects/arm_eabi/etc/rc.d/jail	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/etc/rc.d/jail	Thu Jan 17 06:08:49 2013	(r245541)
@@ -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()

Modified: projects/arm_eabi/gnu/lib/libgcc/Makefile
==============================================================================
--- projects/arm_eabi/gnu/lib/libgcc/Makefile	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/gnu/lib/libgcc/Makefile	Thu Jan 17 06:08:49 2013	(r245541)
@@ -59,7 +59,7 @@ LIB2FUNCS+= _fixuns${mode}si
 .endfor
 
 # Likewise double-word routines.
-.if ${TARGET_CPUARCH} != "arm" && ${MK_ARM_EABI} != "no"
+.if ${TARGET_CPUARCH} != "arm" || ${MK_ARM_EABI} == "no"
 # These are implemented in an ARM specific file but will not be filtered out
 .for mode in sf df xf tf
 LIB2FUNCS+= _fix${mode}di _fixuns${mode}di

Modified: projects/arm_eabi/include/time.h
==============================================================================
--- projects/arm_eabi/include/time.h	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/include/time.h	Thu Jan 17 06:08:49 2013	(r245541)
@@ -112,6 +112,7 @@ typedef	__pid_t		pid_t;
 #define CLOCK_MONOTONIC_FAST	12	/* FreeBSD-specific. */
 #define CLOCK_SECOND	13		/* FreeBSD-specific. */
 #define CLOCK_THREAD_CPUTIME_ID	14
+#define	CLOCK_PROCESS_CPUTIME_ID	15
 #endif /* !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 200112 */
 
 #if !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 200112

Modified: projects/arm_eabi/lib/libc/sys/chroot.2
==============================================================================
--- projects/arm_eabi/lib/libc/sys/chroot.2	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/lib/libc/sys/chroot.2	Thu Jan 17 06:08:49 2013	(r245541)
@@ -92,12 +92,8 @@ system call.
 Any other value for
 .Ql kern.chroot_allow_open_directories
 will bypass the check for open directories
-.Pp
-Upon successful completion, a value of 0 is returned.
-Otherwise,
-a value of -1 is returned and
-.Va errno
-is set to indicate an error.
+.Sh RETURN VALUES
+.Rv -std
 .Sh ERRORS
 The
 .Fn chroot

Modified: projects/arm_eabi/lib/libedit/editline.3
==============================================================================
--- projects/arm_eabi/lib/libedit/editline.3	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/lib/libedit/editline.3	Thu Jan 17 06:08:49 2013	(r245541)
@@ -526,8 +526,6 @@ If
 is
 .Dv NULL ,
 try
-.Pa $PWD/.editrc
-then
 .Pa $HOME/.editrc .
 Refer to
 .Xr editrc 5

Modified: projects/arm_eabi/lib/libedit/editrc.5
==============================================================================
--- projects/arm_eabi/lib/libedit/editrc.5	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/lib/libedit/editrc.5	Thu Jan 17 06:08:49 2013	(r245541)
@@ -473,6 +473,13 @@ Move down one line.
 Editline extended command.
 .El
 .\" End of section automatically generated with makelist
+.Sh FILES
+.Bl -tag -width "~/.editrcXXX"
+.It Pa ~/.editrc
+User configuration file for the
+.Xr editline 3
+library.
+.El
 .Sh SEE ALSO
 .Xr editline 3 ,
 .Xr regex 3 ,

Modified: projects/arm_eabi/lib/libutil/gr_util.c
==============================================================================
--- projects/arm_eabi/lib/libutil/gr_util.c	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/lib/libutil/gr_util.c	Thu Jan 17 06:08:49 2013	(r245541)
@@ -50,8 +50,6 @@ static char group_file[PATH_MAX];
 static char tempname[PATH_MAX];
 static int initialized;
 
-static const char group_line_format[] = "%s:%s:%ju:";
-
 /*
  * Initialize statics
  */
@@ -318,7 +316,7 @@ gr_mkdb(void)
 }
 
 /*
- * Clean up. Preserver errno for the caller's convenience.
+ * Clean up. Preserves errno for the caller's convenience.
  */
 void
 gr_fini(void)
@@ -346,7 +344,6 @@ gr_equal(const struct group *gr1, const 
 {
 	int gr1_ndx;
 	int gr2_ndx;
-	bool found;
 
 	/* Check that the non-member information is the same. */
 	if (gr1->gr_name == NULL || gr2->gr_name == NULL) {
@@ -367,17 +364,15 @@ gr_equal(const struct group *gr1, const 
 		if (gr1->gr_mem != gr2->gr_mem)
 			return (false);
 	} else {
-		for (found = false, gr1_ndx = 0; gr1->gr_mem[gr1_ndx] != NULL;
-		    gr1_ndx++) {
-			for (gr2_ndx = 0; gr2->gr_mem[gr2_ndx] != NULL;
-			    gr2_ndx++)
+		for (gr1_ndx = 0; gr1->gr_mem[gr1_ndx] != NULL; gr1_ndx++) {
+			for (gr2_ndx = 0;; gr2_ndx++) {
+				if (gr2->gr_mem[gr2_ndx] == NULL)
+					return (false);
 				if (strcmp(gr1->gr_mem[gr1_ndx],
 				    gr2->gr_mem[gr2_ndx]) == 0) {
-					found = true;
 					break;
 				}
-			if (!found)
-				return (false);
+			}
 		}
 
 		/* Check that group2 does not have more members than group1. */
@@ -394,7 +389,10 @@ gr_equal(const struct group *gr1, const 
 char *
 gr_make(const struct group *gr)
 {
+	const char *group_line_format = "%s:%s:%ju:";
+	const char *sep;
 	char *line;
+	char *p;
 	size_t line_size;
 	int ndx;
 
@@ -409,16 +407,18 @@ gr_make(const struct group *gr)
 	}
 
 	/* Create the group line and fill it. */
-	if ((line = malloc(line_size)) == NULL)
+	if ((line = p = malloc(line_size)) == NULL)
 		return (NULL);
-	snprintf(line, line_size, group_line_format, gr->gr_name, gr->gr_passwd,
+	p += sprintf(p, group_line_format, gr->gr_name, gr->gr_passwd,
 	    (uintmax_t)gr->gr_gid);
-	if (gr->gr_mem != NULL)
+	if (gr->gr_mem != NULL) {
+		sep = "";
 		for (ndx = 0; gr->gr_mem[ndx] != NULL; ndx++) {
-			strcat(line, gr->gr_mem[ndx]);
-			if (gr->gr_mem[ndx + 1] != NULL)
-				strcat(line, ",");
+			p = stpcpy(p, sep);
+			p = stpcpy(p, gr->gr_mem[ndx]);
+			sep = ",";
 		}
+	}
 
 	return (line);
 }

Modified: projects/arm_eabi/release/generate-release.sh
==============================================================================
--- projects/arm_eabi/release/generate-release.sh	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/release/generate-release.sh	Thu Jan 17 06:08:49 2013	(r245541)
@@ -160,7 +160,7 @@ build_docports() 
 {
 	# Could not install textproc/docproj from pkg(8) or pkg_add(1).  Build
 	# the port as final fallback.
-	chroot ${CHROOTDIR} /bin/sh -c 'make -C /usr/ports/textproc/docproj BATCH=yes WITH_JADETEX=no WITHOUT_X11=yes WITHOUT_PYTHON=yes install clean' || \
+	chroot ${CHROOTDIR} /bin/sh -c 'make -C /usr/ports/textproc/docproj BATCH=yes WITHOUT_SVN=yes WITH_JADETEX=no WITHOUT_X11=yes WITHOUT_PYTHON=yes install clean' || \
 		{ echo "*** Could not build the textproj/docproj port.  Exiting."; exit 2; }
 }
 

Modified: projects/arm_eabi/release/ia64/mkisoimages.sh
==============================================================================
--- projects/arm_eabi/release/ia64/mkisoimages.sh	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/release/ia64/mkisoimages.sh	Thu Jan 17 06:08:49 2013	(r245541)
@@ -63,6 +63,7 @@ if [ $bootable = yes ]; then
     if [ -s $BASE/boot/mfsroot.gz ]; then
 	cp $BASE/boot/mfsroot.gz $MNT/boot
     fi
+    cp $BASE/boot/color.4th $MNT/boot
     cp $BASE/boot/support.4th $MNT/boot
     cp $BASE/boot/check-password.4th $MNT/boot
     cp $BASE/boot/screen.4th $MNT/boot

Modified: projects/arm_eabi/sbin/geom/class/raid/graid.8
==============================================================================
--- projects/arm_eabi/sbin/geom/class/raid/graid.8	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/sbin/geom/class/raid/graid.8	Thu Jan 17 06:08:49 2013	(r245541)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 13, 2012
+.Dd January 16, 2013
 .Dt GRAID 8
 .Os
 .Sh NAME
@@ -274,7 +274,6 @@ complete it there.
 Do not run GEOM RAID class on migrating volumes under pain of possible data
 corruption!
 .Sh 2TiB BARRIERS
-Promise metadata format does not support disks above 2TiB.
 NVIDIA metadata format does not support volumes above 2TiB.
 .Sh SYSCTL VARIABLES
 The following

Modified: projects/arm_eabi/sbin/geom/class/raid3/geom_raid3.c
==============================================================================
--- projects/arm_eabi/sbin/geom/class/raid3/geom_raid3.c	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/sbin/geom/class/raid3/geom_raid3.c	Thu Jan 17 06:08:49 2013	(r245541)
@@ -76,7 +76,7 @@ struct g_command class_commands[] = {
 	{ "insert", G_FLAG_VERBOSE, NULL,
 	    {
 		{ 'h', "hardcode", NULL, G_TYPE_BOOL },
-		{ 'n', "number", NULL, G_TYPE_NUMBER },
+		{ 'n', "number", G_VAL_OPTIONAL, G_TYPE_NUMBER },
 		G_OPT_SENTINEL
 	    },
 	    "[-hv] <-n number> name prov"

Modified: projects/arm_eabi/sbin/geom/class/raid3/graid3.8
==============================================================================
--- projects/arm_eabi/sbin/geom/class/raid3/graid3.8	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/sbin/geom/class/raid3/graid3.8	Thu Jan 17 06:08:49 2013	(r245541)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 5, 2010
+.Dd January 15, 2012
 .Dt GRAID3 8
 .Os
 .Sh NAME
@@ -53,7 +53,7 @@
 .Nm
 .Cm insert
 .Op Fl hv
-.Fl n Ar number
+.Op Fl n Ar number
 .Ar name
 .Ar prov
 .Nm
@@ -171,6 +171,8 @@ Add the given component to the existing 
 removed previously with the
 .Cm remove
 command or if one component is missing and will not be connected again.
+If no number is given, new component will be added instead of first missed
+component.
 .Pp
 Additional options include:
 .Bl -tag -width ".Fl h"

Modified: projects/arm_eabi/sbin/setkey/Makefile
==============================================================================
--- projects/arm_eabi/sbin/setkey/Makefile	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/sbin/setkey/Makefile	Thu Jan 17 06:08:49 2013	(r245541)
@@ -61,7 +61,7 @@ CLEANFILES+=	scriptdump y.tab.h
 
 #SCRIPTS= scriptdump
 
-LOCALPREFIX=	/usr
+LOCALPREFIX=	/usr/local
 
 scriptdump: scriptdump.pl
 	sed -e 's#@LOCALPREFIX@#${LOCALPREFIX}#' < $> > scriptdump

Modified: projects/arm_eabi/sbin/sysctl/sysctl.c
==============================================================================
--- projects/arm_eabi/sbin/sysctl/sysctl.c	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/sbin/sysctl/sysctl.c	Thu Jan 17 06:08:49 2013	(r245541)
@@ -266,7 +266,7 @@ parse(const char *string, int lineno)
 
 		if (!(kind & CTLFLAG_WR)) {
 			if (kind & CTLFLAG_TUN) {
-				warnx("oid '%s' is a read only tunable%p", bufp, line);
+				warnx("oid '%s' is a read only tunable%s", bufp, line);
 				warnx("Tunable values are set in /boot/loader.conf");
 			} else
 				warnx("oid '%s' is read only%s", bufp, line);

Modified: projects/arm_eabi/secure/lib/libssh/Makefile
==============================================================================
--- projects/arm_eabi/secure/lib/libssh/Makefile	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/secure/lib/libssh/Makefile	Thu Jan 17 06:08:49 2013	(r245541)
@@ -38,6 +38,10 @@ DPADD+=	${LIBGSSAPI} ${LIBKRB5} ${LIBHX5
 LDADD+=	-lgssapi -lkrb5 -lhx509 -lasn1 -lcom_err -lmd -lroken
 .endif
 
+.if ${MK_OPENSSH_NONE_CIPHER} != "no"
+CFLAGS+= -DNONE_CIPHER_ENABLED
+.endif
+
 NO_LINT=
 
 DPADD+=	${LIBCRYPTO} ${LIBCRYPT}

Modified: projects/arm_eabi/secure/usr.bin/ssh/Makefile
==============================================================================
--- projects/arm_eabi/secure/usr.bin/ssh/Makefile	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/secure/usr.bin/ssh/Makefile	Thu Jan 17 06:08:49 2013	(r245541)
@@ -25,6 +25,10 @@ DPADD+=	 ${LIBGSSAPI}
 LDADD+=	 -lgssapi
 .endif
 
+.if ${MK_OPENSSH_NONE_CIPHER} != "no"
+CFLAGS+= -DNONE_CIPHER_ENABLED
+.endif
+
 DPADD+=	${LIBCRYPT} ${LIBCRYPTO}
 LDADD+=	-lcrypt -lcrypto
 

Modified: projects/arm_eabi/secure/usr.sbin/sshd/Makefile
==============================================================================
--- projects/arm_eabi/secure/usr.sbin/sshd/Makefile	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/secure/usr.sbin/sshd/Makefile	Thu Jan 17 06:08:49 2013	(r245541)
@@ -40,6 +40,10 @@ DPADD+=	 ${LIBGSSAPI_KRB5} ${LIBGSSAPI} 
 LDADD+=	 -lgssapi_krb5 -lgssapi -lkrb5 -lasn1
 .endif
 
+.if ${MK_OPENSSH_NONE_CIPHER} != "no"
+CFLAGS+= -DNONE_CIPHER_ENABLED
+.endif
+
 DPADD+=	${LIBCRYPTO} ${LIBCRYPT}
 LDADD+=	-lcrypto -lcrypt
 

Modified: projects/arm_eabi/share/man/man4/rl.4
==============================================================================
--- projects/arm_eabi/share/man/man4/rl.4	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/share/man/man4/rl.4	Thu Jan 17 06:08:49 2013	(r245541)
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 22, 2010
+.Dd January 16, 2013
 .Dt RL 4
 .Os
 .Sh NAME
@@ -155,6 +155,8 @@ Corega FEther CB-TXD
 .It
 Corega FEtherII CB-TXD
 .It
+D-Link DFE-520TX (rev. C1)
+.It
 D-Link DFE-528TX
 .It
 D-Link DFE-530TX+

Modified: projects/arm_eabi/share/man/man4/stf.4
==============================================================================
--- projects/arm_eabi/share/man/man4/stf.4	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/share/man/man4/stf.4	Thu Jan 17 06:08:49 2013	(r245541)
@@ -190,8 +190,8 @@ The default value is shown next to each 
 .It Va net.link.stf.permit_rfc1918 : No 0
 The RFC3056 requires the use of globally unique 32-bit IPv4
 addresses. This sysctl variable controls the behaviour of this
-requirement. When it set to not 0, 
-.Nm stf 
+requirement. When it set to not 0,
+.Nm stf
 allows the use of private IPv4 addresses described in the RFC1918.
 This may be useful for an Intranet environment or when some mechanisms
 of network address translation (NAT) are used.

Modified: projects/arm_eabi/share/man/man5/src.conf.5
==============================================================================
--- projects/arm_eabi/share/man/man5/src.conf.5	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/share/man/man5/src.conf.5	Thu Jan 17 06:08:49 2013	(r245541)
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 236279 2012-05-30 02:37:20Z gjb
 .\" $FreeBSD$
-.Dd January 9, 2013
+.Dd January 14, 2013
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -805,7 +805,7 @@ Set to not build NLS catalogs.
 Set to not build NLS catalog support for
 .Xr csh 1 .
 .It Va WITH_NMTREE
-\" $FreeBSD$
+.\" from FreeBSD: head/tools/build/options/WITH_NMTREE 245241 2013-01-09 21:07:08Z brooks
 Set to install
 .Xr nmtree 8
 as

Modified: projects/arm_eabi/share/misc/committers-doc.dot
==============================================================================
--- projects/arm_eabi/share/misc/committers-doc.dot	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/share/misc/committers-doc.dot	Thu Jan 17 06:08:49 2013	(r245541)
@@ -116,6 +116,7 @@ gabor -> issyl0
 gabor -> ebrandi
 
 gjb -> wblock
+gjb -> rene
 
 hrs -> ryusuke
 

Modified: projects/arm_eabi/share/misc/committers-ports.dot
==============================================================================
--- projects/arm_eabi/share/misc/committers-ports.dot	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/share/misc/committers-ports.dot	Thu Jan 17 06:08:49 2013	(r245541)
@@ -77,6 +77,7 @@ culot [label="Frederic Culot\nculot at Free
 daichi [label="Daichi Goto\ndaichi at FreeBSD.org\n2002/10/17"]
 danfe [label="Alexey Dokuchaev\ndanfe at FreeBSD.org\n2004/08/20"]
 db [label="Diane Bruce\ndb at FreeBSD.org\n2007/01/18"]
+dbn [label="David Naylor\ndbn at FreeBSD.org\n2013/01/14"]
 decke [label="Bernhard Froehlich\ndecke at FreeBSD.org\n2010/03/21"]
 delphij [label="Xin Li\ndelphij at FreeBSD.org\n2006/05/01"]
 demon [label="Dmitry Sivachenko\ndemon at FreeBSD.org\n2000/11/13"]
@@ -233,6 +234,8 @@ asami -> obrien
 avilla -> jhale
 avilla -> rakuco
 
+bdrewery -> dbn
+
 bapt -> bdrewery
 bapt -> eadler
 bapt -> jlaffaye
@@ -274,6 +277,7 @@ delphij -> rafan
 demon -> mat
 
 eadler -> ak
+eadler -> dbn
 eadler -> bdrewery
 eadler -> gjb
 eadler -> tj

Modified: projects/arm_eabi/share/misc/committers-src.dot
==============================================================================
--- projects/arm_eabi/share/misc/committers-src.dot	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/share/misc/committers-src.dot	Thu Jan 17 06:08:49 2013	(r245541)
@@ -117,6 +117,7 @@ bruno [label="Bruno Ducrot\nbruno at FreeBS
 bryanv [label="Bryan Venteicher\nbryanv at FreeBSD.org\n2012/11/03"]
 bschmidt [label="Bernhard Schmidt\nbschmidt at FreeBSD.org\n2010/02/06"]
 bz [label="Bjoern A. Zeeb\nbz at FreeBSD.org\n2004/07/27"]
+carl [label="Carl Delsey\ncarl at FreeBSD.org\n2013/01/14"]
 cognet [label="Olivier Houchard\ncognet at FreeBSD.org\n2002/10/09"]
 cokane [label="Coleman Kane\ncokane at FreeBSD.org\n2000/06/19"]
 cperciva [label="Colin Percival\ncperciva at FreeBSD.org\n2004/01/20"]
@@ -454,6 +455,8 @@ jhb -> peterj
 jhb -> pfg
 jhb -> rnoland
 
+jimharris -> carl
+
 jkh -> grog
 jkh -> imp
 jkh -> jlemon

Modified: projects/arm_eabi/share/mk/bsd.man.mk
==============================================================================
--- projects/arm_eabi/share/mk/bsd.man.mk	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/share/mk/bsd.man.mk	Thu Jan 17 06:08:49 2013	(r245541)
@@ -62,7 +62,7 @@ MROFF_CMD?=	groff -Tascii -mtty-char -ma
 MCOMPRESS_CMD?=	${COMPRESS_CMD}
 MCOMPRESS_EXT?=	${COMPRESS_EXT}
 
-SECTIONS=	1 1aout 2 3 4 5 6 7 8 9
+SECTIONS=	1 2 3 4 5 6 7 8 9
 .SUFFIXES:	${SECTIONS:S/^/./g}
 
 # Backwards compatibility.

Modified: projects/arm_eabi/share/mk/bsd.own.mk
==============================================================================
--- projects/arm_eabi/share/mk/bsd.own.mk	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/share/mk/bsd.own.mk	Thu Jan 17 06:08:49 2013	(r245541)
@@ -344,6 +344,7 @@ __DEFAULT_YES_OPTIONS = \
     ZONEINFO
 
 __DEFAULT_NO_OPTIONS = \
+    ARM_EABI \
     BIND_IDN \
     BIND_LARGE_FILE \
     BIND_LIBS \
@@ -361,6 +362,7 @@ __DEFAULT_NO_OPTIONS = \
     NMTREE \
     NAND \
     OFED \
+    OPENSSH_NONE_CIPHER \
     SHARED_TOOLCHAIN
 
 #

Modified: projects/arm_eabi/share/mk/bsd.prog.mk
==============================================================================
--- projects/arm_eabi/share/mk/bsd.prog.mk	Thu Jan 17 06:02:31 2013	(r245540)
+++ projects/arm_eabi/share/mk/bsd.prog.mk	Thu Jan 17 06:08:49 2013	(r245541)
@@ -95,8 +95,7 @@ ${PROG}: ${OBJS}
 .if	${MK_MAN} != "no" && !defined(MAN) && \
 	!defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \
 	!defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \
-	!defined(MAN7) && !defined(MAN8) && !defined(MAN9) && \
-	!defined(MAN1aout)
+	!defined(MAN7) && !defined(MAN8) && !defined(MAN9)

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

More information about the svn-src-projects mailing list