From owner-p4-projects@FreeBSD.ORG  Thu Oct 16 06:54:15 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5BBE0106568F; Thu, 16 Oct 2008 06:54:15 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1EDC910656A0
	for <perforce@FreeBSD.org>; Thu, 16 Oct 2008 06:54:15 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0BD3F8FC17
	for <perforce@FreeBSD.org>; Thu, 16 Oct 2008 06:54:15 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9G6sEuv081633
	for <perforce@FreeBSD.org>; Thu, 16 Oct 2008 06:54:14 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9G6sEW8081631
	for perforce@freebsd.org; Thu, 16 Oct 2008 06:54:14 GMT
	(envelope-from ed@FreeBSD.org)
Date: Thu, 16 Oct 2008 06:54:14 GMT
Message-Id: <200810160654.m9G6sEW8081631@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten <ed@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 151440 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Oct 2008 06:54:15 -0000

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

Change 151440 by ed@ed_dull on 2008/10/16 06:53:42

	IFC yesterday's TTY changes.

Affected files ...

.. //depot/projects/mpsafetty/lib/libc/arm/gen/_setjmp.S#2 integrate
.. //depot/projects/mpsafetty/lib/libstand/Makefile#2 integrate
.. //depot/projects/mpsafetty/libexec/rtld-elf/mips/reloc.c#3 integrate
.. //depot/projects/mpsafetty/release/Makefile#3 integrate
.. //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate
.. //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate
.. //depot/projects/mpsafetty/release/scripts/package-trees.sh#2 integrate
.. //depot/projects/mpsafetty/sbin/fsck_ffs/pass5.c#2 integrate
.. //depot/projects/mpsafetty/sbin/ipfw/ipfw2.c#6 integrate
.. //depot/projects/mpsafetty/share/man/man4/ddb.4#9 integrate
.. //depot/projects/mpsafetty/share/man/man4/u3g.4#2 integrate
.. //depot/projects/mpsafetty/share/man/man4/ubsa.4#2 integrate
.. //depot/projects/mpsafetty/share/man/man4/umass.4#2 integrate
.. //depot/projects/mpsafetty/share/zoneinfo/Makefile#3 integrate
.. //depot/projects/mpsafetty/share/zoneinfo/africa#4 integrate
.. //depot/projects/mpsafetty/share/zoneinfo/asia#4 integrate
.. //depot/projects/mpsafetty/share/zoneinfo/southamerica#5 integrate
.. //depot/projects/mpsafetty/share/zoneinfo/zone.tab#3 integrate
.. //depot/projects/mpsafetty/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/mpsafetty/sys/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/arm/arm/cpufunc.c#2 integrate
.. //depot/projects/mpsafetty/sys/arm/arm/cpufunc_asm_feroceon.S#1 branch
.. //depot/projects/mpsafetty/sys/arm/arm/elf_machdep.c#3 integrate
.. //depot/projects/mpsafetty/sys/arm/arm/elf_trampoline.c#3 integrate
.. //depot/projects/mpsafetty/sys/arm/arm/genassym.c#2 integrate
.. //depot/projects/mpsafetty/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/mpsafetty/sys/arm/arm/locore.S#2 integrate
.. //depot/projects/mpsafetty/sys/arm/arm/pmap.c#3 integrate
.. //depot/projects/mpsafetty/sys/arm/arm/swtch.S#3 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/DB-78XXX#1 branch
.. //depot/projects/mpsafetty/sys/arm/conf/DB-88F5XXX#1 branch
.. //depot/projects/mpsafetty/sys/arm/conf/DB-88F6XXX#1 branch
.. //depot/projects/mpsafetty/sys/arm/include/armreg.h#2 integrate
.. //depot/projects/mpsafetty/sys/arm/include/bootinfo.h#1 branch
.. //depot/projects/mpsafetty/sys/arm/include/cpufunc.h#2 integrate
.. //depot/projects/mpsafetty/sys/arm/include/intr.h#3 integrate
.. //depot/projects/mpsafetty/sys/arm/include/metadata.h#2 integrate
.. //depot/projects/mpsafetty/sys/arm/include/resource.h#2 integrate
.. //depot/projects/mpsafetty/sys/arm/mv/bus_space.c#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/common.c#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/discovery/db78xxx.c#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/discovery/discovery.c#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/discovery/files.db78xxx#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/discovery/std.db78xxx#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/files.mv#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/gpio.c#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/ic.c#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/kirkwood/db88f6xxx.c#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/kirkwood/files.db88f6xxx#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/kirkwood/kirkwood.c#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/kirkwood/std.db88f6xxx#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/mv_machdep.c#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/mvreg.h#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/mvvar.h#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/obio.c#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/orion/db88f5xxx.c#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/orion/files.db88f5xxx#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/orion/orion.c#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/orion/std.db88f5xxx#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/rtc.c#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/std.mv#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/timer.c#1 branch
.. //depot/projects/mpsafetty/sys/arm/mv/twsi.c#1 branch
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/if_npe.c#2 integrate
.. //depot/projects/mpsafetty/sys/boot/Makefile#4 integrate
.. //depot/projects/mpsafetty/sys/boot/arm/Makefile#2 integrate
.. //depot/projects/mpsafetty/sys/boot/arm/uboot/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/boot/arm/uboot/conf.c#1 branch
.. //depot/projects/mpsafetty/sys/boot/arm/uboot/help.uboot#1 branch
.. //depot/projects/mpsafetty/sys/boot/arm/uboot/ldscript.arm#1 branch
.. //depot/projects/mpsafetty/sys/boot/arm/uboot/start.S#1 branch
.. //depot/projects/mpsafetty/sys/boot/arm/uboot/version#1 branch
.. //depot/projects/mpsafetty/sys/boot/common/Makefile.inc#2 integrate
.. //depot/projects/mpsafetty/sys/boot/common/load_elf.c#2 integrate
.. //depot/projects/mpsafetty/sys/boot/ficl/Makefile#2 integrate
.. //depot/projects/mpsafetty/sys/boot/ofw/libofw/ofw_disk.c#2 integrate
.. //depot/projects/mpsafetty/sys/boot/powerpc/Makefile#2 integrate
.. //depot/projects/mpsafetty/sys/boot/powerpc/boot1.chrp/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/boot/powerpc/boot1.chrp/Makefile.hfs#1 branch
.. //depot/projects/mpsafetty/sys/boot/powerpc/boot1.chrp/boot1.c#1 branch
.. //depot/projects/mpsafetty/sys/boot/powerpc/boot1.chrp/bootinfo.txt#1 branch
.. //depot/projects/mpsafetty/sys/boot/powerpc/boot1.chrp/generate-hfs.sh#1 branch
.. //depot/projects/mpsafetty/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu#1 branch
.. //depot/projects/mpsafetty/sys/boot/uboot/lib/glue.c#4 integrate
.. //depot/projects/mpsafetty/sys/compat/linux/linux_futex.c#2 integrate
.. //depot/projects/mpsafetty/sys/compat/linux/linux_futex.h#2 integrate
.. //depot/projects/mpsafetty/sys/conf/Makefile.arm#3 integrate
.. //depot/projects/mpsafetty/sys/conf/files.powerpc#4 integrate
.. //depot/projects/mpsafetty/sys/conf/ldscript.mips.cfe#2 integrate
.. //depot/projects/mpsafetty/sys/conf/options.arm#2 integrate
.. //depot/projects/mpsafetty/sys/dev/atkbdc/psm.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/bge/if_bge.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/bge/if_bgereg.h#2 integrate
.. //depot/projects/mpsafetty/sys/dev/bm/if_bm.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/ati_pcigart.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drmP.h#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_agpsupport.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_auth.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_bufs.c#5 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_context.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_dma.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_drawable.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_drv.c#6 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_fops.c#5 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_ioctl.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_irq.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_linux_list.h#2 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_memory.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_pci.c#5 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_pciids.h#3 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_scatter.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_sysctl.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/i915_drv.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/i915_irq.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/mach64_drv.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/mga_drv.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/r128_drv.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/radeon_cp.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/radeon_drv.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/radeon_drv.h#3 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/savage_drv.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/sis_drv.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/tdfx_drv.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/jme/if_jme.c#6 integrate
.. //depot/projects/mpsafetty/sys/dev/jme/if_jmereg.h#4 integrate
.. //depot/projects/mpsafetty/sys/dev/mge/if_mge.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/mge/if_mgevar.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/mmc/mmcsd.c#5 integrate
.. //depot/projects/mpsafetty/sys/dev/powermac_nvram/powermac_nvram.c#3 integrate
.. //depot/projects/mpsafetty/sys/dev/puc/pucdata.c#3 integrate
.. //depot/projects/mpsafetty/sys/dev/sound/pci/hda/hdac.c#6 integrate
.. //depot/projects/mpsafetty/sys/dev/sym/sym_hipd.c#3 integrate
.. //depot/projects/mpsafetty/sys/dev/uart/uart_bus_mbus.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/uart/uart_cpu_mv.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb/ehci.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/ehci_mbus.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb/ehcivar.h#3 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/u3g.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/ubsa.c#6 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/umass.c#6 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/usbdevs#13 integrate
.. //depot/projects/mpsafetty/sys/fs/portalfs/portal_vnops.c#5 integrate
.. //depot/projects/mpsafetty/sys/i386/linux/linux.h#2 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_descrip.c#5 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_exit.c#6 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_sig.c#4 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_thr.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_thread.c#5 integrate
.. //depot/projects/mpsafetty/sys/kern/sys_process.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/tty.c#53 integrate
.. //depot/projects/mpsafetty/sys/mips/conf/SENTRY5#3 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#12 integrate
.. //depot/projects/mpsafetty/sys/netinet6/ip6_output.c#5 integrate
.. //depot/projects/mpsafetty/sys/netinet6/udp6_usrreq.c#8 integrate
.. //depot/projects/mpsafetty/sys/nfsserver/nfs_serv.c#5 integrate
.. //depot/projects/mpsafetty/sys/powerpc/aim/nexus.c#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/aim/ofw_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/include/nexusvar.h#2 delete
.. //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_pci.c#2 delete
.. //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_pci.h#2 delete
.. //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_pcibus.c#1 branch
.. //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_syscons.c#4 integrate
.. //depot/projects/mpsafetty/sys/powerpc/powermac/ata_kauai.c#3 integrate
.. //depot/projects/mpsafetty/sys/powerpc/powermac/grackle.c#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/powermac/hrowpic.c#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/powermac/macio.c#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/powermac/openpic_macio.c#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/powermac/uninorth.c#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/powermac/uninorthvar.h#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/psim/iobus.c#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/psim/openpic_iobus.c#2 integrate
.. //depot/projects/mpsafetty/sys/sys/proc.h#8 integrate
.. //depot/projects/mpsafetty/sys/sys/tty.h#22 integrate
.. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_snapshot.c#4 integrate
.. //depot/projects/mpsafetty/usr.bin/tftp/extern.h#2 integrate
.. //depot/projects/mpsafetty/usr.bin/tftp/main.c#2 integrate
.. //depot/projects/mpsafetty/usr.bin/tftp/tftp.c#2 integrate
.. //depot/projects/mpsafetty/usr.bin/tftp/tftpsubs.c#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/config.c#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/globals.c#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/index.c#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/package.c#3 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/sysinstall.h#3 integrate

