PERFORCE change 104958 for review

Warner Losh imp at FreeBSD.org
Thu Aug 24 16:51:53 UTC 2006


http://perforce.freebsd.org/chv.cgi?CH=104958

Change 104958 by imp at imp_paco-paco on 2006/08/24 16:51:02

	IFC @104955

Affected files ...

.. //depot/projects/arm/src/Makefile.inc1#5 integrate
.. //depot/projects/arm/src/ObsoleteFiles.inc#5 integrate
.. //depot/projects/arm/src/contrib/gdb/FREEBSD-Xlist#2 integrate
.. //depot/projects/arm/src/contrib/gdb/gdb/config/powerpc/fbsd.mh#1 branch
.. //depot/projects/arm/src/contrib/gdb/gdb/config/powerpc/fbsd.mt#1 branch
.. //depot/projects/arm/src/contrib/gdb/gdb/config/powerpc/nm-fbsd.h#1 branch
.. //depot/projects/arm/src/contrib/gdb/gdb/config/rs6000/nm-rs6000.h#1 branch
.. //depot/projects/arm/src/contrib/gdb/gdb/config/rs6000/nm-rs6000ly.h#1 branch
.. //depot/projects/arm/src/contrib/gdb/gdb/config/rs6000/rs6000.mh#1 branch
.. //depot/projects/arm/src/contrib/gdb/gdb/config/rs6000/rs6000.mt#1 branch
.. //depot/projects/arm/src/contrib/gdb/gdb/config/rs6000/rs6000lynx.mh#1 branch
.. //depot/projects/arm/src/contrib/gdb/gdb/config/rs6000/rs6000lynx.mt#1 branch
.. //depot/projects/arm/src/contrib/gdb/gdb/config/rs6000/tm-rs6000.h#1 branch
.. //depot/projects/arm/src/contrib/gdb/gdb/config/rs6000/tm-rs6000ly.h#1 branch
.. //depot/projects/arm/src/contrib/gdb/gdb/config/rs6000/xm-rs6000.h#1 branch
.. //depot/projects/arm/src/contrib/gdb/gdb/ppcfbsd-nat.c#1 branch
.. //depot/projects/arm/src/contrib/gdb/gdb/ppcfbsd-tdep.c#1 branch
.. //depot/projects/arm/src/contrib/gdb/gdb/ppcfbsd-tdep.h#1 branch
.. //depot/projects/arm/src/contrib/gdb/gdb/rs6000-nat.c#1 branch
.. //depot/projects/arm/src/contrib/gdb/gdb/rs6000-tdep.c#1 branch
.. //depot/projects/arm/src/contrib/pnpinfo/pnpinfo.c#2 integrate
.. //depot/projects/arm/src/etc/rc.d/Makefile#3 integrate
.. //depot/projects/arm/src/etc/rc.d/ramdisk#2 delete
.. //depot/projects/arm/src/etc/rc.d/ramdisk-own#2 delete
.. //depot/projects/arm/src/etc/rc.d/sshd#2 integrate
.. //depot/projects/arm/src/etc/rc.d/ypxfrd#2 integrate
.. //depot/projects/arm/src/etc/rc.initdiskless#2 integrate
.. //depot/projects/arm/src/etc/rc.subr#4 integrate
.. //depot/projects/arm/src/gnu/usr.bin/Makefile#3 integrate
.. //depot/projects/arm/src/gnu/usr.bin/binutils/libbfd/Makefile.powerpc#2 integrate
.. //depot/projects/arm/src/gnu/usr.bin/gdb/Makefile#2 integrate
.. //depot/projects/arm/src/gnu/usr.bin/gdb/arch/alpha/Makefile#2 delete
.. //depot/projects/arm/src/gnu/usr.bin/gdb/arch/alpha/config.h#2 delete
.. //depot/projects/arm/src/gnu/usr.bin/gdb/arch/alpha/init.c#2 delete
.. //depot/projects/arm/src/gnu/usr.bin/gdb/arch/powerpc/Makefile#1 branch
.. //depot/projects/arm/src/gnu/usr.bin/gdb/arch/powerpc/config.h#1 branch
.. //depot/projects/arm/src/gnu/usr.bin/gdb/arch/powerpc/init.c#1 branch
.. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#2 delete
.. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 integrate
.. //depot/projects/arm/src/lib/Makefile#3 integrate
.. //depot/projects/arm/src/lib/csu/alpha/Makefile#2 delete
.. //depot/projects/arm/src/lib/csu/alpha/crt1.c#2 delete
.. //depot/projects/arm/src/lib/csu/alpha/crti.S#2 delete
.. //depot/projects/arm/src/lib/csu/alpha/crtn.S#2 delete
.. //depot/projects/arm/src/lib/libc/Makefile#2 integrate
.. //depot/projects/arm/src/lib/libc/alpha/Makefile.inc#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/SYS.h#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/Symbol.map#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/_fpmath.h#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/arith.h#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/Makefile.inc#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/_ctx_start.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/_set_tp.c#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/_setjmp.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/divrem.m4#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/fabs.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/flt_rounds.c#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/fpgetmask.c#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/fpgetround.c#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/fpgetsticky.c#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/fpsetmask.c#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/fpsetround.c#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/infinity.c#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/makecontext.c#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/modf.c#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/rfork_thread.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/setjmp.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/signalcontext.c#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/gen/sigsetjmp.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/net/Makefile.inc#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/net/byte_swap_2.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/net/byte_swap_4.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/net/htonl.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/net/htons.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/net/ntohl.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/net/ntohs.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/stdlib/Makefile.inc#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/string/Makefile.inc#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/string/bcopy.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/string/bzero.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/string/ffs.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/string/memcpy.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/string/memmove.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/sys/Makefile.inc#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/sys/Ovfork.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/sys/brk.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/sys/cerror.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/sys/exect.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/sys/fork.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/sys/pipe.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/sys/ptrace.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/sys/sbrk.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/sys/setlogin.S#2 delete
.. //depot/projects/arm/src/lib/libc/alpha/sys/sigreturn.S#2 delete
.. //depot/projects/arm/src/lib/libc/stdio/findfp.c#2 integrate
.. //depot/projects/arm/src/lib/libc_r/Makefile#2 integrate
.. //depot/projects/arm/src/lib/libc_r/arch/alpha/_atomic_lock.S#2 delete
.. //depot/projects/arm/src/lib/libdisk/write_alpha_disk.c#2 delete
.. //depot/projects/arm/src/lib/libio/Makefile#2 delete
.. //depot/projects/arm/src/lib/libio/alpha_sethae.c#2 delete
.. //depot/projects/arm/src/lib/libio/bwx.c#2 delete
.. //depot/projects/arm/src/lib/libio/io.c#2 delete
.. //depot/projects/arm/src/lib/libio/io.h#2 delete
.. //depot/projects/arm/src/lib/libio/swiz.c#2 delete
.. //depot/projects/arm/src/lib/libkvm/kvm_alpha.c#2 delete
.. //depot/projects/arm/src/lib/libpthread/Makefile#2 integrate
.. //depot/projects/arm/src/lib/libpthread/arch/alpha/Makefile.inc#2 delete
.. //depot/projects/arm/src/lib/libpthread/arch/alpha/alpha/context.S#2 delete
.. //depot/projects/arm/src/lib/libpthread/arch/alpha/alpha/enter_uts.S#2 delete
.. //depot/projects/arm/src/lib/libpthread/arch/alpha/alpha/pthread_md.c#2 delete
.. //depot/projects/arm/src/lib/libpthread/arch/alpha/include/atomic_ops.h#2 delete
.. //depot/projects/arm/src/lib/libpthread/arch/alpha/include/pthread_md.h#2 delete
.. //depot/projects/arm/src/lib/libstand/Makefile#2 integrate
.. //depot/projects/arm/src/lib/libstand/alpha/_setjmp.S#2 delete
.. //depot/projects/arm/src/lib/libthr/Makefile#2 integrate
.. //depot/projects/arm/src/lib/libthr/arch/alpha/Makefile.inc#2 delete
.. //depot/projects/arm/src/lib/libthr/arch/alpha/alpha/pthread_md.c#2 delete
.. //depot/projects/arm/src/lib/libthr/arch/alpha/include/pthread_md.h#2 delete
.. //depot/projects/arm/src/lib/libthread_db/arch/alpha/libc_r_md.c#2 delete
.. //depot/projects/arm/src/lib/libthread_db/arch/alpha/libpthread_md.c#2 delete
.. //depot/projects/arm/src/lib/libutil/login.conf.5#2 integrate
.. //depot/projects/arm/src/lib/msun/alpha/Makefile.inc#2 delete
.. //depot/projects/arm/src/lib/msun/alpha/Symbol.map#2 delete
.. //depot/projects/arm/src/lib/msun/alpha/fenv.c#2 delete
.. //depot/projects/arm/src/lib/msun/alpha/fenv.h#2 delete
.. //depot/projects/arm/src/lib/msun/alpha/s_copysign.S#2 delete
.. //depot/projects/arm/src/lib/msun/alpha/s_copysignf.S#2 delete
.. //depot/projects/arm/src/libexec/rtld-elf/alpha/Makefile.inc#2 delete
.. //depot/projects/arm/src/libexec/rtld-elf/alpha/ld.so.script#2 delete
.. //depot/projects/arm/src/libexec/rtld-elf/alpha/reloc.c#2 delete
.. //depot/projects/arm/src/libexec/rtld-elf/alpha/rtld_machdep.h#2 delete
.. //depot/projects/arm/src/libexec/rtld-elf/alpha/rtld_start.S#2 delete
.. //depot/projects/arm/src/release/Makefile#2 integrate
.. //depot/projects/arm/src/release/alpha/boot_crunch.conf#2 delete
.. //depot/projects/arm/src/release/alpha/mkisoimages.sh#2 delete
.. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 integrate
.. //depot/projects/arm/src/rescue/rescue/Makefile#2 integrate
.. //depot/projects/arm/src/sbin/bsdlabel/Makefile#2 integrate
.. //depot/projects/arm/src/sbin/fsdb/fsdb.8#2 integrate
.. //depot/projects/arm/src/sbin/fsdb/fsdb.c#2 integrate
.. //depot/projects/arm/src/sbin/fsdb/fsdbutil.c#2 integrate
.. //depot/projects/arm/src/sbin/ggate/Makefile#2 integrate
.. //depot/projects/arm/src/sbin/ifconfig/ifmedia.c#2 integrate
.. //depot/projects/arm/src/sbin/ipfw/ipfw2.c#4 integrate
.. //depot/projects/arm/src/sbin/ping/Makefile#2 integrate
.. //depot/projects/arm/src/secure/lib/libcrypto/Makefile.inc#3 integrate
.. //depot/projects/arm/src/secure/lib/libcrypto/opensslconf-alpha.h#2 delete
.. //depot/projects/arm/src/share/examples/drivers/make_pseudo_driver.sh#3 integrate
.. //depot/projects/arm/src/share/man/man8/rc.subr.8#2 integrate
.. //depot/projects/arm/src/share/mk/bsd.cpu.mk#4 integrate
.. //depot/projects/arm/src/share/mk/bsd.endian.mk#2 integrate
.. //depot/projects/arm/src/sys/conf/NOTES#31 integrate
.. //depot/projects/arm/src/sys/dev/bge/if_bge.c#20 integrate
.. //depot/projects/arm/src/sys/dev/bge/if_bgereg.h#14 integrate
.. //depot/projects/arm/src/sys/dev/em/if_em.c#25 integrate
.. //depot/projects/arm/src/sys/dev/mii/brgphy.c#9 integrate
.. //depot/projects/arm/src/sys/kern/kern_thr.c#8 integrate
.. //depot/projects/arm/src/sys/net/if_spppsubr.c#5 integrate
.. //depot/projects/arm/src/sys/netsmb/smb_crypt.c#3 integrate
.. //depot/projects/arm/src/sys/netsmb/smb_iod.c#2 integrate
.. //depot/projects/arm/src/sys/netsmb/smb_rq.c#2 integrate
.. //depot/projects/arm/src/sys/netsmb/smb_rq.h#2 integrate
.. //depot/projects/arm/src/sys/pci/agp_amd64.c#6 integrate
.. //depot/projects/arm/src/tools/regression/lib/msun/Makefile#2 integrate
.. //depot/projects/arm/src/usr.bin/Makefile#2 integrate
.. //depot/projects/arm/src/usr.bin/gprof/alpha.h#2 delete
.. //depot/projects/arm/src/usr.bin/gprof/gprof.h#2 integrate
.. //depot/projects/arm/src/usr.bin/truss/alpha-fbsd.c#2 delete
.. //depot/projects/arm/src/usr.bin/uac/Makefile#2 delete
.. //depot/projects/arm/src/usr.bin/uac/uac.1#2 delete
.. //depot/projects/arm/src/usr.bin/uac/uac.c#2 delete
.. //depot/projects/arm/src/usr.bin/xlint/arch/alpha/targparam.h#2 delete
.. //depot/projects/arm/src/usr.sbin/Makefile#5 integrate
.. //depot/projects/arm/src/usr.sbin/crunch/crunchide/Makefile#2 integrate
.. //depot/projects/arm/src/usr.sbin/pnpinfo/Makefile#2 integrate
.. //depot/projects/arm/src/usr.sbin/rpc.lockd/lockd.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/traceroute/Makefile#2 integrate

