From owner-p4-projects  Fri Oct 18 20:43:58 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 08C5837B404; Fri, 18 Oct 2002 20:43:33 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1CC3637B401
	for <perforce@freebsd.org>; Fri, 18 Oct 2002 20:43:32 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1736643E4A
	for <perforce@freebsd.org>; Fri, 18 Oct 2002 20:43:31 -0700 (PDT)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9J3hEmV012641
	for <perforce@freebsd.org>; Fri, 18 Oct 2002 20:43:15 -0700 (PDT)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9J3h5tJ012624
	for perforce@freebsd.org; Fri, 18 Oct 2002 20:43:05 -0700 (PDT)
Date: Fri, 18 Oct 2002 20:43:05 -0700 (PDT)
Message-Id: <200210190343.g9J3h5tJ012624@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
Subject: PERFORCE change 19605 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 19605 by jmallett@jmallett_luna on 2002/10/18 20:42:16

	Integrate.

Affected files ...

.. //depot/projects/mips/MAINTAINERS#2 integrate
.. //depot/projects/mips/bin/cp/cp.c#2 integrate
.. //depot/projects/mips/bin/cp/extern.h#2 integrate
.. //depot/projects/mips/bin/cp/utils.c#2 integrate
.. //depot/projects/mips/bin/date/date.c#2 integrate
.. //depot/projects/mips/bin/ls/extern.h#2 integrate
.. //depot/projects/mips/bin/ls/ls.c#2 integrate
.. //depot/projects/mips/bin/ls/print.c#2 integrate
.. //depot/projects/mips/bin/sh/mkbuiltins#2 integrate
.. //depot/projects/mips/contrib/groff/tmac/troffrc#3 integrate
.. //depot/projects/mips/etc/mtree/BSD.include.dist#2 integrate
.. //depot/projects/mips/etc/pam.d/su#2 integrate
.. //depot/projects/mips/etc/rc.d/local#3 integrate
.. //depot/projects/mips/gnu/usr.bin/man/Makefile.inc#3 integrate
.. //depot/projects/mips/include/Makefile#5 integrate
.. //depot/projects/mips/lib/libc/db/man/dbopen.3#2 integrate
.. //depot/projects/mips/lib/libc/gen/crypt.c#2 integrate
.. //depot/projects/mips/lib/libdisk/tst01.c#2 integrate
.. //depot/projects/mips/lib/libpam/modules/pam_wheel/pam_wheel.8#2 integrate
.. //depot/projects/mips/lib/libpam/modules/pam_wheel/pam_wheel.c#2 integrate
.. //depot/projects/mips/lib/libstand/Makefile#2 integrate
.. //depot/projects/mips/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#4 integrate
.. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#4 integrate
.. //depot/projects/mips/sbin/clri/clri.8#2 integrate
.. //depot/projects/mips/sbin/newfs/mkfs.c#2 integrate
.. //depot/projects/mips/share/man/man9/Makefile#3 integrate
.. //depot/projects/mips/share/man/man9/kthread.9#3 integrate
.. //depot/projects/mips/share/man/man9/mac_bsdextended.9#1 branch
.. //depot/projects/mips/share/mk/bsd.man.mk#3 integrate
.. //depot/projects/mips/sys/boot/sparc64/loader/metadata.c#2 integrate
.. //depot/projects/mips/sys/cam/scsi/scsi_cd.c#3 integrate
.. //depot/projects/mips/sys/cam/scsi/scsi_cd.h#2 integrate
.. //depot/projects/mips/sys/conf/files#4 integrate
.. //depot/projects/mips/sys/conf/files.sparc64#3 integrate
.. //depot/projects/mips/sys/conf/ldscript.ia64#3 integrate
.. //depot/projects/mips/sys/dev/amr/amr.c#2 integrate
.. //depot/projects/mips/sys/dev/amr/amr_cam.c#2 integrate
.. //depot/projects/mips/sys/dev/amr/amr_compat.h#2 integrate
.. //depot/projects/mips/sys/dev/amr/amr_disk.c#2 integrate
.. //depot/projects/mips/sys/dev/amr/amr_pci.c#2 integrate
.. //depot/projects/mips/sys/dev/amr/amr_tables.h#2 integrate
.. //depot/projects/mips/sys/dev/amr/amrio.h#2 integrate
.. //depot/projects/mips/sys/dev/amr/amrreg.h#2 integrate
.. //depot/projects/mips/sys/dev/amr/amrvar.h#2 integrate
.. //depot/projects/mips/sys/dev/ata/atapi-cd.c#2 integrate
.. //depot/projects/mips/sys/dev/ichsmb/ichsmb_pci.c#2 integrate
.. //depot/projects/mips/sys/dev/ofw/openfirm.h#2 integrate
.. //depot/projects/mips/sys/dev/ofw/openfirmio.c#1 branch
.. //depot/projects/mips/sys/dev/ofw/openfirmio.h#1 branch
.. //depot/projects/mips/sys/gnu/ext2fs/ext2_lookup.c#2 integrate
.. //depot/projects/mips/sys/kern/kern_descrip.c#3 integrate
.. //depot/projects/mips/sys/kern/kern_fork.c#4 integrate
.. //depot/projects/mips/sys/kern/kern_lock.c#2 integrate
.. //depot/projects/mips/sys/kern/subr_disk.c#4 integrate
.. //depot/projects/mips/sys/kern/sysv_sem.c#2 integrate
.. //depot/projects/mips/sys/kern/vfs_aio.c#3 integrate
.. //depot/projects/mips/sys/kern/vfs_bio.c#2 integrate
.. //depot/projects/mips/sys/modules/amr/Makefile#2 integrate
.. //depot/projects/mips/sys/sys/cdrio.h#2 integrate
.. //depot/projects/mips/sys/ufs/ffs/ffs_balloc.c#2 integrate
.. //depot/projects/mips/sys/ufs/ffs/ffs_vnops.c#3 integrate
.. //depot/projects/mips/sys/ufs/ufs/README.acls#2 integrate
.. //depot/projects/mips/sys/ufs/ufs/README.extattr#2 integrate
.. //depot/projects/mips/sys/ufs/ufs/ufs_extern.h#2 integrate
.. //depot/projects/mips/sys/ufs/ufs/ufs_vnops.c#4 integrate
.. //depot/projects/mips/sys/vm/vm_object.c#2 integrate
.. //depot/projects/mips/sys/vm/vm_object.h#2 integrate
.. //depot/projects/mips/sys/vm/vm_page.c#2 integrate
.. //depot/projects/mips/sys/vm/vm_page.h#2 integrate
.. //depot/projects/mips/usr.bin/calendar/calendars/calendar.freebsd#4 integrate
.. //depot/projects/mips/usr.bin/catman/catman.c#3 integrate
.. //depot/projects/mips/usr.bin/su/su.c#3 integrate
.. //depot/projects/mips/usr.sbin/Makefile#2 integrate
.. //depot/projects/mips/usr.sbin/burncd/burncd.8#2 integrate
.. //depot/projects/mips/usr.sbin/burncd/burncd.c#2 integrate
.. //depot/projects/mips/usr.sbin/cdcontrol/cdcontrol.1#2 integrate
.. //depot/projects/mips/usr.sbin/cdcontrol/cdcontrol.c#2 integrate
.. //depot/projects/mips/usr.sbin/ofwdump/Makefile#1 branch
.. //depot/projects/mips/usr.sbin/ofwdump/ofw_util.c#1 branch
.. //depot/projects/mips/usr.sbin/ofwdump/ofw_util.h#1 branch
.. //depot/projects/mips/usr.sbin/ofwdump/ofwdump.8#1 branch
.. //depot/projects/mips/usr.sbin/ofwdump/ofwdump.c#1 branch
.. //depot/projects/mips/usr.sbin/ofwdump/pathnames.h#1 branch
.. //depot/projects/mips/usr.sbin/syslogd/syslogd.8#2 integrate
.. //depot/projects/mips/usr.sbin/syslogd/syslogd.c#3 integrate
.. //depot/projects/mips/usr.sbin/ugidfw/Makefile#2 integrate
.. //depot/projects/mips/usr.sbin/ugidfw/ugidfw.8#2 integrate