Differences ...

==== //depot/projects/mpsafetty/lib/libc/arm/gen/_setjmp.S#2 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/arm/gen/_setjmp.S,v 1.3 2004/11/09 16:49:14 cognet Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/_setjmp.S,v 1.4 2008/10/14 09:53:47 raj Exp $");
 
 /*
  * C library -- _setjmp, _longjmp
@@ -101,6 +101,10 @@
 
 	/* validation failed, die die die. */
 botch:
+#if !defined(_STANDALONE)
 	bl	PIC_SYM(_C_LABEL(longjmperror), PLT)
 	bl	PIC_SYM(_C_LABEL(abort), PLT)
 	b	. - 8		/* Cannot get here */
+#else
+	b	.
+#endif

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

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libstand/Makefile,v 1.62 2008/06/25 21:33:28 ru Exp $
+# $FreeBSD: src/lib/libstand/Makefile,v 1.63 2008/10/14 09:53:47 raj Exp $
 # Originally from	$NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $
 #
 # Notes:
@@ -32,6 +32,9 @@
 .if ${MACHINE_ARCH} == "amd64"
 CFLAGS+=	-m32 -I.
 .endif
+.if ${MACHINE_ARCH} == "arm"
+CFLAGS+=	-msoft-float -DSOFTFLOAT -D_STANDALONE
+.endif
 
 # standalone components and stuff we have modified locally
 SRCS+=	zutil.h __main.c assert.c bcd.c bswap.c environment.c getopt.c gets.c \