Differences ...

==== //depot/projects/arm/src/Makefile.inc1#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.552 2006/08/09 11:03:06 netchild Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.553 2006/08/22 07:51:05 ru Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -926,9 +926,6 @@
 .if ${MK_RESCUE} != "no" || defined(RELEASEDIR)
 _crunchide=	usr.sbin/crunch/crunchide
 .endif
-.if ${TARGET_ARCH} == "alpha"
-_elf2exe=	usr.sbin/elf2exe
-.endif
 .if ${TARGET_ARCH} == "i386" && defined(RELEASEDIR)
 _kgzip=		usr.sbin/kgzip
 .endif
@@ -941,7 +938,6 @@
     usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \
     ${_btxld} \
     ${_crunchide} \
-    ${_elf2exe} \
     ${_kgzip}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool}; \

==== //depot/projects/arm/src/ObsoleteFiles.inc#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.47 2006/08/14 18:20:36 netchild Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.49 2006/08/22 11:12:09 flz Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,9 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20060822: ramdisk{,-own} have been replaced by mdconfig{,2}
+OLD_FILES+=etc/rc.d/ramdisk
+OLD_FILES+=etc/rc.d/ramdisk-own
 # 20060704: KAME compat file net_osdep.h removed
 OLD_FILES+=usr/include/net/net_osdep.h
 # 20060517: pcvt removed
