svn commit: r250774 - in user/attilio/vmcontention: . bin/df bin/kenv cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip contrib/bmake contrib/libpcap contrib/nvi/common contrib/nvi/include cry...

Sat May 18 13:38:02 UTC 2013

Author: attilio
Date: Sat May 18 13:37:53 2013
New Revision: 250774
URL: http://svnweb.freebsd.org/changeset/base/250774

Log:
  MFC

Added:
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/share/xml/catalog.xml
     - copied unchanged from r250772, head/release/doc/ja_JP.eucJP/share/xml/catalog.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml
     - copied unchanged from r250772, head/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml
  user/attilio/vmcontention/release/doc/share/xml/catalog.xml
     - copied unchanged from r250772, head/release/doc/share/xml/catalog.xml
  user/attilio/vmcontention/share/man/man4/qlxgbe.4
     - copied unchanged from r250772, head/share/man/man4/qlxgbe.4
  user/attilio/vmcontention/sys/dev/qlxgbe/
     - copied from r250772, head/sys/dev/qlxgbe/
  user/attilio/vmcontention/sys/modules/qlxgbe/
     - copied from r250772, head/sys/modules/qlxgbe/
  user/attilio/vmcontention/tools/build/options/WITHOUT_CROSS_COMPILER
     - copied unchanged from r250772, head/tools/build/options/WITHOUT_CROSS_COMPILER
  user/attilio/vmcontention/tools/build/options/WITHOUT_FORMAT_EXTENSIONS
     - copied unchanged from r250772, head/tools/build/options/WITHOUT_FORMAT_EXTENSIONS
  user/attilio/vmcontention/tools/tools/makeroot/
     - copied from r250772, head/tools/tools/makeroot/
Modified:
  user/attilio/vmcontention/MAINTAINERS   (contents, props changed)
  user/attilio/vmcontention/Makefile
  user/attilio/vmcontention/Makefile.inc1
  user/attilio/vmcontention/bin/df/df.1
  user/attilio/vmcontention/bin/kenv/kenv.c
  user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl
  user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl
  user/attilio/vmcontention/contrib/bmake/main.c
  user/attilio/vmcontention/contrib/bmake/var.c
  user/attilio/vmcontention/contrib/libpcap/pcap-filter.manmisc
  user/attilio/vmcontention/contrib/libpcap/pcap-filter.manmisc.in
  user/attilio/vmcontention/contrib/libpcap/scanner.l
  user/attilio/vmcontention/contrib/nvi/common/exf.c
  user/attilio/vmcontention/contrib/nvi/common/options.c
  user/attilio/vmcontention/contrib/nvi/include/options_def.h
  user/attilio/vmcontention/crypto/openssh/ChangeLog
  user/attilio/vmcontention/crypto/openssh/README
  user/attilio/vmcontention/crypto/openssh/krl.c
  user/attilio/vmcontention/crypto/openssh/openbsd-compat/bsd-cygwin_util.c
  user/attilio/vmcontention/crypto/openssh/openbsd-compat/bsd-cygwin_util.h
  user/attilio/vmcontention/crypto/openssh/packet.c
  user/attilio/vmcontention/crypto/openssh/ssh_config
  user/attilio/vmcontention/crypto/openssh/ssh_config.5
  user/attilio/vmcontention/crypto/openssh/sshconnect.c
  user/attilio/vmcontention/crypto/openssh/sshd_config
  user/attilio/vmcontention/crypto/openssh/sshd_config.5
  user/attilio/vmcontention/crypto/openssh/version.h
  user/attilio/vmcontention/lib/libc/stdlib/atol.3
  user/attilio/vmcontention/lib/libthr/thread/thr_spec.c
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/early-adopter/article.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/errata/article.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/installation/alpha/article.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/installation/i386/article.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/installation/ia64/article.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/installation/pc98/article.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/installation/sparc64/article.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/readme/article.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/relnotes/common/new.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/relnotes/i386/article.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.xml
  user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml
  user/attilio/vmcontention/release/doc/en_US.ISO8859-1/Makefile
  user/attilio/vmcontention/release/doc/en_US.ISO8859-1/errata/article.xml
  user/attilio/vmcontention/release/doc/en_US.ISO8859-1/hardware/article.xml
  user/attilio/vmcontention/release/doc/en_US.ISO8859-1/readme/article.xml
  user/attilio/vmcontention/release/doc/en_US.ISO8859-1/relnotes/article.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/early-adopter/article.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/errata/article.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/hardware/common/dev.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/hardware/i386/article.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/installation/alpha/article.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/installation/common/install.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/installation/common/layout.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/installation/i386/article.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/installation/pc98/article.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/relnotes/common/new.xml
  user/attilio/vmcontention/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.xml
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/errata/article.xml   (contents, props changed)
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/hardware/alpha/article.xml
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/hardware/amd64/article.xml
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.xml   (contents, props changed)
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/hardware/common/artheader.xml
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/hardware/common/dev.xml
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/hardware/common/intro.xml   (contents, props changed)
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/hardware/i386/article.xml
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.xml   (contents, props changed)
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/hardware/ia64/article.xml
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.xml   (contents, props changed)
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/hardware/pc98/article.xml
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.xml   (contents, props changed)
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/hardware/sparc64/article.xml
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.xml
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/relnotes/alpha/article.xml
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/relnotes/amd64/article.xml
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/relnotes/common/new.xml
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/relnotes/i386/article.xml
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/relnotes/ia64/article.xml
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/relnotes/pc98/article.xml
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/relnotes/sparc64/article.xml
  user/attilio/vmcontention/release/doc/ja_JP.eucJP/share/xml/dev-auto-ja.xml   (contents, props changed)
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/errata/article.xml   (contents, props changed)
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/installation/common/install.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/installation/common/layout.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/installation/i386/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/readme/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml
  user/attilio/vmcontention/release/doc/ru_RU.KOI8-R/share/xml/dev-auto-ru.xml
  user/attilio/vmcontention/release/doc/share/mk/doc.relnotes.mk
  user/attilio/vmcontention/release/doc/share/xml/Makefile
  user/attilio/vmcontention/release/doc/share/xml/release.ent
  user/attilio/vmcontention/release/doc/zh_CN.GB2312/errata/article.xml
  user/attilio/vmcontention/release/doc/zh_CN.GB2312/hardware/article.xml
  user/attilio/vmcontention/release/doc/zh_CN.GB2312/readme/article.xml
  user/attilio/vmcontention/release/doc/zh_CN.GB2312/relnotes/article.xml
  user/attilio/vmcontention/sbin/camcontrol/camcontrol.c
  user/attilio/vmcontention/sbin/dumpfs/dumpfs.8
  user/attilio/vmcontention/sbin/dumpfs/dumpfs.c
  user/attilio/vmcontention/sbin/ipfw/ipfw2.c
  user/attilio/vmcontention/sbin/tunefs/tunefs.c
  user/attilio/vmcontention/share/man/man4/Makefile
  user/attilio/vmcontention/share/man/man5/src.conf.5
  user/attilio/vmcontention/share/mk/bsd.own.mk
  user/attilio/vmcontention/sys/arm/arm/cpufunc_asm_sheeva.S
  user/attilio/vmcontention/sys/arm/conf/BEAGLEBONE
  user/attilio/vmcontention/sys/arm/ti/ti_mmchs.c
  user/attilio/vmcontention/sys/boot/fdt/dts/beaglebone-black.dts
  user/attilio/vmcontention/sys/conf/NOTES
  user/attilio/vmcontention/sys/conf/files.amd64
  user/attilio/vmcontention/sys/conf/kern.mk
  user/attilio/vmcontention/sys/dev/ath/if_ath.c
  user/attilio/vmcontention/sys/dev/ath/if_ath_tx.c
  user/attilio/vmcontention/sys/dev/ath/if_ath_tx.h
  user/attilio/vmcontention/sys/dev/ath/if_ath_tx_ht.c
  user/attilio/vmcontention/sys/dev/ath/if_ath_tx_ht.h
  user/attilio/vmcontention/sys/dev/ath/if_athioctl.h
  user/attilio/vmcontention/sys/dev/ath/if_athvar.h
  user/attilio/vmcontention/sys/dev/cxgb/cxgb_main.c
  user/attilio/vmcontention/sys/dev/cxgbe/t4_main.c
  user/attilio/vmcontention/sys/dev/mmc/mmcsd.c
  user/attilio/vmcontention/sys/dev/pci/pcireg.h
  user/attilio/vmcontention/sys/dev/sound/usb/uaudio.c
  user/attilio/vmcontention/sys/dev/usb/serial/uslcom.c
  user/attilio/vmcontention/sys/dev/usb/usb_freebsd.h
  user/attilio/vmcontention/sys/fs/nfsserver/nfs_nfsdport.c
  user/attilio/vmcontention/sys/kern/subr_sbuf.c
  user/attilio/vmcontention/sys/kern/vfs_bio.c
  user/attilio/vmcontention/sys/modules/Makefile
  user/attilio/vmcontention/sys/net/if_ethersubr.c
  user/attilio/vmcontention/sys/net/route.c
  user/attilio/vmcontention/sys/netinet/sctp_output.c
  user/attilio/vmcontention/sys/netinet/sctputil.c
  user/attilio/vmcontention/sys/netinet6/ip6_output.c
  user/attilio/vmcontention/sys/powerpc/aim/mmu_oea.c
  user/attilio/vmcontention/sys/powerpc/aim/mmu_oea64.c
  user/attilio/vmcontention/sys/powerpc/booke/pmap.c
  user/attilio/vmcontention/sys/sparc64/sparc64/pmap.c
  user/attilio/vmcontention/sys/sys/mbuf.h
  user/attilio/vmcontention/sys/vm/vm_fault.c
  user/attilio/vmcontention/sys/vm/vm_page.c
  user/attilio/vmcontention/usr.bin/bmake/Makefile.inc
  user/attilio/vmcontention/usr.bin/make/Makefile
  user/attilio/vmcontention/usr.sbin/bsdconfig/share/strings.subr
  user/attilio/vmcontention/usr.sbin/jls/jls.8
  user/attilio/vmcontention/usr.sbin/jls/jls.c
  user/attilio/vmcontention/usr.sbin/pciconf/cap.c