@@ -48,12 +51,17 @@
 # string functions from libc
 .PATH: ${.CURDIR}/../libc/string
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
-	${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "amd64"
+	${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "amd64" || \
+	${MACHINE_ARCH} == "arm"
 SRCS+=	bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \
         memcpy.c memmove.c memset.c qdivrem.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
 .endif
+.if ${MACHINE_ARCH} == "arm"
+.PATH: ${.CURDIR}/../libc/arm/gen
+SRCS+= divsi3.S
+.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/mpsafetty/libexec/rtld-elf/mips/reloc.c#3 (text+ko) ====

@@ -1,7 +1,36 @@
 /*	$NetBSD: mdreloc.c,v 1.23 2003/07/26 15:04:38 mrg Exp $	*/
+/*	$NetBSD: mips_reloc.c,v 1.53 2008/07/24 04:39:25 matt Exp $	*/
+
+/*
+ * Copyright 1997 Michael L. Hitch <mhitch@montana.edu>
+ * Portions copyright 2002 Charles M. Hannum <root@ihack.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/libexec/rtld-elf/mips/reloc.c,v 1.2 2008/10/10 05:10:10 imp Exp $");
+__FBSDID("$FreeBSD: src/libexec/rtld-elf/mips/reloc.c,v 1.3 2008/10/13 20:24:03 imp Exp $");
 #include <sys/param.h>
 #include <sys/mman.h>
 
@@ -35,21 +64,33 @@
 int open();
 int _open();
 
+/*
+ * It is possible for the compiler to emit relocations for unaligned data.
+ * We handle this situation with these inlines.
+ */
+#define	RELOC_ALIGNED_P(x) \
+	(((uintptr_t)(x) & (sizeof(void *) - 1)) == 0)
+
 static __inline Elf_Addr
 load_ptr(void *where)
 {
-	Elf_Addr res;
+	if (__predict_true(RELOC_ALIGNED_P(where)))
+		return *(Elf_Addr *)where;
+	else {
+		Elf_Addr res;
 
-	memcpy(&res, where, sizeof(res));
-
-	return (res);
+		(void)memcpy(&res, where, sizeof(res));
+		return res;
+	}
 }
 
-void
+static __inline void
 store_ptr(void *where, Elf_Addr val)
 {
-
-	memcpy(where, &val, sizeof(val));
+	if (__predict_true(RELOC_ALIGNED_P(where)))
+		*(Elf_Addr *)where = val;
+	else
+		(void)memcpy(where, &val, sizeof(val));
 }
 
 void
@@ -149,13 +190,6 @@
 }
 
 /*
- * It is possible for the compiler to emit relocations for unaligned data.
- * We handle this situation with these inlines.
- */
-#define	RELOC_ALIGNED_P(x) \
-	(((uintptr_t)(x) & (sizeof(void *) - 1)) == 0)
-
-/*
  * Process non-PLT relocations
  */
 int

==== //depot/projects/mpsafetty/release/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.934 2008/10/12 02:52:56 kensmith Exp $
+# $FreeBSD: src/release/Makefile,v 1.935 2008/10/14 02:13:12 kensmith Exp $
 #
 # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
 #     [RELEASETAG=tag]
@@ -265,7 +265,7 @@
 CD_DISC1=		${CD}/disc1
 CD_DISC2=		${CD}/disc2
 .if defined(MAKE_DVD)
-CD_DVD=			${CD}/dvd
+CD_DVD1=		${CD}/dvd1
 .endif
 .if !defined(NODOC)
 CD_DOCS=		${CD}/docs
@@ -930,13 +930,13 @@
 	done
 .if defined(MAKE_DVD)
 	@echo "Building DVD filesystem image as well as CDROM"
-	@mkdir -p ${CD_DVD}/${BUILDNAME}
+	@mkdir -p ${CD_DVD1}/${BUILDNAME}
 	@for i in ${DISTRIBUTIONS} ; \
 	do \
 		if [ -d ${RD}/trees/$${i} ] ; then \
 			chflags -R noschg ${RD}/trees/$${i} || true ; \
 			( cd ${RD}/trees/$${i} && \
-			    find . -depth -print | cpio -dumpl ${CD_DVD} ) ; \
+			    find . -depth -print | cpio -dumpl ${CD_DVD1} ) ; \
 		fi \
 	done
 .endif