@@ -334,7 +337,7 @@
 OLD_FILES+=usr/share/man/man1/sgsc.1.gz
 OLD_FILES+=usr/share/man/man4/i386/stl.4.gz
 OLD_FILES+=usr/share/man/man8/raidctl.8.gz
-.if ${TARGET_ARCH} != "alpha" && ${TARGET_ARCH} != "sparc64"
+.if ${TARGET_ARCH} != "sparc64"
 # 20040130: libkse renamed to libpthread
 OLD_FILES+=usr/lib/libkse.a
 OLD_FILES+=usr/lib/libkse.so
@@ -3066,7 +3069,7 @@
 OLD_LIBS+=usr/lib/libisc.so.1
 # 200408XX
 OLD_LIBS+=usr/lib/snmp_netgraph.so.1
-.if ${TARGET_ARCH} != "alpha" && ${TARGET_ARCH} != "sparc64"
+.if ${TARGET_ARCH} != "sparc64"
 # 20040130: libkse renamed to libpthread
 OLD_LIBS+=usr/lib/libkse.so.1
 .endif

==== //depot/projects/arm/src/contrib/gdb/FREEBSD-Xlist#2 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/contrib/gdb/FREEBSD-Xlist,v 1.6 2004/06/20 19:15:58 marcel Exp $
+$FreeBSD: src/contrib/gdb/FREEBSD-Xlist,v 1.7 2006/08/23 03:30:33 marcel Exp $
 gdb-6.1.1/bfd/*
 gdb-6.1.1/config/*
 gdb-6.1.1/etc/*
@@ -16,7 +16,6 @@
 gdb-6.1.1/gdb/config/mn10300/*
 gdb-6.1.1/gdb/config/ns32k/*
 gdb-6.1.1/gdb/config/pa/*
-gdb-6.1.1/gdb/config/rs6000/*
 gdb-6.1.1/gdb/config/sh/*
 gdb-6.1.1/gdb/config/v850/*
 gdb-6.1.1/gdb/config/vax/*
@@ -34,7 +33,6 @@
 gdb-6.1.1/gdb/osf-share/*
 gdb-6.1.1/gdb/hppa*
 gdb-6.1.1/gdb/rdi-share/*
-gdb-6.1.1/gdb/rs6000*
 gdb-6.1.1/gdb/sh*
 gdb-6.1.1/gdb/testsuite/*
 gdb-6.1.1/gdb/v850*

==== //depot/projects/arm/src/contrib/pnpinfo/pnpinfo.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/pnpinfo/pnpinfo.c,v 1.9 2004/01/04 11:11:02 charnier Exp $");
+__FBSDID("$FreeBSD: src/contrib/pnpinfo/pnpinfo.c,v 1.10 2006/08/22 07:51:09 ru Exp $");
 
 #include <sys/time.h>
 
@@ -593,9 +593,6 @@
     if (open("/dev/io", O_RDONLY) < 0)
 	errx(1, "can't get I/O privilege");
 #endif
-#ifdef __alpha__
-    ioperm(0x203, 0x400 - 0x203, 1);
-#endif
 
     printf("Checking for Plug-n-Play devices...\n");
 

==== //depot/projects/arm/src/etc/rc.d/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.74 2006/08/04 18:37:03 des Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.75 2006/08/22 11:12:09 flz Exp $
 
 .include <bsd.own.mk>
 
@@ -30,7 +30,7 @@
 	pf pflog pfsync \
 	powerd power_profile ppp pppoed pwcheck \
 	quota \
-	ramdisk ramdisk-own random rarpd resolv root \
+	random rarpd resolv root \
 	route6d routed routing rpcbind rtadvd rwho \
 	savecore sdpd securelevel sendmail \
 	serial sppp swap1 \

==== //depot/projects/arm/src/etc/rc.d/sshd#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: sshd,v 1.18 2002/04/29 08:23:34 lukem Exp $
-# $FreeBSD: src/etc/rc.d/sshd,v 1.11 2006/04/11 09:08:15 flz Exp $
+# $FreeBSD: src/etc/rc.d/sshd,v 1.12 2006/08/22 11:17:28 flz Exp $
 #
 
 # PROVIDE: sshd
@@ -19,8 +19,6 @@
 
 timeout=300
 
-load_rc_config $name
-
 user_reseed()
 {
 	(
@@ -49,46 +47,47 @@
 	umask 022
 
 	# Can't do anything if ssh is not installed
-	[ -x ${prefix}/bin/ssh-keygen ] || {
-		warn "${prefix}/bin/ssh-keygen does not exist."
+	[ -x /usr/bin/ssh-keygen ] || {
+		warn "/usr/bin/ssh-keygen does not exist."
 		return 1
 	}
 
-	if [ -f ${etcdir}/ssh/ssh_host_key ]; then
+	if [ -f /etc/ssh/ssh_host_key ]; then
 		echo "You already have an RSA host key" \
-		    "in ${etcdir}/ssh/ssh_host_key"
+		    "in /etc/ssh/ssh_host_key"
 		echo "Skipping protocol version 1 RSA Key Generation"
 	else
-		${prefix}/bin/ssh-keygen -t rsa1 -b 1024 \
-		    -f ${etcdir}/ssh/ssh_host_key -N ''
+		/usr/bin/ssh-keygen -t rsa1 -b 1024 \
+		    -f /etc/ssh/ssh_host_key -N ''
 	fi
 
-	if [ -f ${etcdir}/ssh/ssh_host_dsa_key ]; then
+	if [ -f /etc/ssh/ssh_host_dsa_key ]; then
 		echo "You already have a DSA host key" \
-		    "in ${etcdir}/ssh/ssh_host_dsa_key"
+		    "in /etc/ssh/ssh_host_dsa_key"
 		echo "Skipping protocol version 2 DSA Key Generation"
 	else
-		${prefix}/bin/ssh-keygen -t dsa -f ${etcdir}/ssh/ssh_host_dsa_key -N ''
+		/usr/bin/ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
 	fi
 
-	if [ -f ${etcdir}/ssh/ssh_host_rsa_key ]; then
+	if [ -f /etc/ssh/ssh_host_rsa_key ]; then
 		echo "You already have a RSA host key" \
-		    "in ${etcdir}/ssh/ssh_host_rsa_key"
+		    "in /etc/ssh/ssh_host_rsa_key"
 		echo "Skipping protocol version 2 RSA Key Generation"
 	else
-		${prefix}/bin/ssh-keygen -t rsa -f ${etcdir}/ssh/ssh_host_rsa_key -N ''
+		/usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
 	fi
 	)
 }
 
 sshd_precmd()
 {
-	if [ ! -f ${etcdir}/ssh/ssh_host_key -o \
-	    ! -f ${etcdir}/ssh/ssh_host_dsa_key -o \
-	    ! -f ${etcdir}/ssh/ssh_host_rsa_key ]; then
+	if [ ! -f /etc/ssh/ssh_host_key -o \
+	    ! -f /etc/ssh/ssh_host_dsa_key -o \
+	    ! -f /etc/ssh/ssh_host_rsa_key ]; then
 		user_reseed
 		run_rc_command keygen
 	fi
 }
 
+load_rc_config $name
 run_rc_command "$1"

==== //depot/projects/arm/src/etc/rc.d/ypxfrd#2 (text+ko) ====

@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ypxfrd,v 1.6 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ypxfrd,v 1.7 2006/08/22 14:58:23 flz Exp $
 #
 
 # PROVIDE: ypxfrd
-# REQUIRE: rpcbind
+# REQUIRE: rpcbind ypserv
 
 . /etc/rc.subr
 

==== //depot/projects/arm/src/etc/rc.initdiskless#2 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.initdiskless,v 1.49 2006/01/11 21:59:30 brooks Exp $
+# $FreeBSD: src/etc/rc.initdiskless,v 1.50 2006/08/22 16:21:16 ru Exp $
 
 # On entry to this script the entire system consists of a read-only root
 # mounted via NFS. The kernel has run BOOTP and configured an interface
@@ -99,19 +99,19 @@
 #
 # You will almost universally want to create the following files under /conf
 #
-# File				Content
-# ----------------------------	------------------------------------------
-# /conf/base/etc/md_size	size of /etc filesystem
-# /conf/base/diskless_remount	"/etc"
-# /conf/default/etc/rc.conf	generic diskless config parameters
-# /conf/default/etc/fstab	generic diskless fstab e.g. like this
+# File					Content
+# ----------------------------		----------------------------------
+# /conf/base/etc/md_size		size of /etc filesystem
+# /conf/base/etc/diskless_remount	"/etc"
+# /conf/default/etc/rc.conf		generic diskless config parameters
+# /conf/default/etc/fstab		generic diskless fstab e.g. like this
 #
-#	foo:/root_part		/	nfs	ro		0 0
-#	foo:/usr_part		/usr	nfs     ro		0 0
-#	foo:/home_part		/home   nfs     rw      	0 0
-#	md			/tmp	mfs     -s=30m,rw	0 0
-#	md			/var	mfs	-s=30m,rw	0 0
-#	proc			/proc	procfs	rw		0 0
+#	foo:/root_part			/	nfs	ro		0 0
+#	foo:/usr_part			/usr	nfs     ro		0 0
+#	foo:/home_part			/home   nfs     rw      	0 0
+#	md				/tmp	mfs     -s=30m,rw	0 0
+#	md				/var	mfs	-s=30m,rw	0 0
+#	proc				/proc	procfs	rw		0 0
 #
 # plus, possibly, overrides for password files etc.
 #

==== //depot/projects/arm/src/etc/rc.subr#4 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: rc.subr,v 1.66 2006/04/01 10:05:50 he Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.67 2006/08/18 13:07:38 yar Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.68 2006/08/22 11:17:28 flz Exp $
 #
 # Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -506,6 +506,9 @@
 		;;
 	esac
 
+	eval _override_command=\$${name}_program
+	command=${command:+${_override_command:-$command}}
+
 	_keywords="start stop restart rcvar $extra_commands"
 	rc_pid=
 	_pidcmd=
@@ -873,8 +876,6 @@
 #
 load_rc_config()
 {
-	local _tmp
-
 	_name=$1
 	if [ -z "$_name" ]; then
 		err 3 'USAGE: load_rc_config name'
@@ -893,35 +894,9 @@
 		fi
 		_rc_conf_loaded=true
 	fi
-
-	eval _override_command=\$${name}_program
-	command=${command:+${_override_command:-$command}}
-	
-	if [ -z "${command}" ]; then
-		_tmp=`/bin/realpath $0`
-		prefix=${_tmp%/etc/rc.d/*}/
-	else
-		prefix=${command%/*bin/*}/
-	fi
-	if [ "${prefix}" = "/" -o "${prefix}" = "/usr/" ] ; then
-		etcdir="/etc"
-	else
-		etcdir="${prefix}etc"
-	fi
-
-	# XXX - Deprecated
-	if [ -f /etc/rc.conf.d/${_name} -a ${etcdir} != "/etc" ]; then
+	if [ -f /etc/rc.conf.d/"$_name" ]; then
 		debug "Sourcing /etc/rc.conf.d/${_name}"
-		warn "Warning: /etc/rc.conf.d/${_name} is deprecated, please use ${etcdir}/rc.conf.d/${_name} instead."
-		if [ -f ${etcdir}/rc.conf.d/${_name} ]; then
-			warn "Warning: Both /etc/rc.conf.d/${_name} and ${etcdir}/rc.conf.d/${_name} exist."
-		fi
-		. /etc/rc.conf.d/${_name}
-	fi
-
-	if [ -f ${etcdir}/rc.conf.d/${_name} ]; then
-		debug "Sourcing ${etcdir}/rc.conf.d/${_name}"
-		. ${etcdir}/rc.conf.d/${_name}
+		. /etc/rc.conf.d/"$_name"
 	fi
 
 	# XXX - Deprecated variable name support

==== //depot/projects/arm/src/gnu/usr.bin/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.88 2006/03/17 18:54:22 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.90 2006/08/24 15:46:29 marcel Exp $
 
 .include <bsd.own.mk>
 
@@ -24,14 +24,8 @@
 	sort \
 	${_texinfo}
  
-.if ${MACHINE_ARCH} == "powerpc"
-MK_GDB=	no	# not yet
-.endif
-
 .if ${MK_CXX} != "no"
-.if ${MACHINE_ARCH} != "powerpc"
 _gperf=		gperf
-.endif
 .if ${MK_GROFF} != "no"
 _groff=		groff
 .endif

==== //depot/projects/arm/src/gnu/usr.bin/binutils/libbfd/Makefile.powerpc#2 (text+ko) ====

@@ -1,4 +1,6 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.powerpc,v 1.8 2004/07/08 17:05:32 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.powerpc,v 1.9 2006/08/24 02:36:21 marcel Exp $
+
+ARCHS+=	rs6000
 
 DEFAULT_VECTOR=	bfd_elf32_powerpc_vec
 

==== //depot/projects/arm/src/gnu/usr.bin/gdb/Makefile#2 (text+ko) ====

@@ -1,5 +1,9 @@
-# $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.9 2004/07/25 05:32:50 marcel Exp $
+# $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.10 2006/08/24 02:44:58 marcel Exp $
+
+SUBDIR=	doc libgdb gdb gdbtui
 
-SUBDIR=	doc libgdb gdb gdbtui kgdb
+.if ${MACHINE_ARCH} != "powerpc"
+SUBDIR+= kgdb
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c,v 1.6 2005/09/28 07:40:27 peter Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c,v 1.7 2006/08/23 19:16:17 jhb Exp $");
 
 #include <sys/types.h>
 #include <machine/pcb.h>
@@ -149,15 +149,12 @@
 	*lvalp = not_lval;
 	*realnump = -1;
 
-	cache = kgdb_trgt_frame_cache(next_frame, this_cache);
-	if (cache->pc == 0)
-		return;
-
 	ofs = (regnum >= AMD64_RAX_REGNUM && regnum <= AMD64_EFLAGS_REGNUM + 2)
 	    ? kgdb_trgt_frame_offset[regnum] : -1;
 	if (ofs == -1)
 		return;
 
+	cache = kgdb_trgt_frame_cache(next_frame, this_cache);
 	*addrp = cache->sp + ofs;
 	*lvalp = lval_memory;
 	target_read_memory(*addrp, valuep, regsz);
@@ -176,8 +173,6 @@
 	CORE_ADDR pc;
 
 	pc = frame_pc_unwind(next_frame);
-	if (pc == 0)
-		return (&kgdb_trgt_trapframe_unwind);
 	pname = NULL;
 	find_pc_partial_function(pc, &pname, NULL, NULL);
 	if (pname == NULL)

==== //depot/projects/arm/src/lib/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.215 2006/08/04 17:56:31 marcel Exp $
+# $FreeBSD: src/lib/Makefile,v 1.217 2006/08/22 07:51:06 ru Exp $
 
 .include <bsd.own.mk>
 
@@ -30,7 +30,7 @@
 	libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \
 	libcalendar libcam libcompat libdevinfo libdevstat libdisk \
 	libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \
-	libgssapi ${_libio} libipsec \
+	libgssapi libipsec \
 	${_libipx} libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \
 	${_libncp} ${_libngatm} libopie libpam libpanel libpcap \
 	libpmc ${_libpthread} librt ${_libsdp} ${_libsm} ${_libsmb} \
@@ -72,15 +72,15 @@
 _libvgl=	libvgl
 .endif
 
+.if ${MACHINE_ARCH} == "ia64"
+_libsmb=	libsmb
+.endif
+
 .if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "ia64" && \
     ${MACHINE_ARCH} != "powerpc" && ${MK_LIBC_R} != "no"
 _libc_r=
 .endif
 
-.if ${MACHINE_ARCH} == "alpha"
-_libio=		libio
-.endif
-
 .if ${MK_SENDMAIL} != "no"
 _libmilter=	libmilter
 _libsm=		libsm

==== //depot/projects/arm/src/lib/libc/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.67 2006/05/22 05:12:44 ache Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.68 2006/08/22 07:55:13 ru Exp $
 
 SHLIBDIR?= /lib
 
@@ -41,8 +41,7 @@
 .include "${.CURDIR}/net/Makefile.inc"
 .include "${.CURDIR}/nls/Makefile.inc"
 .include "${.CURDIR}/posix1e/Makefile.inc"
-.if ${MACHINE_ARCH} != "alpha" && \
-    ${MACHINE_ARCH} != "amd64" && \
+.if ${MACHINE_ARCH} != "amd64" && \
     ${MACHINE_ARCH} != "ia64" && \
     ${MACHINE_ARCH} != "sparc64"
 .include "${.CURDIR}/quad/Makefile.inc"

==== //depot/projects/arm/src/lib/libc/stdio/findfp.c#2 (text+ko) ====

@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)findfp.c	8.2 (Berkeley) 1/4/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/findfp.c,v 1.29 2004/05/22 15:19:41 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/findfp.c,v 1.30 2006/08/22 07:55:15 ru Exp $");
 
 #include <sys/param.h>
 #include <machine/atomic.h>
@@ -86,7 +86,7 @@
  * with future versions of libc.  Or rather it allows us to work with
  * libraries that have been built with a newer libc that defines these
  * symbols and expects libc to provide them.  We only have need to support
- * i386 and alpha because they are the only "old" systems we have deployed.
+ * i386 because it is the only "old" system we have deployed.
  */
 FILE *__stdinp = &__sF[0];
 FILE *__stdoutp = &__sF[1];