Differences ...

==== //depot/projects/mips/MAINTAINERS#2 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.47 2002/09/01 15:55:38 rwatson Exp $
+$FreeBSD: src/MAINTAINERS,v 1.48 2002/10/18 18:27:56 njl Exp $
 
 subsystem	login	notes
 -----------------------------
@@ -39,6 +39,7 @@
 libcam		ken	Pre-commit review requested.
 libdevstat	ken	Pre-commit review requested.
 iostat(8)	ken	Pre-commit review requested.
+da(4)		njl	Pre-commit review requested. send to scsi@freebsd.org
 cd(4)		ken	Pre-commit review requested.
 pass(4)		ken	Pre-commit review requested.
 ch(4)		ken	Pre-commit review requested.

==== //depot/projects/mips/bin/cp/cp.c#2 (text+ko) ====

@@ -46,7 +46,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.42 2002/09/22 11:15:56 mckay Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.43 2002/10/18 14:44:59 markm Exp $");
 
 /*
  * Cp copies source files to target files.
@@ -252,7 +252,7 @@
 	exit (copy(argv, type, fts_options));
 }
 
-int
+static int
 copy(char *argv[], enum op type, int fts_options)
 {
 	struct stat to_stat;
@@ -484,7 +484,7 @@
  *	parent directory, whereas directories tend not to be.  Copying the
  *	files first reduces seeking.
  */