@@ -958,21 +958,21 @@
 	@cp ${RD}/trees/base/boot/device.hints ${CD_LIVEFS}/boot/device.hints
 .endif
 .if defined(MAKE_DVD)
-	@cp -Rp ${RD}/kernels/GENERIC/ ${CD_DVD}/boot/kernel
-	@rm -f ${CD_DVD}/boot/kernel/*.symbols
-	@rm -f ${CD_DVD}/.profile
-	@cp ${.CURDIR}/fixit.profile ${CD_DVD}/.profile
-	@ln -sf /rescue ${CD_DVD}/stand
+	@cp -Rp ${RD}/kernels/GENERIC/ ${CD_DVD1}/boot/kernel
+	@rm -f ${CD_DVD1}/boot/kernel/*.symbols
+	@rm -f ${CD_DVD1}/.profile
+	@cp ${.CURDIR}/fixit.profile ${CD_DVD1}/.profile
+	@ln -sf /rescue ${CD_DVD1}/stand
 	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf
-	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD}/cdrom.inf
-	@rm -f ${CD_DVD}/boot/loader.conf
-	@cp ${RD}/mfsroot/mfsroot.gz ${CD_DVD}/boot/mfsroot.gz
-	@echo 'mfsroot_load="YES"' > ${CD_DVD}/boot/loader.conf
-	@echo 'mfsroot_type="mfs_root"' >> ${CD_DVD}/boot/loader.conf
-	@echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DVD}/boot/loader.conf
+	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD1}/cdrom.inf
+	@rm -f ${CD_DVD1}/boot/loader.conf
+	@cp ${RD}/mfsroot/mfsroot.gz ${CD_DVD1}/boot/mfsroot.gz
+	@echo 'mfsroot_load="YES"' > ${CD_DVD1}/boot/loader.conf
+	@echo 'mfsroot_type="mfs_root"' >> ${CD_DVD1}/boot/loader.conf
+	@echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DVD1}/boot/loader.conf
 .if exists(${RD}/trees/base/boot/device.hints)
-	@rm -f ${CD_DVD}/boot/device.hints
-	@cp ${RD}/trees/base/boot/device.hints ${CD_DVD}/boot/device.hints
+	@rm -f ${CD_DVD1}/boot/device.hints
+	@cp ${RD}/trees/base/boot/device.hints ${CD_DVD1}/boot/device.hints
 .endif
 .endif
 	touch ${.TARGET}
@@ -1011,26 +1011,26 @@
 	@echo "CD_VOLUME = 2" >> ${CD_DISC2}/cdrom.inf
 .if defined(MAKE_DVD)
 .if defined(MAKE_FLOPPIES)
-	@cd ${RD} && find floppies -print | cpio -dumpl ${CD_DVD}
+	@cd ${RD} && find floppies -print | cpio -dumpl ${CD_DVD1}
 .endif
-	@cd ${RD}/dists && find . -print | cpio -dumpl ${CD_DVD}/${BUILDNAME}
+	@cd ${RD}/dists && find . -print | cpio -dumpl ${CD_DVD1}/${BUILDNAME}
 .if !defined(NODOC)
 	@for i in ${DIST_DOCS_ARCH_INDEP}; do \
 	  cp ${RND}/${RELNOTES_LANG}/$$i/article.txt \
-	      ${CD_DVD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
+	      ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
 	  cp ${RND}/${RELNOTES_LANG}/$$i/article.html \
-	      ${CD_DVD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
+	      ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
 	done
 	@for i in ${DIST_DOCS_ARCH_DEP}; do \
 	  cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.txt \
-	      ${CD_DVD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
+	      ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
 	  cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.html \
-	      ${CD_DVD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
+	      ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
 	done
-	@cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${CD_DVD}
+	@cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${CD_DVD1}
 .endif
-	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD}/cdrom.inf
-	@echo "CD_VOLUME = 1" >> ${CD_DVD}/cdrom.inf
+	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD1}/cdrom.inf
+	@echo "CD_VOLUME = 1" >> ${CD_DVD1}/cdrom.inf
 .endif
 .if !defined(NODOC)
 	echo "Building CDROM docs filesystem image"
@@ -1038,7 +1038,7 @@
 	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DOCS}/cdrom.inf
 	@mkdir -p ${CD_DOCS}/usr/share/doc
 .if defined(MAKE_DVD)
-	@mkdir -p ${CD_DVD}/usr/share/doc
+	@mkdir -p ${CD_DVD1}/usr/share/doc
 .endif
 	@for i in `ls ${CD_LIVEFS}/usr/share/doc`; do \
 		if [ -L ${CD_LIVEFS}/usr/share/doc/$$i -o \
@@ -1049,7 +1049,7 @@
 	done
 .if defined(MAKE_DVD)
 	@cd ${CD_DOCS}/usr/share/doc && find . -print | \
-	    cpio -dumpl ${CD_DVD}/usr/share/doc
+	    cpio -dumpl ${CD_DVD1}/usr/share/doc
 .endif
 .endif
 	touch ${.TARGET}
@@ -1081,8 +1081,8 @@
 .if exists(${CD_PACKAGE_TREE}/disc2)
 CD_DISC2_PKGS=	${CD_PACKAGE_TREE}/disc2
 .endif
-.if exists(${CD_PACKAGE_TREE}/dvd)
-CD_DVD_PKGS=	${CD_PACKAGE_TREE}/dvd
+.if exists(${CD_PACKAGE_TREE}/dvd1)
+CD_DVD1_PKGS=	${CD_PACKAGE_TREE}/dvd1
 .endif
 .endif
 .endif
@@ -1106,8 +1106,8 @@
 .if defined(MAKE_DVD)
 	@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
 	    FreeBSD_Install \
-	    ${CD}/${BUILDNAME}-${TARGET}-dvd.iso ${CD_DVD} \
-	    ${CD_DVD_PKGS}
+	    ${CD}/${BUILDNAME}-${TARGET}-dvd1.iso ${CD_DVD1} \
+	    ${CD_DVD1_PKGS}
 .endif
 .if !defined(NODOC)
 	@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \

==== //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 (text+ko) ====

@@ -17,7 +17,7 @@
 
     <corpauthor>The &os; Documentation Project</corpauthor>
 
-    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.339 2008/10/06 21:52:11 simon Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.340 2008/10/13 21:02:19 brueffer Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
@@ -822,6 +822,13 @@
 	2200BG/2915ABG MiniPCI and 2225BG PCI network adapters
 	(&man.iwi.4; driver)</para>
 
+      <para>[&arch.i386;, &arch.amd64;] Intel Wireless WiFi Link
+	4965AGN IEEE 802.11n PCI network adapters
+	(&man.iwn.4; driver)</para>
+
+      <para>[&arch.i386;, &arch.amd64;] Marvell Libertas IEEE 802.11b/g
+        PCI network adapters (&man.malo.4; driver)</para>
+
       &hwlist.ral;
 
       <para>[&arch.i386;, &arch.pc98;] Raytheon Raylink 2.4GHz

==== //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 (text+ko) ====

@@ -17,7 +17,7 @@
 
   <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1094 2008/10/08 16:46:36 hrs Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1095 2008/10/15 12:02:32 edwin Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -455,8 +455,8 @@
       8.14.1 to 8.14.3.</para>
 
     <para role="merged">The timezone database has been updated from
-      the <application>tzdata2007h</application> release to
-      the <application>tzdata2008b</application> release.</para>
+      the <application>tzdata2008b</application> release to
+      the <application>tzdata2008h</application> release.</para>
 
     <para><application>WPA Supplicant</application> has been
       updated from 0.5.8 to 0.5.10.</para>

==== //depot/projects/mpsafetty/release/scripts/package-trees.sh#2 (text+ko) ====

@@ -5,9 +5,9 @@
 # contains the master INDEX, it's assigned list of packages, and the
 # appropriate tree of category symlinks.
 #
-# Usage: package-tress.sh <copy method> <INDEX> <package tree> <destination>
+# Usage: package-trees.sh <copy method> <INDEX> <package tree> <destination>
 #
-# $FreeBSD: src/release/scripts/package-trees.sh,v 1.2 2005/05/03 04:19:07 marcel Exp $
+# $FreeBSD: src/release/scripts/package-trees.sh,v 1.3 2008/10/13 17:42:21 kensmith Exp $
 
 # Verify the command line
 if [ $# -ne 4 ]; then

==== //depot/projects/mpsafetty/sbin/fsck_ffs/pass5.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass5.c,v 1.43 2006/10/31 22:06:56 pjd Exp $");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass5.c,v 1.45 2008/10/13 14:01:05 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
@@ -48,7 +48,7 @@
 
 #include "fsck.h"
 
-static void check_maps(u_char *, u_char *, int, int, const char *, int *, int, int);
+static void check_maps(u_char *, u_char *, int, ufs2_daddr_t, const char *, int *, int, int);
 
 void
 pass5(void)
@@ -291,10 +291,17 @@
 				sump[run]++;
 			}
 		}
-		cstotal.cs_nffree += newcg->cg_cs.cs_nffree;
-		cstotal.cs_nbfree += newcg->cg_cs.cs_nbfree;
-		cstotal.cs_nifree += newcg->cg_cs.cs_nifree;
-		cstotal.cs_ndir += newcg->cg_cs.cs_ndir;
+		if (bkgrdflag != 0) {
+			cstotal.cs_nffree += cg->cg_cs.cs_nffree;
+			cstotal.cs_nbfree += cg->cg_cs.cs_nbfree;
+			cstotal.cs_nifree += cg->cg_cs.cs_nifree;
+			cstotal.cs_ndir += cg->cg_cs.cs_ndir;
+		} else {
+			cstotal.cs_nffree += newcg->cg_cs.cs_nffree;
+			cstotal.cs_nbfree += newcg->cg_cs.cs_nbfree;
+			cstotal.cs_nifree += newcg->cg_cs.cs_nifree;
+			cstotal.cs_ndir += newcg->cg_cs.cs_ndir;
+		}
 		cs = &fs->fs_cs(fs, c);
 		if (cursnapshot == 0 &&
 		    memcmp(&newcg->cg_cs, cs, sizeof *cs) != 0 &&
@@ -321,13 +328,17 @@
 			}
 			if (excessdirs > 0)
 				check_maps(cg_inosused(newcg), cg_inosused(cg),
-				    inomapsize, cg->cg_cgx * fs->fs_ipg, "DIR",
+				    inomapsize,
+				    cg->cg_cgx * (ufs2_daddr_t) fs->fs_ipg,
+				    "DIR",
 				    freedirs, 0, excessdirs);
 			check_maps(cg_inosused(newcg), cg_inosused(cg),
-			    inomapsize, cg->cg_cgx * fs->fs_ipg, "FILE",
+			    inomapsize,
+			    cg->cg_cgx * (ufs2_daddr_t) fs->fs_ipg, "FILE",
 			    freefiles, excessdirs, fs->fs_ipg);
 			check_maps(cg_blksfree(cg), cg_blksfree(newcg),
-			    blkmapsize, cg->cg_cgx * fs->fs_fpg, "FRAG",
+			    blkmapsize,
+			    cg->cg_cgx * (ufs2_daddr_t) fs->fs_fpg, "FRAG",
 			    freeblks, 0, fs->fs_fpg);
 		}
 		if (cursnapshot == 0 &&
@@ -407,7 +418,7 @@
 	u_char *map1,	/* map of claimed allocations */
 	u_char *map2,	/* map of determined allocations */
 	int mapsize,	/* size of above two maps */