==== //depot/projects/arm/src/lib/libc_r/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc_r/Makefile,v 1.44 2006/04/12 19:51:14 ru Exp $
+# $FreeBSD: src/lib/libc_r/Makefile,v 1.45 2006/08/22 07:51:07 ru Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -25,7 +25,7 @@
 .include "${.CURDIR}/uthread/Makefile.inc"
 .include "${.CURDIR}/sys/Makefile.inc"
 
-.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE_ARCH} == "sparc64"
 SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
 .if !defined(NO_PIC)
 SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so

==== //depot/projects/arm/src/lib/libpthread/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libpthread/Makefile,v 1.58 2006/04/12 19:42:20 ru Exp $
+# $FreeBSD: src/lib/libpthread/Makefile,v 1.59 2006/08/22 07:51:07 ru Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -7,7 +7,7 @@
 # To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS
 # (for system call stubs) to CFLAGS below.  -DSYSLIBC_SCCS affects just the
 # system call stubs.
-.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE_ARCH} == "sparc64"
 LIB=kse
 .else
 LIB=pthread

==== //depot/projects/arm/src/lib/libstand/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libstand/Makefile,v 1.55 2005/07/15 12:29:31 ache Exp $
+# $FreeBSD: src/lib/libstand/Makefile,v 1.56 2006/08/22 08:03:01 ru Exp $
 # Originally from	$NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $
 #
 # Notes:
@@ -15,9 +15,6 @@
 CFLAGS+= -ffreestanding -Wformat
 CFLAGS+= -I${.CURDIR}
 
-.if ${MACHINE_ARCH} == "alpha"
-CFLAGS+=	-mno-fp-regs
-.endif
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
 CFLAGS+=	-mpreferred-stack-boundary=2
 CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2
@@ -57,53 +54,6 @@
         strcmp.c strcpy.c strcspn.c strlen.c strncat.c strncmp.c strncpy.c \
 	strpbrk.c strrchr.c strsep.c strspn.c strstr.c strtok.c swab.c
 .endif
-.if ${MACHINE_ARCH} == "alpha"
-.PATH: ${.CURDIR}/../libc/alpha/string
-SRCS+=	bcmp.c bcopy.S bzero.S ffs.S index.c memccpy.c memchr.c memcmp.c \
-	memcpy.S memmove.S memset.c rindex.c strcat.c strchr.c \
-	strcmp.c strcpy.c strcspn.c strlen.c \
-	strncat.c strncmp.c strncpy.c strpbrk.c strrchr.c strsep.c \
-	strspn.c strstr.c strtok.c swab.c
-
-SRCS+= __divqu.S __divq.S __divlu.S __divl.S
-SRCS+= __remqu.S __remq.S __remlu.S __reml.S
-
-CLEANFILES+=   __divqu.S __divq.S __divlu.S __divl.S
-CLEANFILES+=   __remqu.S __remq.S __remlu.S __reml.S
-
-
-__divqu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
-	m4 -DNAME=__divqu -DOP=div -DS=false -DWORDSIZE=64 \
-		${.ALLSRC} > ${.TARGET}
-
-__divq.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
-	m4 -DNAME=__divq -DOP=div -DS=true -DWORDSIZE=64 \
-		${.ALLSRC} > ${.TARGET}
-
-__divlu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
-	m4 -DNAME=__divlu -DOP=div -DS=false -DWORDSIZE=32 \
-		${.ALLSRC} > ${.TARGET}
-
-__divl.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
-	m4 -DNAME=__divl -DOP=div -DS=true -DWORDSIZE=32 \
-		${.ALLSRC} > ${.TARGET}
-
-__remqu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
-	m4 -DNAME=__remqu -DOP=rem -DS=false -DWORDSIZE=64 \
-		${.ALLSRC} > ${.TARGET}
-
-__remq.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
-	m4 -DNAME=__remq -DOP=rem -DS=true -DWORDSIZE=64 \
-		${.ALLSRC} > ${.TARGET}
-
-__remlu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
-	m4 -DNAME=__remlu -DOP=rem -DS=false -DWORDSIZE=32 \
-		${.ALLSRC} > ${.TARGET}
-
-__reml.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
-	m4 -DNAME=__reml -DOP=rem -DS=true -DWORDSIZE=32 \
-		${.ALLSRC} > ${.TARGET}
-.endif
 .if ${MACHINE_ARCH} == "ia64"
 .PATH: ${.CURDIR}/../libc/ia64/string
 SRCS+=	bcmp.c bcopy.S bzero.S ffs.S index.c memccpy.c memchr.c memcmp.c \