Directory Properties:
  user/attilio/vmcontention/   (props changed)
  user/attilio/vmcontention/cddl/   (props changed)
  user/attilio/vmcontention/cddl/contrib/opensolaris/   (props changed)
  user/attilio/vmcontention/contrib/bmake/   (props changed)
  user/attilio/vmcontention/contrib/libpcap/   (props changed)
  user/attilio/vmcontention/crypto/openssh/   (props changed)
  user/attilio/vmcontention/lib/libc/   (props changed)
  user/attilio/vmcontention/sbin/   (props changed)
  user/attilio/vmcontention/sbin/ipfw/   (props changed)
  user/attilio/vmcontention/share/man/man4/   (props changed)
  user/attilio/vmcontention/sys/   (props changed)
  user/attilio/vmcontention/sys/boot/   (props changed)
  user/attilio/vmcontention/sys/conf/   (props changed)

Modified: user/attilio/vmcontention/MAINTAINERS
==============================================================================

--- user/attilio/vmcontention/MAINTAINERS	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/MAINTAINERS	Sat May 18 13:37:53 2013	(r250774)
@@ -63,7 +63,6 @@ procfs		des	Pre-commit review requested.
 linprocfs	des	Pre-commit review requested.
 lpr		gad	Pre-commit review requested, particularly for
 			lpd/recvjob.c and lpd/printjob.c.
-newsyslog(8)	gad	Heads-up appreciated.  I'm going thru the PR's for it.
 nvi		peter	Try not to break it.
 libz		peter	Try not to break it.
 groff		ru	Recommends pre-commit review.

Modified: user/attilio/vmcontention/Makefile
==============================================================================
--- user/attilio/vmcontention/Makefile	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/Makefile	Sat May 18 13:37:53 2013	(r250774)
@@ -281,7 +281,7 @@ kernel: buildkernel installkernel
 #
 upgrade_checks:
 .if !defined(.PARSEDIR)