-	int startvalue,	/* resource value for first element in map */
+	ufs2_daddr_t startvalue, /* resource value for first element in map */
 	const char *name,	/* name of resource found in maps */
 	int *opcode,	/* sysctl opcode to free resource */
 	int skip,	/* number of entries to skip before starting to free */
@@ -415,8 +426,8 @@
 {
 #	define BUFSIZE 16
 	char buf[BUFSIZE];
-	long i, j, k, l, m, n, size;
-	int astart, aend, ustart, uend;
+	long i, j, k, l, m, size;
+	ufs2_daddr_t n, astart, aend, ustart, uend;
 	void (*msg)(const char *fmt, ...);
 
 	if (bkgrdflag)
@@ -443,10 +454,12 @@
 					continue;
 				}
 				if (astart == aend)
-					(*msg)("ALLOCATED %s %d MARKED FREE\n",
+					(*msg)("ALLOCATED %s %" PRId64
+					    " MARKED FREE\n",
 					    name, astart);
 				else
-					(*msg)("%s %sS %d-%d MARKED FREE\n",
+					(*msg)("%s %sS %" PRId64 "-%" PRId64
+					    " MARKED FREE\n",
 					    "ALLOCATED", name, astart, aend);
 				astart = aend = n;
 			} else {
@@ -472,10 +485,12 @@
 				if (size > limit)
 					size = limit;
 				if (debug && size == 1)
-					pwarn("%s %s %d MARKED USED\n",
+					pwarn("%s %s %" PRId64
+					    " MARKED USED\n",
 					    "UNALLOCATED", name, ustart);
 				else if (debug)
-					pwarn("%s %sS %d-%ld MARKED USED\n",
+					pwarn("%s %sS %" PRId64 "-%" PRId64
+					    " MARKED USED\n",
 					    "UNALLOCATED", name, ustart,
 					    ustart + size - 1);
 				if (bkgrdflag != 0) {
@@ -497,9 +512,11 @@
 	}
 	if (astart != -1) {
 		if (astart == aend)
-			(*msg)("ALLOCATED %s %d MARKED FREE\n", name, astart);
+			(*msg)("ALLOCATED %s %" PRId64
+			    " MARKED FREE\n", name, astart);
 		else
-			(*msg)("ALLOCATED %sS %d-%d MARKED FREE\n",
+			(*msg)("ALLOCATED %sS %" PRId64 "-%" PRId64
+			    " MARKED FREE\n",
 			    name, astart, aend);
 	}
 	if (ustart != -1) {
@@ -514,10 +531,12 @@
 			size = limit;
 		if (debug) {
 			if (size == 1)
-				pwarn("UNALLOCATED %s %d MARKED USED\n",
+				pwarn("UNALLOCATED %s %" PRId64
+				    " MARKED USED\n",
 				    name, ustart);
 			else
-				pwarn("UNALLOCATED %sS %d-%ld MARKED USED\n",
+				pwarn("UNALLOCATED %sS %" PRId64 "-%" PRId64
+				    " MARKED USED\n",
 				    name, ustart, ustart + size - 1);
 		}
 		if (bkgrdflag != 0) {

==== //depot/projects/mpsafetty/sbin/ipfw/ipfw2.c#6 (text+ko) ====

@@ -17,7 +17,7 @@
  *
  * NEW command line interface for IP firewall facility
  *
- * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.130 2008/09/27 15:58:54 rik Exp $
+ * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.132 2008/10/14 17:59:39 maxim Exp $
  */
 
 #include <sys/param.h>
@@ -6035,6 +6035,9 @@
 	lrule = IPFW_DEFAULT_RULE; /* max ipfw rule number */
 	ac--; av++;
 
+	if (test_only)
+		return;
+
 	/* Parse parameters. */
 	for (cmd = IP_FW_NAT_GET_LOG, do_cfg = 0; ac != 0; ac--, av++) {
 		if (!strncmp(av[0], "config", strlen(av[0]))) {

==== //depot/projects/mpsafetty/share/man/man4/ddb.4#9 (text+ko) ====

@@ -58,7 +58,7 @@
 .\" 	Created.
 .\" 	[90/08/30            dbg]
 .\"
-.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.59 2008/10/04 14:12:09 simon Exp $
+.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.60 2008/10/15 16:58:35 ed Exp $
 .\"
 .Dd October 4, 2008
 .Dt DDB 4
@@ -540,6 +540,13 @@
 addresses for the process and not show other information.
 .\"
 .Pp
+.It Ic show Cm all ttys
+Show all TTY's within the system.
+Output is similar to
+.Xr pstat 8 ,
+but also includes the address of the TTY structure.
+.\"
+.Pp
 .It Ic show Cm allchains
 Show the same information like "show lockchain" does, but
 for every thread in the system.
@@ -963,10 +970,8 @@
 .El
 .\"
 .Pp
-.It Ic show Cm ttys
-Show all TTY's within the system.
-Output is similar to
-.Xr pstat 8 .
+.It Ic show Cm tty Ar addr
+Display the contents of a TTY structure in a readable form.
 .\"
 .Pp
 .It Ic show Cm turnstile Ar addr

==== //depot/projects/mpsafetty/share/man/man4/u3g.4#2 (text+ko) ====

@@ -16,7 +16,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.2 2008/10/10 06:26:37 n_hibma Exp $
+.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.5 2008/10/15 21:47:01 n_hibma Exp $
 .\"
 .Dd October 7, 2008
 .Dt U3G 4
@@ -66,35 +66,46 @@
 .It
 Vodafone Mobile Connect Card 3G
 .It
+Qualcomm Inc. CDMA MSM
+.It
 Huawei E220 (E270?)
 .It
 Huawei Mobile
+.It
+Novatal MC950D
+.It
+Sierra cards
 .El
+(See /sys/dev/u3g.c for the complete list of supported cards for each vendor
+mentioned above).
 .Pp
 The supported 3G cards provide the necessary modem port for ppp,
 pppd, or mpd connections as well as extra ports (depending on the specific
 device) to provide other functions (diagnostic port, SIM toolkit port)
+.Pp
+In some of these devices a mass storage device supported by the 
+.Xr umass 4
+driver is present which contains Windows and Mac OSX drivers. This device is
+hidden, unless the machine was booted in verbose (see
+.Xr boot 8 ).
 .Sh SEE ALSO
 .Xr tty 4 ,
 .Xr ucom 4 ,
 .Xr usb 4 ,
-.Xr ubsa 4
 .Sh HISTORY
 The
 .Nm
 driver
 appeared in
-.Fx 8.0 .
-The
-.Xr ubsa 4
-manual page was modified for
-.Nm
-by
+.Fx 8.0 ,
+is based on the uark driver, and written by
 .An Andrea Guzzo Aq aguzzo@anywi.com
 in September 2008.
 .Sh AUTHORS
 The
 .Nm
 driver was written by
-.An Andrea Guzzo Aq aguzzo@anywi.com .
+.An Andrea Guzzo Aq aguzzo@anywi.com
+and
+.An Nick Hibma Aq n_hibma@freebsd.org .
 Hardware for testing provided by AnyWi Technologies, Leiden, NL.

==== //depot/projects/mpsafetty/share/man/man4/ubsa.4#2 (text+ko) ====

@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ubsa.4,v 1.13 2008/06/18 20:50:30 attilio Exp $
+.\" $FreeBSD: src/share/man/man4/ubsa.4,v 1.14 2008/10/13 20:43:08 n_hibma Exp $
 .\"
 .Dd March 28, 2008
 .Dt UBSA 4
@@ -85,28 +85,8 @@
 .It
 GoHubs GoCOM232
 .It
-Huawei Technologies Mobile card (3G)
-.It
-Novatel Wireless Merlin U740 (only basic modem port supported)
-.It
-Option Globetrotter 3G (aka Vodafone Mobile Connect Card 3G)
-.It
-Option Globetrotter 3G Quad
-.It
-Option Globetrotter 3G Fusion (no WLAN support, only basic 3G modem port)
-.It
-Option Globetrotter 3G Fusion Quad (no WLAN support)
-.It
-Option Globetrotter Max 3.6
-.It
 Peracom single port serial adapter
-.It
-Qualcomm, Inc. ZTE CDMA Technologies MSM
 .El
-.Pp
-The supported 3G cards provide the necessary modem port for ppp,
-pppd, or mpd connections; other functions of these cards (diagnostic port,
-SIM toolkit port, WLAN) are not supported.
 .Sh SEE ALSO
 .Xr tty 4 ,
 .Xr ucom 4 ,

==== //depot/projects/mpsafetty/share/man/man4/umass.4#2 (text+ko) ====

@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/umass.4,v 1.44 2006/11/22 21:30:02 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/umass.4,v 1.45 2008/10/13 20:43:08 n_hibma Exp $
 .\"
 .Dd November 22, 2006
 .Dt UMASS 4
@@ -85,6 +85,8 @@
 .It
 GREEN HOUSE USB Flash Memory "PicoDrive" GH-UFD32M, 64M, 128M
 .It
+Huawei Mobile (SD slot)
+.It
 IBM 32MB USB Memory Key (P/N 22P5296)
 .It
 IBM 256MB USB Drive (MSYSTEM DiskOnKey2)

==== //depot/projects/mpsafetty/share/zoneinfo/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/zoneinfo/Makefile,v 1.23 2008/08/08 04:37:43 edwin Exp $
+# $FreeBSD: src/share/zoneinfo/Makefile,v 1.24 2008/10/14 04:09:33 edwin Exp $
 
 #
 # HOW TO UPDATE THE ZONEINFO DATA
@@ -17,17 +17,15 @@
 # $ cd ~/svn/vendor/tzdata
 # $ svn cp svn+ssh://svn.freebsd.org/base/vendor/tzdata/dist \
 #	svn+ssh://svn.freebsd.org/base/vendor/tzdata/tzdata2008X
-# $ svn update
+# $ svn update	# Commit message: "Tag of tzdata2008X"
 #
 # Merge-from-vendor
 #
-# $ cd ~svn/head/share/zoneinfo
+# $ cd ~/svn/head/share/zoneinfo
 # $ svn update
-# $ svn merge --accept=postpone \
+# $ svn merge -c X --accept=postpone \
 #	svn+ssh://svn.freebsd.org/base/vendor/tzdata/dist .
-# $ svn diff --no-diff-deleted \
-#	--old=svn+ssh://svn.freebsd.org/base/vendor/tzdata/dist --new=.
-# $ svn commit
+# $ svn update	# Commit message: "MFV of tzdata2008X"
 #
 
 CLEANFILES+=	yearistype

==== //depot/projects/mpsafetty/share/zoneinfo/africa#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)africa	8.16
+# @(#)africa	8.17
 # <pre>
 
 # This data is by no means authoritative; if you think you know better,
@@ -453,11 +453,19 @@
 # year 2008 - 2009 will, therefore, be effective as from 26 October 2008
 # and end on 29 March 2009.
 
+# From Ed Maste (2008-10-07):
+# THE TIME BILL (No. XXVII of 2008) Explanatory Memorandum states the
+# beginning / ending of summer time is 2 o'clock standard time in the
+# morning of the last Sunday of October / last Sunday of March.
+# <a href="http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf">
+# http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
+# </a>
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule Mauritius	1982	only	-	Oct	10	0:00	1:00	S
 Rule Mauritius	1983	only	-	Mar	21	0:00	0	-
-Rule Mauritius	2008	max	-	Oct	lastSun	2:00	1:00	S
-Rule Mauritius	2009	max	-	Mar	lastSun	2:00	0	-
+Rule Mauritius	2008	max	-	Oct	lastSun	2:00s	1:00	S
+Rule Mauritius	2009	max	-	Mar	lastSun	2:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Indian/Mauritius	3:50:00 -	LMT	1907		# Port Louis
 			4:00 Mauritius	MU%sT	# Mauritius Time

==== //depot/projects/mpsafetty/share/zoneinfo/asia#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)asia	8.23
+# @(#)asia	8.24
 # <pre>
 
 # This data is by no means authoritative; if you think you know better,
@@ -1957,8 +1957,20 @@
 # compilers can't handle  or having multiple Rules (a la Israel).
 # For now, use "Apr Fri>=1", and go with IATA on a uniform Sep 30 end.
 
+# From Steffen Thorsen (2008-10-07):
+# Syria has now officially decided to end DST on 2008-11-01 this year,
+# according to the following article in the Syrian Arab News Agency (SANA).
+#
+# The article is in Arabic, and seems to tell that they will go back to
+# winter time on 2008-11-01 at 00:00 local daylight time (delaying/setting
+# clocks back 60 minutes).
+#
+# <a href="http://sana.sy/ara/2/2008/10/07/195459.htm">
+# http://sana.sy/ara/2/2008/10/07/195459.htm
+# </a>
+
 Rule	Syria	2008	max	-	Apr	Fri>=1	0:00	1:00	S
-Rule	Syria	2008	max	-	Oct	1	0:00	0	-
+Rule	Syria	2008	max	-	Nov	1	0:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Damascus	2:25:12 -	LMT	1920	# Dimashq

==== //depot/projects/mpsafetty/share/zoneinfo/southamerica#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)southamerica	8.29
+# @(#)southamerica	8.30
 # <pre>
 
 # This data is by no means authoritative; if you think you know better,
@@ -177,6 +177,22 @@
 # http://www.impulsobaires.com.ar/nota.php?id=57832 (in spanish)
 # </a>
 
+# From Rodrigo Severo (2008-10-06):
+# Here is some info available at a Gentoo bug related to TZ on Argentina's DST:
+# ...

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