==== //depot/projects/arm/src/lib/libthr/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libthr/Makefile,v 1.19 2006/04/12 19:42:20 ru Exp $
+# $FreeBSD: src/lib/libthr/Makefile,v 1.20 2006/08/22 07:51:06 ru Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -8,7 +8,7 @@
 # (for system call stubs) to CFLAGS below.  -DSYSLIBC_SCCS affects just the
 # system call stubs.
 
-.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE_ARCH} == "sparc64"
 SHLIBDIR?= /lib
 .endif
 
@@ -42,7 +42,7 @@
 .include "${.CURDIR}/sys/Makefile.inc"
 .include "${.CURDIR}/thread/Makefile.inc"
 
-.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE_ARCH} == "sparc64"
 SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
 .if !defined(NO_PIC)
 SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so

==== //depot/projects/arm/src/lib/libutil/login.conf.5#2 (text+ko) ====

@@ -17,9 +17,9 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD: src/lib/libutil/login.conf.5,v 1.57 2006/04/19 17:46:27 brueffer Exp $
+.\" $FreeBSD: src/lib/libutil/login.conf.5,v 1.58 2006/08/23 09:54:46 yar Exp $
 .\"
-.Dd April 19, 2006
+.Dd August 23, 2006
 .Dt LOGIN.CONF 5
 .Os
 .Sh NAME