-.if defined(WITH_BMAKE)
+.if !defined(WITHOUT_BMAKE)
 	(cd ${.CURDIR} && ${MAKE} bmake)
 .else
 	@if ! (cd ${.CURDIR}/tools/build/make_check && \

Modified: user/attilio/vmcontention/Makefile.inc1
==============================================================================
--- user/attilio/vmcontention/Makefile.inc1	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/Makefile.inc1	Sat May 18 13:37:53 2013	(r250774)
@@ -273,15 +273,67 @@ WMAKEENV=	${CROSSENV} \
 .if ${MK_CDDL} == "no"
 WMAKEENV+=	NO_CTF=1
 .endif
-.if ${CC:T:Mgcc} == "gcc"
+
+.if defined(CROSS_TOOLCHAIN_PREFIX)
+CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
+CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
+.endif
+XCOMPILERS=	CC CXX CPP
+.for COMPILER in ${XCOMPILERS}
+.if defined(CROSS_COMPILER_PREFIX)
+X${COMPILER}?=	${CROSS_COMPILER_PREFIX}${${COMPILER}}
+.else
+X${COMPILER}?=	${${COMPILER}}
+.endif
+.endfor
+XBINUTILS=	AS AR LD NM OBJDUMP RANLIB STRINGS
+.for BINUTIL in ${XBINUTILS}
+.if defined(CROSS_BINUTILS_PREFIX)
+X${BINUTIL}?=	${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
+.else
+X${BINUTIL}?=	${${BINUTIL}}
+.endif
+.endfor
+WMAKEENV+=	CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \
+		CPP="${XCPP} ${XFLAGS}" \
+		AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
+		OBJDUMP=${XOBJDUMP} RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
+
+.if ${XCC:T:Mgcc} == "gcc"
 WMAKE_COMPILER_TYPE=	gcc
-.elif ${CC:T:Mclang} == "clang"
+.elif ${XCC:T:Mclang} == "clang"
 WMAKE_COMPILER_TYPE=	clang
 .elif ${MK_CLANG_IS_CC} == "no"
 WMAKE_COMPILER_TYPE=	gcc
 .else
 WMAKE_COMPILER_TYPE=	clang
 .endif
+IMAKE_COMPILER_TYPE=	COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
+
+.if ${XCC:M/*}
+XFLAGS=		--sysroot=${WORLDTMP}
+.if defined(CROSS_BINUTILS_PREFIX)
+# In the case of xdev-build tools, CROSS_BINUTILS_PREFIX won't be a
+# directory, but the compiler will look in the right place for it's
+# tools so we don't need to tell it where to look.
+.if exists(${CROSS_BINUTILS_PREFIX})
+XFLAGS+=	-B${CROSS_BINUTILS_PREFIX}
+.endif
+.else
+XFLAGS+=	-B${WORLDTMP}/usr/bin
+.endif
+.if ${TARGET_ARCH} != ${MACHINE_ARCH} && ${WMAKE_COMPILER_TYPE} == "clang"
+.if (${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "armv6") && \
+${MK_ARM_EABI} != "no"
+TARGET_ABI=	gnueabi
+.else
+TARGET_ABI=	unknown
+.endif
+TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0
+XFLAGS+=	-target ${TARGET_TRIPLE}
+.endif
+.endif
+
 WMAKEENV+=	COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
 WMAKE=		${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
@@ -314,6 +366,7 @@ LIB32WMAKEFLAGS=	\
 
 
 LIB32FLAGS=	-m32 ${LIB32CPUFLAGS} -DCOMPAT_32BIT \
+		--sysroot=${WORLDTMP} \
 		-isystem ${LIB32TMP}/usr/include/ \
 		-L${LIB32TMP}/usr/lib32 \
 		-B${LIB32TMP}/usr/lib32
@@ -329,8 +382,8 @@ LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${OBJTR
 		SHLIBDIR=/usr/lib32 \
 		COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
 LIB32WMAKEFLAGS+=	\
-		CC="${CC} ${LIB32FLAGS}" \
-		CXX="${CXX} ${LIB32FLAGS}" \
+		CC="${XCC} ${LIB32FLAGS}" \
+		CXX="${XCXX} ${LIB32FLAGS}" \
 		DESTDIR=${LIB32TMP} \
 		-DCOMPAT_32BIT \
 		-DLIBRARIES_ONLY \
@@ -346,7 +399,7 @@ LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDES
 
 IMAKEENV=	${CROSSENV:N_LDSCRIPTROOT=*}
 IMAKE=		${IMAKEENV} ${MAKE} -f Makefile.inc1 \
-		${IMAKE_INSTALL} ${IMAKE_MTREE}
+		${IMAKE_INSTALL} ${IMAKE_MTREE} ${IMAKE_COMPILER_TYPE}
 .if empty(.MAKEFLAGS:M-n)
 IMAKEENV+=	PATH=${STRICTTMPPATH}:${INSTALLTMP} \
 		LD_LIBRARY_PATH=${INSTALLTMP} \
@@ -970,25 +1023,50 @@ distributekernel distributekernel.debug:
 	@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
 	false
 .endif
+	mkdir -p ${DESTDIR}/${DISTDIR}
+.if defined(NO_ROOT)
+	echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.premeta
+.endif
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
-	    ${CROSSENV} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \
-	    DESTDIR=${DESTDIR}/${DISTDIR}/kernel \
+	    ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.premeta/} \
+	    ${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \
+	    DESTDIR=${INSTALL_DDIR:S://:/:g:C:/$::}/kernel \
 	    ${.TARGET:S/distributekernel/install/}
+	sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
+	    ${DESTDIR}/${DISTDIR}/kernel.meta
 .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
+.if defined(NO_ROOT)
+	echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
+.endif
 	cd ${KRNLOBJDIR}/${_kernel}; \
-	    ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
+	    ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.${_kernel}.premeta/} \
+	    ${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} \
 	    KERNEL=${INSTKERNNAME}.${_kernel} \
-	    DESTDIR=${DESTDIR}/${DISTDIR}/kernel.${_kernel} \
+	    DESTDIR=${INSTALL_DDIR:S://:/:g:C:/$::}/kernel.${_kernel} \
 	    ${.TARGET:S/distributekernel/install/}
+	sed -e 's|^./kernel|.|' \
+	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta > \
+	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
 .endfor
 
 packagekernel:
+.if defined(NO_ROOT)
+	cd ${DESTDIR}/${DISTDIR}/kernel; \
+	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz \
+	    @${DESTDIR}/${DISTDIR}/kernel.meta
+.for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
+	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
+	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz \
+	    @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
+.endfor
+.else
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz .
 .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz .
 .endfor
+.endif
 
 #
 # doxygen
@@ -1279,10 +1357,13 @@ _kgzip=		usr.sbin/kgzip
 .endif
 .endif
 
-.if ${MK_BINUTILS} != "no"
+.if ${XAS:M/*} == "" && ${MK_BINUTILS} != "no"
 _binutils=	gnu/usr.bin/binutils
 .endif
 
+# If an full path to an external cross compiler is given, don't build
+# a cross compiler.
+.if ${XCC:M/*} == "" && ${MK_CROSS_COMPILER} != "no"
 .if ${MK_CLANG} != "no" && (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang")
 _clang=		usr.bin/clang
 _clang_libs=	lib/clang
@@ -1291,6 +1372,7 @@ _clang_libs=	lib/clang
 .if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98")
 _cc=		gnu/usr.bin/cc
 .endif
+.endif
 
 cross-tools:
 .for _tool in \

Modified: user/attilio/vmcontention/bin/df/df.1
==============================================================================
--- user/attilio/vmcontention/bin/df/df.1	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/bin/df/df.1	Sat May 18 13:37:53 2013	(r250774)
@@ -196,7 +196,9 @@ If the value is outside, it will be set 
 .Xr localeconv 3 ,
 .Xr fstab 5 ,
 .Xr mount 8 ,
-.Xr quot 8 .
+.Xr pstat 8 ,
+.Xr quot 8 ,
+.Xr swapinfo 8 .
 .Sh STANDARDS
 With the exception of most options,
 the

Modified: user/attilio/vmcontention/bin/kenv/kenv.c
==============================================================================
--- user/attilio/vmcontention/bin/kenv/kenv.c	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/bin/kenv/kenv.c	Sat May 18 13:37:53 2013	(r250774)
@@ -37,9 +37,9 @@ __FBSDID("$FreeBSD$");
 
 static void	usage(void);
 static int	kdumpenv(void);
-static int	kgetenv(char *);
-static int	ksetenv(char *, char *);
-static int	kunsetenv(char *);
+static int	kgetenv(const char *);
+static int	ksetenv(const char *, char *);
+static int	kunsetenv(const char *);
 
 static int hflag = 0;
 static int Nflag = 0;
@@ -170,7 +170,7 @@ kdumpenv(void)
 }
 
 static int
-kgetenv(char *env)
+kgetenv(const char *env)
 {
 	char buf[1024];
 	int ret;
@@ -186,7 +186,7 @@ kgetenv(char *env)
 }
 
 static int
-ksetenv(char *env, char *val)
+ksetenv(const char *env, char *val)
 {
 	int ret;
 
@@ -197,7 +197,7 @@ ksetenv(char *env, char *val)
 }
 
 static int
-kunsetenv(char *env)
+kunsetenv(const char *env)
 {
 	int ret;
 	

Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl	Sat May 18 13:37:53 2013	(r250774)
@@ -73,7 +73,7 @@ die "Could not determine local IP addres
 # Find the first remote host that responds to an icmp echo,
 # which isn't a local address.
 #
-open PING, "/sbin/ping -ns $Broadcast{$local} 56 $MAXHOSTS |" or
+open PING, "/sbin/ping -n -s 56 -c $MAXHOSTS $Broadcast{$local} |" or
     die "Couldn't run ping: $!\n";
 while (<PING>) {
 	if (/bytes from (.*): / and not defined $Broadcast{$1}) {

Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl	Sat May 18 13:37:53 2013	(r250774)
@@ -48,7 +48,9 @@ my $MULTICAST = "FF02::1";		# IPv6 multi
 #
 my $local = "";
 my $remote = "";
+my $interf = "";
 my %Local;
+my %Addr;
 my $up;
 open IFCONFIG, '/sbin/ifconfig -a inet6 |'
     or die "Couldn't run ifconfig: $!\n";
@@ -59,27 +61,34 @@ while (<IFCONFIG>) {
 	$up = 1 if /^[a-z].*<UP,/;
 	$up = 0 if /^[a-z].*<,/;
 
+	if (m:(\S+\d+)\: :) {
+		$interf = $1;
+	}
+
 	# assume output is "inet6 ...":
-	if (m:inet6 (\S+)/:) {
+	if (m:inet6 (\S+) :) {
 		my $addr = $1;
                 $Local{$addr} = 1;
-                $local = $addr if $up and $local eq "";
+                $Addr{$interf} = $addr;
 		$up = 0;
+		$interf = "";
 	}
 }
 close IFCONFIG;
-exit 1 if $local eq "";
 
 #
 # Find the first remote host that responds to an icmp echo,
-# which isn't a local address.
+# which isn't a local address. Try each IPv6-enabled interface.
 #
-open PING, "/sbin/ping -ns -A inet6 $MULTICAST 56 $MAXHOSTS |" or
-    die "Couldn't run ping: $!\n";
-while (<PING>) {
-	if (/bytes from (.*): / and not defined $Local{$1}) {
-		$remote = $1;
-		last;
+foreach $interf (split(' ', `ifconfig -l -u inet6`)) {
+	next if $interf =~ /lo[0-9]+/;
+	open PING, "/sbin/ping6 -n -s 56 -c $MAXHOSTS $MULTICAST\%$interf |" or next;
+	while (<PING>) {
+		if (/bytes from (.*), / and not defined $Local{$1}) {
+			$remote = $1;
+			$local = $Addr{$interf};
+			last;
+		}
 	}
 }
 close PING;

Modified: user/attilio/vmcontention/contrib/bmake/main.c
==============================================================================
--- user/attilio/vmcontention/contrib/bmake/main.c	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/contrib/bmake/main.c	Sat May 18 13:37:53 2013	(r250774)
@@ -796,7 +796,10 @@ main(int argc, char **argv)
 	Lst targs;	/* target nodes to create -- passed to Make_Init */
 	Boolean outOfDate = FALSE; 	/* FALSE if all targets up to date */
 	struct stat sb, sa;
-	char *p1, *path, *pwd;
+	char *p1, *path;
+#ifndef NO_PWD_OVERRIDE
+	char *pwd;
+#endif
 	char mdpath[MAXPATHLEN];
 #ifdef FORCE_MACHINE
 	const char *machine = FORCE_MACHINE;

Modified: user/attilio/vmcontention/contrib/bmake/var.c
==============================================================================
--- user/attilio/vmcontention/contrib/bmake/var.c	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/contrib/bmake/var.c	Sat May 18 13:37:53 2013	(r250774)
@@ -540,11 +540,20 @@ void
 Var_Delete(const char *name, GNode *ctxt)
 {
     Hash_Entry 	  *ln;
-
-    ln = Hash_FindEntry(&ctxt->context, name);
+    char *cp;
+    
+    if (strchr(name, '$')) {
+	cp = Var_Subst(NULL, name, VAR_GLOBAL, 0);
+    } else {
+	cp = (char *)name;
+    }
+    ln = Hash_FindEntry(&ctxt->context, cp);
     if (DEBUG(VAR)) {
 	fprintf(debug_file, "%s:delete %s%s\n",
-	    ctxt->name, name, ln ? "" : " (not found)");
+	    ctxt->name, cp, ln ? "" : " (not found)");
+    }
+    if (cp != name) {
+	free(cp);
     }
     if (ln != NULL) {
 	Var 	  *v;

Modified: user/attilio/vmcontention/contrib/libpcap/pcap-filter.manmisc
==============================================================================
--- user/attilio/vmcontention/contrib/libpcap/pcap-filter.manmisc	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/contrib/libpcap/pcap-filter.manmisc	Sat May 18 13:37:53 2013	(r250774)
@@ -783,7 +783,8 @@ The following ICMP type field values are
 
 The following TCP flags field values are available: \fBtcp-fin\fP,
 \fBtcp-syn\fP, \fBtcp-rst\fP, \fBtcp-push\fP,
-\fBtcp-ack\fP, \fBtcp-urg\fP.
+\fBtcp-ack\fP, \fBtcp-urg\fP, \fBtcp-ece\fP,
+\fBtcp-cwr\fP.
 .LP
 Primitives may be combined using:
 .IP

Modified: user/attilio/vmcontention/contrib/libpcap/pcap-filter.manmisc.in
==============================================================================
--- user/attilio/vmcontention/contrib/libpcap/pcap-filter.manmisc.in	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/contrib/libpcap/pcap-filter.manmisc.in	Sat May 18 13:37:53 2013	(r250774)
@@ -783,7 +783,8 @@ The following ICMP type field values are
 
 The following TCP flags field values are available: \fBtcp-fin\fP,
 \fBtcp-syn\fP, \fBtcp-rst\fP, \fBtcp-push\fP,
-\fBtcp-ack\fP, \fBtcp-urg\fP.
+\fBtcp-ack\fP, \fBtcp-urg\fP, \fBtcp-ece\fP,
+\fBtcp-cwr\fP.
 .LP
 Primitives may be combined using:
 .IP

Modified: user/attilio/vmcontention/contrib/libpcap/scanner.l
==============================================================================
--- user/attilio/vmcontention/contrib/libpcap/scanner.l	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/contrib/libpcap/scanner.l	Sat May 18 13:37:53 2013	(r250774)
@@ -385,6 +385,8 @@ tcp-rst			{ yylval.i = 0x04; return NUM;
 tcp-push		{ yylval.i = 0x08; return NUM; }
 tcp-ack			{ yylval.i = 0x10; return NUM; }
 tcp-urg			{ yylval.i = 0x20; return NUM; }
+tcp-ece			{ yylval.i = 0x40; return NUM; }
+tcp-cwr			{ yylval.i = 0x80; return NUM; }
 [A-Za-z0-9]([-_.A-Za-z0-9]*[.A-Za-z0-9])? {
 			 yylval.s = sdup((char *)yytext); return ID; }
 "\\"[^ !()\n\t]+	{ yylval.s = sdup((char *)yytext + 1); return ID; }

Modified: user/attilio/vmcontention/contrib/nvi/common/exf.c
==============================================================================
--- user/attilio/vmcontention/contrib/nvi/common/exf.c	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/contrib/nvi/common/exf.c	Sat May 18 13:37:53 2013	(r250774)
@@ -187,10 +187,10 @@ file_init(sp, frp, rcv_name, flags)
 	 */
 	oname = frp->name;
 	if (LF_ISSET(FS_OPENERR) || oname == NULL || !exists) {
-		if (opts_empty(sp, O_DIRECTORY, 0))
+		if (opts_empty(sp, O_TMP_DIRECTORY, 0))
 			goto err;
 		(void)snprintf(tname, sizeof(tname),
-		    "%s/vi.XXXXXXXXXX", O_STR(sp, O_DIRECTORY));
+		    "%s/vi.XXXXXXXXXX", O_STR(sp, O_TMP_DIRECTORY));
 		if ((fd = mkstemp(tname)) == -1) {
 			msgq(sp, M_SYSERR,
 			    "237|Unable to create temporary file");

Modified: user/attilio/vmcontention/contrib/nvi/common/options.c
==============================================================================
--- user/attilio/vmcontention/contrib/nvi/common/options.c	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/contrib/nvi/common/options.c	Sat May 18 13:37:53 2013	(r250774)
@@ -64,7 +64,7 @@ OPTLIST const optlist[] = {
 	{"columns",	f_columns,	OPT_NUM,	OPT_NOSAVE},
 /* O_COMMENT	  4.4BSD */
 	{"comment",	NULL,		OPT_0BOOL,	0},
-/* O_DIRECTORY	    4BSD */
+/* O_TMP_DIRECTORY  4BSD */
 	{"directory",	NULL,		OPT_STR,	0},
 /* O_EDCOMPATIBLE   4BSD */
 	{"edcompatible",NULL,		OPT_0BOOL,	0},
@@ -244,7 +244,7 @@ static OABBREV const abbrev[] = {
 	{"aw",		O_AUTOWRITE},		/*     4BSD */
 	{"bf",		O_BEAUTIFY},		/*     4BSD */
 	{"co",		O_COLUMNS},		/*   4.4BSD */
-	{"dir",		O_DIRECTORY},		/*     4BSD */
+	{"dir",		O_TMP_DIRECTORY},	/*     4BSD */
 	{"eb",		O_ERRORBELLS},		/*     4BSD */
 	{"ed",		O_EDCOMPATIBLE},	/*     4BSD */
 	{"ex",		O_EXRC},		/* System V (undocumented) */
@@ -347,7 +347,7 @@ opts_init(sp, oargs)
 	 */
 	(void)snprintf(b1, sizeof(b1),
 	    "directory=%s", (s = getenv("TMPDIR")) == NULL ? _PATH_TMP : s);
-	OI(O_DIRECTORY, b1);
+	OI(O_TMP_DIRECTORY, b1);
 	OI(O_ESCAPETIME, "escapetime=6");
 	OI(O_KEYTIME, "keytime=6");
 	OI(O_MATCHTIME, "matchtime=7");

Modified: user/attilio/vmcontention/contrib/nvi/include/options_def.h
==============================================================================
--- user/attilio/vmcontention/contrib/nvi/include/options_def.h	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/contrib/nvi/include/options_def.h	Sat May 18 13:37:53 2013	(r250774)
@@ -8,7 +8,7 @@
 #define O_CEDIT 7
 #define O_COLUMNS 8
 #define O_COMMENT 9
-#define O_DIRECTORY 10
+#define O_TMP_DIRECTORY 10
 #define O_EDCOMPATIBLE 11
 #define O_ESCAPETIME 12
 #define O_ERRORBELLS 13

Modified: user/attilio/vmcontention/crypto/openssh/ChangeLog
==============================================================================
--- user/attilio/vmcontention/crypto/openssh/ChangeLog	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/crypto/openssh/ChangeLog	Sat May 18 13:37:53 2013	(r250774)
@@ -1,3 +1,39 @@
+20130510
+ - (djm) OpenBSD CVS Cherrypick
+   - djm at cvs.openbsd.org 2013/04/11 02:27:50
+     [packet.c]
+     quiet disconnect notifications on the server from error() back to logit()
+     if it is a normal client closure; bz#2057 ok+feedback dtucker@
+ - (djm) [version.h contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+   [contrib/suse/openssh.spec] Crank version numbers for release.
+
+20130404
+ - (dtucker) OpenBSD CVS Sync
+   - dtucker at cvs.openbsd.org 2013/02/17 23:16:57
+     [readconf.c ssh.c readconf.h sshconnect2.c]
+     Keep track of which IndentityFile options were manually supplied and which
+     were default options, and don't warn if the latter are missing.
+     ok markus@
+   - dtucker at cvs.openbsd.org 2013/02/19 02:12:47
+     [krl.c]
+     Remove bogus include.  ok djm
+   - dtucker at cvs.openbsd.org 2013/02/22 04:45:09
+     [ssh.c readconf.c readconf.h]
+     Don't complain if IdentityFiles specified in system-wide configs are
+     missing.  ok djm, deraadt.
+   - markus at cvs.openbsd.org 2013/02/22 19:13:56
+     [sshconnect.c]
+     support ProxyCommand=- (stdin/out already point to the proxy); ok djm@
+   - djm at cvs.openbsd.org 2013/02/22 22:09:01
+     [ssh.c]
+     Allow IdenityFile=none; ok markus deraadt (and dtucker for an earlier
+     version)
+
+20130401
+ - (dtucker) [openbsd-compat/bsd-cygwin_util.{c,h}] Don't include windows.h
+   to avoid conflicting definitions of __int64, adding the required bits.
+   Patch from Corinna Vinschen.
+
 20120322
  - (djm) [contrib/ssh-copy-id contrib/ssh-copy-id.1] Updated to Phil
    Hands' greatly revised version.

Modified: user/attilio/vmcontention/crypto/openssh/README
==============================================================================
--- user/attilio/vmcontention/crypto/openssh/README	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/crypto/openssh/README	Sat May 18 13:37:53 2013	(r250774)
@@ -1,4 +1,4 @@
-See http://www.openssh.com/txt/release-6.2 for the release notes.
+See http://www.openssh.com/txt/release-6.2p2 for the release notes.
 
 - A Japanese translation of this document and of the OpenSSH FAQ is
 - available at http://www.unixuser.org/~haruyama/security/openssh/index.html
@@ -62,4 +62,4 @@ References -
 [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
 [7] http://www.openssh.com/faq.html
 
-$Id: README,v 1.82 2013/02/26 23:48:19 djm Exp $
+$Id: README,v 1.82.2.1 2013/05/10 06:12:54 djm Exp $

Modified: user/attilio/vmcontention/crypto/openssh/krl.c
==============================================================================
--- user/attilio/vmcontention/crypto/openssh/krl.c	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/crypto/openssh/krl.c	Sat May 18 13:37:53 2013	(r250774)
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $OpenBSD: krl.c,v 1.9 2013/01/27 10:06:12 djm Exp $ */
+/* $OpenBSD: krl.c,v 1.10 2013/02/19 02:12:47 dtucker Exp $ */
 
 #include "includes.h"
 

Modified: user/attilio/vmcontention/crypto/openssh/openbsd-compat/bsd-cygwin_util.c
==============================================================================
--- user/attilio/vmcontention/crypto/openssh/openbsd-compat/bsd-cygwin_util.c	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/crypto/openssh/openbsd-compat/bsd-cygwin_util.c	Sat May 18 13:37:53 2013	(r250774)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, 2011 Corinna Vinschen <vinschen at redhat.com>
+ * Copyright (c) 2000, 2001, 2011, 2013 Corinna Vinschen <vinschen at redhat.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,20 +27,15 @@
  * binary mode on Windows systems.
  */
 
+#define NO_BINARY_OPEN	/* Avoid redefining open to binary_open for this file */
 #include "includes.h"
 
 #ifdef HAVE_CYGWIN
 
-#if defined(open) && open == binary_open
-# undef open
-#endif
-
 #include <sys/types.h>
-
 #include <fcntl.h>
-#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
-#include <windows.h>
 
 #include "xmalloc.h"
 

Modified: user/attilio/vmcontention/crypto/openssh/openbsd-compat/bsd-cygwin_util.h
==============================================================================
--- user/attilio/vmcontention/crypto/openssh/openbsd-compat/bsd-cygwin_util.h	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/crypto/openssh/openbsd-compat/bsd-cygwin_util.h	Sat May 18 13:37:53 2013	(r250774)
@@ -1,7 +1,7 @@
-/* $Id: bsd-cygwin_util.h,v 1.15 2012/08/28 09:57:19 dtucker Exp $ */
+/* $Id: bsd-cygwin_util.h,v 1.15.4.1 2013/04/04 23:53:31 dtucker Exp $ */
 
 /*
- * Copyright (c) 2000, 2001, 2011 Corinna Vinschen <vinschen at redhat.com>
+ * Copyright (c) 2000, 2001, 2011, 2013 Corinna Vinschen <vinschen at redhat.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -36,24 +36,21 @@
 
 #undef ERROR
 
-#define WIN32_LEAN_AND_MEAN
+/* Avoid including windows headers. */
+typedef void *HANDLE;
+#define INVALID_HANDLE_VALUE ((HANDLE) -1)
 
-#include <windows.h>
 #include <sys/cygwin.h>
 #include <io.h>
 
-/* Make sure _WIN32 isn't defined later in the code, otherwise headers from
-   other packages might get the wrong idea about the target system. */
-#ifdef _WIN32
-#undef _WIN32
-#endif
-
 int binary_open(const char *, int , ...);
 int check_ntsec(const char *);
 char **fetch_windows_environment(void);
 void free_windows_environment(char **);
 
+#ifndef NO_BINARY_OPEN
 #define open binary_open
+#endif
 
 #endif /* HAVE_CYGWIN */
 

Modified: user/attilio/vmcontention/crypto/openssh/packet.c
==============================================================================
--- user/attilio/vmcontention/crypto/openssh/packet.c	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/crypto/openssh/packet.c	Sat May 18 13:37:53 2013	(r250774)
@@ -1,5 +1,5 @@
 /* $OpenBSD: packet.c,v 1.181 2013/02/10 23:35:24 djm Exp $ */
-/* $FreeBSD$ */
+/* $OpenBSD: packet.c,v 1.182 2013/04/11 02:27:50 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -1468,7 +1468,7 @@ packet_read_poll_seqnr(u_int32_t *seqnr_
 				/* Ignore normal client exit notifications */
 				do_log2(active_state->server_side &&
 				    reason == SSH2_DISCONNECT_BY_APPLICATION ?
-				    SYSLOG_LEVEL_DEBUG1 : SYSLOG_LEVEL_ERROR,
+				    SYSLOG_LEVEL_INFO : SYSLOG_LEVEL_ERROR,
 				    "Received disconnect from %s: %u: %.400s",
 				    get_remote_ipaddr(), reason, msg);
 				xfree(msg);

Modified: user/attilio/vmcontention/crypto/openssh/ssh_config
==============================================================================
--- user/attilio/vmcontention/crypto/openssh/ssh_config	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/crypto/openssh/ssh_config	Sat May 18 13:37:53 2013	(r250774)
@@ -46,4 +46,4 @@
 #   PermitLocalCommand no
 #   VisualHostKey no
 #   ProxyCommand ssh -q -W %h:%p gateway.example.com
-#   VersionAddendum FreeBSD-20130322
+#   VersionAddendum FreeBSD-20130515

Modified: user/attilio/vmcontention/crypto/openssh/ssh_config.5
==============================================================================
--- user/attilio/vmcontention/crypto/openssh/ssh_config.5	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/crypto/openssh/ssh_config.5	Sat May 18 13:37:53 2013	(r250774)
@@ -1230,7 +1230,7 @@ in
 Specifies a string to append to the regular version string to identify
 OS- or site-specific modifications.
 The default is
-.Dq FreeBSD-20130322 .
+.Dq FreeBSD-20130515 .
 .It Cm VisualHostKey
 If this flag is set to
 .Dq yes ,

Modified: user/attilio/vmcontention/crypto/openssh/sshconnect.c
==============================================================================
--- user/attilio/vmcontention/crypto/openssh/sshconnect.c	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/crypto/openssh/sshconnect.c	Sat May 18 13:37:53 2013	(r250774)
@@ -1,5 +1,5 @@
 /* $OpenBSD: sshconnect.c,v 1.236 2012/09/14 16:51:34 markus Exp $ */
-/* $FreeBSD$ */
+/* $OpenBSD: sshconnect.c,v 1.237 2013/02/22 19:13:56 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -90,6 +90,13 @@ ssh_proxy_connect(const char *host, u_sh
 	pid_t pid;
 	char *shell, strport[NI_MAXSERV];
 
+	if (!strcmp(proxy_command, "-")) {
+		packet_set_connection(STDIN_FILENO, STDOUT_FILENO);
+		packet_set_timeout(options.server_alive_interval,
+		    options.server_alive_count_max);
+		return 0;
+	}
+
 	if ((shell = getenv("SHELL")) == NULL || *shell == '\0')
 		shell = _PATH_BSHELL;
 

Modified: user/attilio/vmcontention/crypto/openssh/sshd_config
==============================================================================
--- user/attilio/vmcontention/crypto/openssh/sshd_config	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/crypto/openssh/sshd_config	Sat May 18 13:37:53 2013	(r250774)
@@ -115,7 +115,7 @@
 #MaxStartups 10:30:100
 #PermitTunnel no
 #ChrootDirectory none
-#VersionAddendum FreeBSD-20130322
+#VersionAddendum FreeBSD-20130515
 
 # no default banner path
 #Banner none

Modified: user/attilio/vmcontention/crypto/openssh/sshd_config.5
==============================================================================
--- user/attilio/vmcontention/crypto/openssh/sshd_config.5	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/crypto/openssh/sshd_config.5	Sat May 18 13:37:53 2013	(r250774)
@@ -1180,7 +1180,7 @@ restrictions.
 Optionally specifies additional text to append to the SSH protocol banner
 sent by the server upon connection.
 The default is
-.Dq FreeBSD-20130322 .
+.Dq FreeBSD-20130515 .
 .It Cm X11DisplayOffset
 Specifies the first display number available for
 .Xr sshd 8 Ns 's

Modified: user/attilio/vmcontention/crypto/openssh/version.h
==============================================================================
--- user/attilio/vmcontention/crypto/openssh/version.h	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/crypto/openssh/version.h	Sat May 18 13:37:53 2013	(r250774)
@@ -3,8 +3,8 @@
 
 #define SSH_VERSION	"OpenSSH_6.2"
 
-#define SSH_PORTABLE	"p1"
+#define SSH_PORTABLE	"p2"
 #define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
 
-#define SSH_VERSION_FREEBSD	"FreeBSD-20130322"
+#define SSH_VERSION_FREEBSD	"FreeBSD-20130515"
 #define SSH_VERSION_HPN		"_hpn13v11"

Modified: user/attilio/vmcontention/lib/libc/stdlib/atol.3
==============================================================================
--- user/attilio/vmcontention/lib/libc/stdlib/atol.3	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/lib/libc/stdlib/atol.3	Sat May 18 13:37:53 2013	(r250774)
@@ -32,7 +32,7 @@
 .\"     @(#)atol.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd February 1, 2009
+.Dd May 14, 2013
 .Dt ATOL 3
 .Os
 .Sh NAME
@@ -88,13 +88,13 @@ and
 functions are thin wrappers around
 .Fn strtol
 and
-.Fn stroll
+.Fn strtoll
 respectively, so these functions will affect the value of
 .Va errno
 in the same way that the
 .Fn strtol
 and
-.Fn stroll
+.Fn strtoll
 functions are able to.
 This behavior of
 .Fn atol

Modified: user/attilio/vmcontention/lib/libthr/thread/thr_spec.c
==============================================================================
--- user/attilio/vmcontention/lib/libthr/thread/thr_spec.c	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/lib/libthr/thread/thr_spec.c	Sat May 18 13:37:53 2013	(r250774)
@@ -70,7 +70,7 @@ _pthread_key_create(pthread_key_t *key, 
 
 			/* Unlock the key table: */
 			THR_LOCK_RELEASE(curthread, &_keytable_lock);
-			*key = i;
+			*key = i + 1;
 			return (0);
 		}
 
@@ -81,9 +81,10 @@ _pthread_key_create(pthread_key_t *key, 
 }
 
 int
-_pthread_key_delete(pthread_key_t key)
+_pthread_key_delete(pthread_key_t userkey)
 {
 	struct pthread *curthread = _get_curthread();
+	int key = userkey - 1;
 	int ret = 0;
 
 	if ((unsigned int)key < PTHREAD_KEYS_MAX) {
@@ -178,9 +179,10 @@ pthread_key_allocate_data(void)
 }
 
 int 
-_pthread_setspecific(pthread_key_t key, const void *value)
+_pthread_setspecific(pthread_key_t userkey, const void *value)
 {
 	struct pthread	*pthread;
+	pthread_key_t	key = userkey - 1;
 	int		ret = 0;
 
 	/* Point to the running thread: */
@@ -209,9 +211,10 @@ _pthread_setspecific(pthread_key_t key, 
 }
 
 void *
-_pthread_getspecific(pthread_key_t key)
+_pthread_getspecific(pthread_key_t userkey)
 {
 	struct pthread	*pthread;
+	pthread_key_t	key = userkey - 1;
 	const void	*data;
 
 	/* Point to the running thread: */

Modified: user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/early-adopter/article.xml
==============================================================================
--- user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/early-adopter/article.xml	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/early-adopter/article.xml	Sat May 18 13:37:53 2013	(r250774)
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 
 <!ENTITY release.4x "4.<replaceable>X</replaceable>">
 <!ENTITY release.5x "5.<replaceable>X</replaceable>">

Modified: user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/errata/article.xml
==============================================================================
--- user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/errata/article.xml	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/errata/article.xml	Sat May 18 13:37:53 2013	(r250774)
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 ]>
 
 <!--
@@ -23,14 +22,7 @@
 <article lang="de">
   <articleinfo>
 
-    <title>&os;
-<![ %release.type.snapshot [
-    &release.prev;
-]]>
-<![ %release.type.release [
-    &release.current;
-]]>
-    Errata</title>
+    <title>&os; &release; Errata</title>
 
     <authorgroup>
       <corpauthor>Das &os; Projekt</corpauthor>
@@ -55,16 +47,7 @@
   </articleinfo>
 
   <abstract>
-    <para>Dieses Dokument enthält die Errata für &os;
-<![ %release.type.current [
-      &release.prev;,
-]]>
-<![ %release.type.snapshot [
-      &release.prev;,
-]]>
-<![ %release.type.release [
-      &release.current;,
-]]>
+    <para>Dieses Dokument enthält die Errata für &os; &release;,
       also wichtige Informationen, die kurz vor bzw. erst nach
       der Veröffentlichung bekannt wurden.  Dazu gehören
       Ratschläge zur Sicherheit sowie Änderungen in der
@@ -73,16 +56,7 @@
       die aktuelle Version dieses Dokumentes lesen, bevor sie diese
       Version von &os; installieren.</para>
 
-    <para>Diese Errata für &os;
-<![ %release.type.current [
-      &release.prev;
-]]>
-<![ %release.type.snapshot [
-      &release.prev;
-]]>
-<![ %release.type.release [
-      &release.current;
-]]>
+    <para>Diese Errata für &os; &release;
       werden bis zum
       Erscheinen von &os; 5.1-RELEASE weiter aktualisiert
       werden.</para>
@@ -92,16 +66,7 @@
     <title>Einleitung</title>
 
     <para>Diese Errata enthalten <quote>brandheiße</quote>
-      Informationen über &os;
-<![ %release.type.current [
-      &release.prev;.
-]]>
-<![ %release.type.snapshot [
-      &release.prev;.
-]]>
-<![ %release.type.release [
-      &release.current;.
-]]>
+      Informationen über &os; &release;.
       Bevor Sie diese
       Version installieren, sollten Sie auf jeden Fall dieses Dokument
       lesen, um über Probleme informiert zu werden, die erst nach

Modified: user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml
==============================================================================
--- user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml	Sat May 18 13:37:53 2013	(r250774)
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
 <!-- Architecture-specific customization -->
 

Modified: user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml
==============================================================================
--- user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml	Sat May 18 13:37:53 2013	(r250774)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml,v 1.35 2003/05/24 19:11:43 ue Exp $
@@ -392,7 +393,7 @@
 	</listitem>
 
 	<listitem>
-	  <para>PS/2 Maus & Tastatur ODER 5pin DIN Tastatur (2
+	  <para>PS/2 Maus & Tastatur ODER 5pin DIN Tastatur (2
 	    verschiedene Mainboards)</para>
 	</listitem>
 
@@ -579,7 +580,7 @@ cpu     EV4</programlisting>
 	</listitem>
 
 	<listitem>
-	  <para>Anschlüsse für PS/2 Maus & Tastatur</para>
+	  <para>Anschlüsse für PS/2 Maus & Tastatur</para>
 	</listitem>
 
 	<listitem>

Modified: user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml
==============================================================================
--- user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml	Sat May 18 13:37:53 2013	(r250774)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 
 	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/dev.xml,v 1.84 2003/05/25 09:36:36 ue Exp $
@@ -1236,7 +1237,7 @@
       &man.pcn.4; Treiber)
       <itemizedlist>
 	<listitem arch="i386,alpha">
-	  <para>AMD PCnet/PCI (79c970 & 53c974 oder 79c974)</para>
+	  <para>AMD PCnet/PCI (79c970 & 53c974 oder 79c974)</para>
 	</listitem>
 
 	<listitem arch="i386,alpha">
@@ -3744,7 +3745,7 @@
 	</listitem>
 
 	<listitem arch="i386,alpha">
-	  <para>CMD Tech 670 & 673</para>
+	  <para>CMD Tech 670 & 673</para>
 	</listitem>
 
 	<listitem arch="i386,alpha">

Modified: user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml
==============================================================================
--- user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml	Sat May 18 13:37:53 2013	(r250774)
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
 <!-- Architecture-specific customization -->
 

Modified: user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml
==============================================================================
--- user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml	Sat May 18 13:37:53 2013	(r250774)
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
 <!-- Architecture-specific customization -->
 

Modified: user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml
==============================================================================
--- user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml	Sat May 18 13:37:53 2013	(r250774)
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
 <!-- Architecture-specific customization -->
 

Modified: user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml
==============================================================================
--- user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml	Sat May 18 13:24:53 2013	(r250773)
+++ user/attilio/vmcontention/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml	Sat May 18 13:37:53 2013	(r250774)
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">

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