-int
+static int
 mastercmp(const FTSENT * const *a, const FTSENT * const *b)
 {
 	int a_info, b_info;

==== //depot/projects/mips/bin/cp/extern.h#2 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- * $FreeBSD: src/bin/cp/extern.h,v 1.15 2002/07/23 00:42:56 johan Exp $
+ * $FreeBSD: src/bin/cp/extern.h,v 1.16 2002/10/18 14:44:59 markm Exp $
  */
 
 typedef struct {
@@ -45,8 +45,8 @@
 
 __BEGIN_DECLS
 int	copy_fifo(struct stat *, int);
-int	copy_file(FTSENT *, int);
-int	copy_link(FTSENT *, int);
+int	copy_file(const FTSENT *, int);
+int	copy_link(const FTSENT *, int);
 int	copy_special(struct stat *, int);
 int	setfile(struct stat *, int);
 void	usage(void);

==== //depot/projects/mips/bin/cp/utils.c#2 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.38 2002/07/31 16:52:16 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.39 2002/10/18 14:45:00 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -58,7 +58,7 @@
 #include "extern.h"
 
 int
-copy_file(FTSENT *entp, int dne)
+copy_file(const FTSENT *entp, int dne)
 {
 	static char buf[MAXBSIZE];
 	struct stat *fs;
@@ -193,7 +193,7 @@
 }
 
 int
-copy_link(FTSENT *p, int exists)
+copy_link(const FTSENT *p, int exists)
 {
 	int len;
 	char llink[PATH_MAX];

==== //depot/projects/mips/bin/date/date.c#2 (text+ko) ====

@@ -43,7 +43,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.41 2002/06/30 05:13:52 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.42 2002/10/18 14:48:48 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -65,7 +65,7 @@
 #define	TM_YEAR_BASE	1900
 #endif
 
-time_t tval;
+static time_t tval;
 int retval;
 
 static void setthetime(const char *, const char *, int, int);
@@ -179,7 +179,7 @@
 
 #define	ATOI2(s)	((s) += 2, ((s)[-2] - '0') * 10 + ((s)[-1] - '0'))
 
-void
+static void
 setthetime(const char *fmt, const char *p, int jflag, int nflag)
 {
 	struct tm *lt;

==== //depot/projects/mips/bin/ls/extern.h#2 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/ls/extern.h,v 1.19 2002/05/19 02:51:36 tjr Exp $
+ * $FreeBSD: src/bin/ls/extern.h,v 1.20 2002/10/18 10:59:45 tjr Exp $
  */
 
 int	 acccmp(const FTSENT *, const FTSENT *);
@@ -45,6 +45,7 @@
 
 void	 printcol(DISPLAY *);
 void	 printlong(DISPLAY *);
+int	 printname(const char *);
 void	 printscol(DISPLAY *);
 void	 printstream(DISPLAY *);
 void	 usage(void);

==== //depot/projects/mips/bin/ls/ls.c#2 (text+ko) ====

@@ -46,7 +46,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.66 2002/09/21 01:28:36 wollman Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.67 2002/10/18 10:59:45 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -470,10 +470,13 @@
 			 * a separator.  If multiple arguments, precede each
 			 * directory with its name.
 			 */
-			if (output)
-				(void)printf("\n%s:\n", p->fts_path);
-			else if (argc > 1) {
-				(void)printf("%s:\n", p->fts_path);
+			if (output) {
+				putchar('\n');
+				printname(p->fts_path);
+				puts(":");
+			} else if (argc > 1) {
+				printname(p->fts_path);
+				puts(":");
 				output = 1;
 			}
 			chp = fts_children(ftsp, ch_options);

==== //depot/projects/mips/bin/ls/print.c#2 (text+ko) ====

@@ -40,7 +40,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.57 2002/08/29 14:29:09 keramida Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.59 2002/10/18 10:59:45 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -93,7 +93,7 @@
 typedef enum {
 	NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX
 } unit_t;
-static unit_t unit_adjust(off_t *);
+static unit_t unit_adjust(double *);
 
 static int unitp[] = {NONE, KILO, MEGA, GIGA, TERA, PETA};
 
@@ -141,7 +141,7 @@
 /*
  * print name in current style
  */
-static int
+int
 printname(const char *name)
 {
 	if (f_octal || f_octal_escape)
@@ -602,16 +602,18 @@
 static void
 printsize(size_t width, off_t bytes)
 {
+	double dbytes;
 	unit_t unit;
 
 	if (f_humanval) {
-		unit = unit_adjust(&bytes);
+		dbytes = bytes;
+		unit = unit_adjust(&dbytes);
 
-		if (bytes == 0)
+		if (dbytes == 0)
 			(void)printf("%*s ", width, "0B");
 		else
-			(void)printf("%*lld%c ", width - 1, bytes,
-			    "BKMGTPE"[unit]);
+			(void)printf("%*.*f%c ", width - 1, dbytes > 10 ? 0 : 1,
+			    dbytes, "BKMGTPE"[unit]);
 	} else
 		(void)printf("%*lld ", width, bytes);
 }
@@ -623,13 +625,13 @@
  *
  */
 unit_t
-unit_adjust(off_t *val)
+unit_adjust(double *val)
 {
 	double abval;
 	unit_t unit;
 	unsigned int unit_sz;
 
-	abval = fabs((double)*val);
+	abval = fabs(*val);
 
 	unit_sz = abval ? ilogb(abval) / 10 : 0;
 

==== //depot/projects/mips/bin/sh/mkbuiltins#2 (text+ko) ====

@@ -35,7 +35,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mkbuiltins	8.2 (Berkeley) 5/4/95
-# $FreeBSD: src/bin/sh/mkbuiltins,v 1.10 2002/02/18 06:08:23 imp Exp $
+# $FreeBSD: src/bin/sh/mkbuiltins,v 1.11 2002/10/18 10:33:32 tjr Exp $
 
 temp=`/usr/bin/mktemp -t ka`
 havejobs=0
@@ -60,7 +60,7 @@
 
 !
 awk '/^[^#]/ {if(('$havejobs' || $2 != "-j") && ('$havehist' || $2 != "-h")) \
-    print $0}' builtins.def | sed 's/-j//' > $temp
+    print $0}' builtins.def | sed 's/-[hj]//' > $temp
 awk '{	printf "int %s();\n", $1}' $temp
 echo '
 int (*const builtinfunc[])() = {'

==== //depot/projects/mips/contrib/groff/tmac/troffrc#3 (text+ko) ====

@@ -1,5 +1,5 @@
 .\" Startup file for troff.
-.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.10 2002/10/11 12:20:01 ru Exp $
+.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.11 2002/10/18 09:10:44 ru Exp $
 .
 .\" This is tested by pic.
 .nr 0p 0
@@ -45,4 +45,7 @@
 .
 .\}
 .
+.\" Disable SGR support in grotty(1).
+.if n .do nop \X'tty: sgr 0'\c
+.
 .\" Don't let blank lines creep in here.

==== //depot/projects/mips/etc/mtree/BSD.include.dist#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.58 2002/10/04 20:44:28 sam Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.60 2002/10/18 15:30:50 tmm Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -20,6 +20,8 @@
         ..
         iicbus
         ..
+        ofw
+        ..
         ppbus
         ..
         smbus
@@ -95,6 +97,8 @@
     ..
     netinet6
     ..
+    netipsec
+    ..
     netipx
     ..
     netkey

==== //depot/projects/mips/etc/pam.d/su#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/su,v 1.8 2002/04/18 17:40:27 des Exp $
+# $FreeBSD: src/etc/pam.d/su,v 1.9 2002/10/18 02:39:21 rwatson Exp $
 #
 # PAM configuration for the "su" service
 #
@@ -7,7 +7,7 @@
 # auth
 auth		sufficient	pam_rootok.so	no_warn
 auth		sufficient	pam_self.so	no_warn
-auth		requisite	pam_wheel.so	no_warn auth_as_self noroot_ok
+auth		requisite	pam_wheel.so	no_warn auth_as_self noroot_ok exempt_if_empty
 #auth		sufficient	pam_kerberosIV.so	no_warn
 #auth		sufficient	pam_krb5.so	no_warn try_first_pass auth_as_self
 auth		sufficient	pam_opie.so	no_warn no_fake_prompts

==== //depot/projects/mips/etc/rc.d/local#3 (text+ko) ====

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: local,v 1.6 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/local,v 1.3 2002/10/12 07:23:43 dd Exp $
+# $FreeBSD: src/etc/rc.d/local,v 1.4 2002/10/17 23:46:32 sobomax Exp $
 #
 
 # PROVIDE: local
@@ -26,7 +26,7 @@
 
 local_stop()
 {
-	echo -n 'Shutting down loacal daemons:'
+	echo -n 'Shutting down local daemons:'
 	if [ -f /etc/rc.shutdown.local ]; then
 		. /etc/rc.shutdown.local
 	fi

==== //depot/projects/mips/gnu/usr.bin/man/Makefile.inc#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/man/Makefile.inc,v 1.20 2002/10/11 09:16:24 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/man/Makefile.inc,v 1.21 2002/10/18 09:14:13 ru Exp $
 #
 # Set a bunch of things to hardcoded paths so that we don't accidently
 # pick up a user's own version of some utility and hose ourselves.
@@ -9,7 +9,7 @@
 manpath_config_file=	/etc/manpath.config
 troff=			/usr/bin/groff -S -man
 # -Tascii or localized encoding added automatically
-nroff=			/usr/bin/groff -P-c -S -Wall -mtty-char -man
+nroff=			/usr/bin/groff -S -Wall -mtty-char -man
 apropos=		/usr/bin/apropos
 whatis=			/usr/bin/whatis
 eqn=                    /usr/bin/eqn

==== //depot/projects/mips/include/Makefile#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.182 2002/10/07 21:18:29 mike Exp $
+# $FreeBSD: src/include/Makefile,v 1.184 2002/10/18 15:30:45 tmm Exp $
 #
 # Doing a make install builds /usr/include
 #
@@ -32,11 +32,11 @@
 LHDRS=	aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \
 	termios.h ucontext.h
 
-LDIRS=	cam net netatalk netatm netgraph netinet netinet6 \
+LDIRS=	cam net netatalk netatm netgraph netinet netinet6 netipsec \
 	netipx netkey netnatm netncp netns netsmb nfs nfsclient nfsserver \
 	pccard posix4 sys vm
 
-LSUBDIRS=	cam/scsi dev/an dev/ic dev/iicbus dev/ppbus dev/smbus \
+LSUBDIRS=	cam/scsi dev/an dev/ic dev/iicbus dev/ofw dev/ppbus dev/smbus \
 	dev/usb dev/wi fs/devfs \
 	fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \
 	fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \

==== //depot/projects/mips/lib/libc/db/man/dbopen.3#2 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)dbopen.3	8.5 (Berkeley) 1/2/94
-.\" $FreeBSD: src/lib/libc/db/man/dbopen.3,v 1.5 2001/10/01 16:08:50 ru Exp $
+.\" $FreeBSD: src/lib/libc/db/man/dbopen.3,v 1.6 2002/10/18 16:20:08 markm Exp $
 .\"
 .Dd January 2, 1994
 .Dt DBOPEN 3
@@ -40,8 +40,9 @@
 .Nd "database access methods"
 .Sh SYNOPSIS
 .In sys/types.h
+.In db.h
+.In fcntl.h
 .In limits.h
-.In db.h
 .Ft DB *
 .Fn dbopen "const char *file" "int flags" "int mode" "DBTYPE type" "const void *openinfo"
 .Sh DESCRIPTION

==== //depot/projects/mips/lib/libc/gen/crypt.c#2 (text+ko) ====

@@ -37,12 +37,13 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from static char sccsid[] = "@(#)crypt.c	5.11 (Berkeley) 6/25/91"; */
 #endif /* LIBC_SCCS and not lint */
+
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/crypt.c,v 1.6 2002/02/01 01:08:48 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/crypt.c,v 1.8 2002/10/18 16:24:20 markm Exp $");
 
-#include <unistd.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 
 /*
  * UNIX password, and DES, encryption.
@@ -54,9 +55,9 @@
 __warn_references(des_setkey,
 	"WARNING!  des_setkey(3) not present in the system!");
 
+/* ARGSUSED */
 int
-des_setkey(key)
-	const char *key;
+des_setkey(const char *key __unused)
 {
 	fprintf(stderr, "WARNING!  des_setkey(3) not present in the system!\n");
 	return (0);
@@ -65,12 +66,9 @@
 __warn_references(des_cipher,
 	"WARNING!  des_cipher(3) not present in the system!");
 
+/* ARGSUSED */
 int
-des_cipher(in, out, salt, num_iter)
-	const char     *in;
-	char           *out;
-	long            salt;
-	int             num_iter;
+des_cipher(const char *in, char *out, long salt __unused, int num_iter __unused)
 {
 	fprintf(stderr, "WARNING!  des_cipher(3) not present in the system!\n");
 	bcopy(in, out, 8);
@@ -80,9 +78,9 @@
 __warn_references(setkey,
 	"WARNING!  setkey(3) not present in the system!");
 
+/* ARGSUSED */
 int
-setkey(key)
-	const char *key;
+setkey(const char *key __unused)
 {
 	fprintf(stderr, "WARNING!  setkey(3) not present in the system!\n");
 	return (0);
@@ -91,10 +89,9 @@
 __warn_references(encrypt,
 	"WARNING!  encrypt(3) not present in the system!");
 
+/* ARGSUSED */
 int
-encrypt(block, flag)
-	char  *block;
-	int             flag;
+encrypt(char *block __unused, int flag __unused)
 {
 	fprintf(stderr, "WARNING!  encrypt(3) not present in the system!\n");
 	return (0);

==== //depot/projects/mips/lib/libdisk/tst01.c#2 (text+ko) ====

@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/tst01.c,v 1.29 2002/03/25 13:49:15 phk Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/tst01.c,v 1.30 2002/10/18 00:26:34 sam Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -255,14 +255,14 @@
 			continue;
 		}
 		if (!strcasecmp(*cmds,"bteasy")) {
-			Set_Boot_Mgr(d,bteasy17);
+			Set_Boot_Mgr(d,bteasy17,sizeof (bteasy17));
 			continue;
 		}
 		if (!strcasecmp(*cmds,"mbr")) {
-			Set_Boot_Mgr(d,mbr);
+			Set_Boot_Mgr(d,mbr,sizeof (mbr));
 			continue;
 		}
-#ifndef __alpha__	/* don't think this compiles on i386 either */
+#if 0		/* XXX boot1 undefined, fix me */
 		if (!strcasecmp(*cmds,"boot")) {
 			Set_Boot_Blocks(d,boot1,boot2);
 			continue;

==== //depot/projects/mips/lib/libpam/modules/pam_wheel/pam_wheel.8#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libpam/modules/pam_wheel/pam_wheel.8,v 1.7 2001/08/26 18:09:00 markm Exp $
+.\" $FreeBSD: src/lib/libpam/modules/pam_wheel/pam_wheel.8,v 1.8 2002/10/18 02:37:29 rwatson Exp $
 .\"
 .Dd July 8, 2001
 .Dt PAM_WHEEL 8
@@ -55,7 +55,7 @@
 .Dq Li wheel .
 .Pp
 The following options may be passed to the authentication module:
-.Bl -tag -width ".Cm auth_as_self"
+.Bl -tag -width ".Cm exempt_if_empty"
 .It Cm debug
 .Xr syslog 3
 debugging information at
@@ -103,6 +103,14 @@
 if the user is authenticating
 to a user
 that is not the superuser.
+.It Cm exempt_if_empty
+return
+.Dv PAM_IGNORE
+if the specified group (default group of
+.Dq Li wheel )
+is empty, providing traditional BSD
+.Xr su 8
+semantics permitting any user to su if the wheel group is empty.
 .El
 .Sh SEE ALSO
 .Xr getlogin 2 ,

==== //depot/projects/mips/lib/libpam/modules/pam_wheel/pam_wheel.c#2 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_wheel/pam_wheel.c,v 1.11 2002/04/12 22:27:25 des Exp $");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_wheel/pam_wheel.c,v 1.12 2002/10/18 02:37:29 rwatson Exp $");
 
 #define _BSD_SOURCE
 
@@ -59,7 +59,8 @@
 	PAM_OPT_GROUP,
 	PAM_OPT_TRUST,
 	PAM_OPT_AUTH_AS_SELF,
-	PAM_OPT_NOROOT_OK
+	PAM_OPT_NOROOT_OK,
+	PAM_OPT_EXEMPT_IF_EMPTY
 };
 
 static struct opttab other_options[] = {
@@ -68,6 +69,7 @@
 	{ "trust",		PAM_OPT_TRUST },
 	{ "auth_as_self",	PAM_OPT_AUTH_AS_SELF },
 	{ "noroot_ok",		PAM_OPT_NOROOT_OK },
+	{ "exempt_if_empty",	PAM_OPT_EXEMPT_IF_EMPTY },
 	{ NULL, 0 }
 };
 
@@ -153,6 +155,12 @@
 
 	PAM_LOG("Got group: %s", grp->gr_name);
 
+	/* If the group is empty, see if we exempt empty groups. */
+	if (*(grp->gr_mem) == NULL) {
+		if (pam_test_option(&options, PAM_OPT_EXEMPT_IF_EMPTY, NULL))
+			return (PAM_IGNORE);
+	}
+
 	if (pwd->pw_gid == grp->gr_gid || in_list(grp->gr_mem, pwd->pw_name)) {
 		if (pam_test_option(&options, PAM_OPT_DENY, NULL)) {
 			PAM_VERBOSE_ERROR("Member of group %s; denied",

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

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libstand/Makefile,v 1.36 2002/07/20 04:18:20 peter Exp $
+# $FreeBSD: src/lib/libstand/Makefile,v 1.37 2002/10/19 02:23:09 marcel Exp $
 # Originally from	$NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $
 #
 # Notes:
@@ -146,6 +146,8 @@
 .endfor
 
 .for file in infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c zutil.c
+CLEANFILES+=	_${file}
+
 _${file}: ${file}
 	sed "s|zutil\.h|_zutil.h|" ${.ALLSRC} > ${.TARGET}
 .endfor

==== //depot/projects/mips/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#4 (text+ko) ====

@@ -31,7 +31,7 @@
 
 <sect1>
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.108 2002/10/16 20:58:26 ue Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.109 2002/10/18 23:24:20 bmah Exp $</pubdate>
   </sect1info>
 
   <title>Supported Devices</title>
@@ -2478,6 +2478,9 @@
     <title>Serial Interfaces</title>
     <para arch="i386,alpha,ia64,sparc64"><quote>PC standard</quote> 8250, 16450, and 16550-based serial ports (&man.sio.4; driver)</para>
 
+    <para arch="sparc64">Serial ports based on the SAB82532 serial
+      chip (sab driver)</para>
+
     <para arch="i386,alpha">AST 4 port serial card using shared IRQ</para>
 
     <para arch="i386">ARNET serial cards (&man.ar.4; driver)

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

@@ -3,7 +3,7 @@
 
   <corpauthor>The FreeBSD Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.433 2002/10/16 18:05:20 bmah Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.436 2002/10/18 23:23:32 bmah Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -303,6 +303,9 @@
       mistakenly assigning addresses that conflict with these
       ROMs. &merged;</para>
 
+    <para>The <literal>P1003_1B</literal> kernel option is no longer
+      used and has been removed.</para>
+
     <para arch="i386,pc98">PECOFF (Win32 Execution file format) support has
       been added.</para>
 
@@ -348,7 +351,7 @@
     <para arch="sparc64">Support has been added for SBus-based
       devices.</para>
 
-    <para arch="sparc64">The se driver, which supports the Siemens
+    <para arch="sparc64">The sab driver, which supports the Siemens
       SAB82532 serial chip found on many newer Sparc Ultra machines,
       has been added.</para>
 
@@ -620,6 +623,18 @@
 	added; this requires the <literal>CPU_ELAN</literal> option in
 	the kernel configuration file. &merged;</para>
 
+      <para arch="i386">The <literal>CPU_DISABLE_CMPXCHG</literal>
+        kernel configuration option has been added.  Enabling this
+        option has been shown to dramatically improve performance on
+        VMWare client OS installs.
+
+	<note>
+	  <para>This option is not compatible with
+	    <literal>SMP</literal> kernels.</para>
+	</note>
+
+	</para>
+
     </sect3>
 
     <sect3>
@@ -974,6 +989,24 @@
 	in the presence of dynamic attachments and detatchments.  Full
 	support for VLANs is also supported. &merged;</para>
 
+      <para>A <literal>FAST_IPSEC</literal> kernel option now allows
+        the IPsec implementation to use the kernel crypo framework,
+        along with its support for hardware cryptographic
+        acceleration.
+        <note>
+          <para>The <literal>FAST_IPSEC</literal> and
+            <literal>IPSEC</literal> options are mutually
+            exclusive.</para>
+	</note>
+
+        <note>
+          <para>The <literal>FAST_IPSEC</literal> option is, at the
+            moment, not compatible with IPv6 or the
+            <literal>INET6</literal> option.</para>
+	</note>
+
+	</para>
+
       <para>A &man.gre.4; driver, which can encapsulate IP packets
         using GRE (RFC 1701) or minimal IP encapsulation for Mobile IP
         (RFC 2004), has been added.</para>
@@ -2550,6 +2583,11 @@
       on an interface, via the new <option>promisc</option>
       flag. &merged;</para>
 
+    <para>&man.ifconfig.8; now supports a <literal>monitor</literal>
+      interface flag, which blocks transmission of packets on that
+      interface.  This feature is useful for mintoring network traffic
+      without interacting with the network in question.</para>
+
     <para role="historic">The syntax of &man.inetd.8;'s support for &man.faithd.8; is
       now compatible with that of other BSDs. &merged;</para>
 
@@ -2743,10 +2781,17 @@
     <para role="historic">&man.login.1; now exports environment variables set by
       <application>PAM</application> modules. &merged;</para>
 
-    <para role="historic">&man.lpc.8; has been improved; <command>lpc clean</command>
+    <para>&man.lpc.8; has been improved; <command>lpc clean</command>
       is now somewhat safer, and a new <command>lpc tclean</command>
       command has been added to check to see what files would be
-      removed by <command>lpc clean</command>. &merged;</para>
+      removed by <command>lpc clean</command>.  <command>lpc
+      topq</command> has been reimplemented, and now allows for a much
+      more flexible specification of which jobs should be moved (such
+      as a range of job numbers, or a hostname).  An <command>lpc
+      bottomq</command> command has been added to move jobs to the
+      bottom of a print queue, and a new <command>lpc
+      setstatus</command> command can be used to set a printer's
+      status message. &merged;</para>
 
     <para role="historic">&man.lpd.8; now takes two new options: <option>-c</option>
       will log all connection errors to &man.syslogd.8;, while
@@ -2972,6 +3017,9 @@
       <option>-s</option> option to output signed decimal shorts, and
       the <option>-t</option> option to specify output type. &merged;</para>
 
+    <para arch="sparc64">The &man.ofwdump.8; utility has been added to
+      examine the OpenFirmware device tree.</para>
+
     <para><application>PAM</application> support has been added for
       account management and sessions.</para>
 
@@ -3067,6 +3115,9 @@
     <para role="historic">&man.ping.8; now supports a <option>-A</option> option to
       beep when packets are lost. &merged;</para>
 
+    <para>&man.ping.8; now supports a <option>-o</option> flag to exit
+      after receiving a reply.</para>
+
     <para role="historic">Userland &man.ppp.8; has received a number of updates and
       bug fixes. &merged;</para>
 
@@ -3107,6 +3158,9 @@
     <para>&man.pwd.1; now supports the <option>-L</option> flag to
       print the logical current working directory. &merged;</para>
 
+    <para>&man.quota.1; now takes a <option>-l</option> flag to
+      suppress quote checks on NFS filesystems.</para>
+
     <para>The pseudo-random number generator implemented by
       &man.rand.3; has been improved to provide less biased
       results.</para>
@@ -3437,6 +3491,15 @@
     <para role="historic">The &man.truncate.1; utility, which truncates or extends the
       length of files, has been added. &merged;</para>
 
+    <para>&man.tunefs.8; now supports the <option>-a</option> and
+      <option>-l</option> flags to enable and disable the
+      <literal>FS_ACLS</literal> and <literal>FS_MULTILABEL</literal>
+      administrative flags on UFS file system.</para>
+
+    <para>A &man.ugidfw.8; utility has been added to manage the
+      rulesets provided by the <literal>mac_bsdextended</literal>
+      Mandatory Access Control policy, similar to &man.ipfw.8;.</para>
+
     <para role="historic">Ukrainian language support has been added to the &os;
       console. &merged;</para>
 
@@ -3542,8 +3605,7 @@
       to tell &man.xargs.1; to insert the data read from standard
       input at specific points in the command line arguments rather
       than at the end.  (A &os;-specific <option>-J</option> option is
-      similar, but is now deprecated in favor of the more portable
-      <option>-I</option> option.) &merged;</para>
+      similar.) &merged;</para>
 
     <para>&man.xargs.1; now supports a <option>-L</option> option to
       force its utility argument to be called after some number of

==== //depot/projects/mips/sbin/clri/clri.8#2 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)clri.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/sbin/clri/clri.8,v 1.12 2002/08/21 18:09:51 trhodes Exp $
+.\" $FreeBSD: src/sbin/clri/clri.8,v 1.13 2002/10/18 01:05:46 keramida Exp $
 .\"
 .Dd April 19, 1994
 .Dt CLRI 8
@@ -51,7 +51,7 @@
 .Pp
 The
 .Nm
-utility zeros out the inodes with the specified inode number(s)
+utility zeroes out the inodes with the specified inode number(s)
 on the file system residing on the given
 .Ar special_device .
 The

==== //depot/projects/mips/sbin/newfs/mkfs.c#2 (text+ko) ====

@@ -48,7 +48,7 @@
 static char sccsid[] = "@(#)mkfs.c	8.11 (Berkeley) 5/3/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/sbin/newfs/mkfs.c,v 1.62 2002/09/25 04:06:37 mike Exp $";
+  "$FreeBSD: src/sbin/newfs/mkfs.c,v 1.63 2002/10/18 23:17:30 mckusick Exp $";
 #endif /* not lint */
 
 #include <err.h>
@@ -382,6 +382,8 @@
 	if (fscs == NULL)
 		errx(31, "calloc failed");
 	sblock.fs_sbsize = fragroundup(&sblock, sizeof(struct fs));
+	if (sblock.fs_sbsize > SBLOCKSIZE)
+		sblock.fs_sbsize = SBLOCKSIZE;
 	sblock.fs_minfree = minfree;
 	sblock.fs_maxbpg = maxbpg;
 	sblock.fs_optim = opt;

==== //depot/projects/mips/share/man/man9/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.170 2002/10/16 14:24:41 mike Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.171 2002/10/18 05:40:48 chris Exp $
 
 MAN=	BUF_LOCK.9 BUF_LOCKFREE.9 BUF_LOCKINIT.9 BUF_REFCNT.9 \
 	BUF_TIMELOCK.9 BUF_UNLOCK.9 BUS_PRINT_CHILD.9 BUS_READ_IVAR.9 \
@@ -48,6 +48,7 @@
 	jumbo.9 \
 	kernacc.9 kobj.9 kthread.9 ktr.9 \
 	lock.9 \
+	mac_bsdextended.9 \
 	make_dev.9 malloc.9 mbchain.9 mbuf.9 mdchain.9 \
 	mi_switch.9 microseq.9 microtime.9 microuptime.9 \
 	module.9 mtx_pool.9 mutex.9 \

==== //depot/projects/mips/share/man/man9/kthread.9#3 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/kthread.9,v 1.11 2002/10/10 00:29:22 alfred Exp $
+.\" $FreeBSD: src/share/man/man9/kthread.9,v 1.12 2002/10/19 01:39:44 benno Exp $
 .\"
 .Dd October 24, 2000
 .Dt KTHREAD 9
@@ -44,7 +44,7 @@
 .Ft void
 .Fn kproc_shutdown "void *arg" "int howto"
 .Ft int
-.Fn kthread_create "void (*func)(void *)" "void *arg" "struct proc **newpp" "int flags" "const char *fmt" "..."
+.Fn kthread_create "void (*func)(void *)" "void *arg" "struct proc **newpp" "int flags" "int pages" "const char *fmt" "..."
 .Ft void
 .Fn kthread_exit "int ecode"
 .Ft int
@@ -121,6 +121,10 @@
 .Fa flags
 argument specifies a set of flags as described in
 .Xr rfork 2 .
+The
+.Fa pages
+argument specifies the size of the new kernel thread's stack in pages.
+If 0 is used, the default kernel stack size is allocated.
 The rest of the arguments form a
 .Xr printf 9
 argument list that is used to build the name of the new thread and is stored

==== //depot/projects/mips/share/mk/bsd.man.mk#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.man.mk,v 1.51 2002/10/11 09:16:24 ru Exp $
+# $FreeBSD: src/share/mk/bsd.man.mk,v 1.52 2002/10/18 09:14:17 ru Exp $
 #
 # The include file <bsd.man.mk> handles installing manual pages and 
 # their links.
@@ -57,7 +57,7 @@
 

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

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message