@@ -373,6 +373,11 @@
 .It Sy "Name	Type	Notes	Description
 .It "accounted	bool	false	Enable session time accounting for all users
 in this class.
+.It "auth	list	passwd	Allowed authentication styles.
+The first item is the default style.
+.It "auth-" Ns Ar type Ta "list		Allowed authentication styles for the
+authentication
+.Ar type .
 .It "autodelete	time		Time after expiry when account is auto-deleted.
 .It "bootfull	bool	false	Enable 'boot only if ttygroup is full' strategy
 when terminating sessions.

==== //depot/projects/arm/src/release/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.911 2006/06/09 03:40:04 cperciva Exp $
+# $FreeBSD: src/release/Makefile,v 1.912 2006/08/22 07:51:08 ru Exp $
 #
 # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
 #     [RELEASETAG=tag]
@@ -206,17 +206,6 @@
 MFSSIZE=		4320
 MFSINODE=		8000
 MFSLABEL=		minimum3
-.elif ${TARGET_ARCH} == "alpha"
-MAKE_FLOPPIES=		true
-FLOPPYSIZE=		1440
-FLOPPYSPLITSIZE=	1392
-FLOPPYINODE=		40000
-FLOPPYLABEL=		fd1440
-BOOTINODE=		80000
-MFSSIZE=		4320
-MFSINODE=		8000
-MFSLABEL=		auto
-SPLIT_MFSROOT=
 .elif ${TARGET_ARCH} == "sparc64"
 DISKLABEL=		sunlabel
 MFSSIZE=		4096

==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 (text+ko) ====

@@ -3,7 +3,7 @@
 
   <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.962 2006/08/21 00:59:40 bmah Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.964 2006/08/24 14:45:56 bmah Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -350,9 +350,9 @@
       implemented.</para>
 
     <para>&os; now runs on the Xbox, whose architecture is nearly identical
-      to the i386.  For details of the latest development,
-      see <ulink url="http://www.FreeBSD.org/platforms/xbox.html"></ulink>
-      and <ulink url="http://xbox-bsd.nl"></ulink>.</para>
+      to the i386.  For details of the latest development, see
+      <ulink url="http://www.FreeBSD.org/platforms/xbox.html"></ulink>.
+      &merged; </para>
 
     <sect3 id="boot">
       <title>Boot Loader Changes</title>
@@ -767,6 +767,13 @@
 	for example, by using <literal>tagged</literal>
 	rule option.  For more details, see &man.ipfw.8;.</para>
 
+      <para>The <literal>IPFIREWALL_FORWARD_EXTENDED</literal> kernel
+	option has been removed.  This option was used to permit
+	&man.ipfw.4; to redirect packets with local destinations.
+	This behavior is now always enabled when
+	the <literal>IPFIREWALL_FORWARD</literal> kernel option is
+	enabled. &merged;</para>
+
       <para>The ip6fw(8) packet filter has been removed.  Since &man.ipfw.4; has gained
         IPv6 support, it should be used instead.  Please note that some rules might need
         to be adjusted.</para>
@@ -1084,6 +1091,10 @@
       flag, which causes it to ignore files and directories with
       the <literal>nodump</literal> flag set. &merged;</para>
 
+    <para>The &man.fsdb.8; utility now supports changing the birth
+      time of files on UFS2 file systems using the new 
+      the <literal>btime</literal> command.</para>
+
     <para>The &man.find.1; program now supports <option>-Btime</option>
       and other related primaries, which can be used to create expressions
       based on a file's creation time. &merged;</para>
@@ -1557,7 +1568,7 @@
       &merged;</para>
 
     <para><application>IPFilter</application> has been updated from
-      4.1.8 to 4.1.13.</para>
+      4.1.8 to 4.1.13. &merged;</para>
 
     <para><application>less</application> has been updated from v381
       to v394.</para>
@@ -1570,10 +1581,7 @@
       &merged;</para>
 
     <para><application>sendmail</application> has been updated from
-      8.13.4 to 8.13.6. &merged;</para>
-
-    <para><application>sendmail</application> has been updated from
-      8.13.6 to 8.13.8.</para>
+      8.13.4 to 8.13.8. &merged;</para>
 
     <para>The timezone database has been updated from the
       <application>tzdata2005l</application> release to the

==== //depot/projects/arm/src/rescue/rescue/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-#$FreeBSD: src/rescue/rescue/Makefile,v 1.50 2006/04/10 09:32:50 ru Exp $
+#$FreeBSD: src/rescue/rescue/Makefile,v 1.51 2006/08/22 07:51:08 ru Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 
 NO_MAN=
@@ -163,10 +163,6 @@
 CRUNCH_PROGS_sbin+= sunlabel
 .endif
 
-.if ${MACHINE_ARCH} == "alpha"
-CRUNCH_ALIAS_bsdlabel= disklabel
-.endif
-
 .if ${MACHINE_ARCH} == "amd64"
 CRUNCH_PROGS_sbin+= fdisk
 CRUNCH_ALIAS_bsdlabel= disklabel

==== //depot/projects/arm/src/sbin/bsdlabel/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/17/94
-# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.19 2004/01/11 09:11:10 nyan Exp $
+# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.20 2006/08/22 07:51:09 ru Exp $
 
 .PATH: ${.CURDIR}/../../sys/geom
 
@@ -8,8 +8,7 @@
 #MAN=	bsdlabel.5
 MAN+=	bsdlabel.8
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
 LINKS=	${BINDIR}/bsdlabel ${BINDIR}/disklabel
 MLINKS=	bsdlabel.8 disklabel.8
 .endif

==== //depot/projects/arm/src/sbin/fsdb/fsdb.8#2 (text+ko) ====


>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list