PERFORCE change 15336 for review

Robert Watson rwatson at freebsd.org
Wed Jul 31 18:54:06 GMT 2002


http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15336

Change 15336 by rwatson at rwatson_tislabs on 2002/07/31 11:53:09

	IFC -CURRENT into trustedbsd base tree.  Pick up hoards of
	MAC changes trickling back through, etc.  Also, libc compile
	fix.

Affected files ...

.. //depot/projects/trustedbsd/base/bin/cat/cat.c#7 integrate
.. //depot/projects/trustedbsd/base/bin/cp/utils.c#6 integrate
.. //depot/projects/trustedbsd/base/bin/ed/cbc.c#4 integrate
.. //depot/projects/trustedbsd/base/bin/ed/ed.h#4 integrate
.. //depot/projects/trustedbsd/base/bin/ln/ln.c#7 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/ipsec#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_array.c#4 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#32 integrate
.. //depot/projects/trustedbsd/base/sbin/atacontrol/atacontrol.c#6 integrate
.. //depot/projects/trustedbsd/base/share/dict/propernames#2 integrate
.. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#11 integrate
.. //depot/projects/trustedbsd/base/sys/conf/Makefile.alpha#6 integrate
.. //depot/projects/trustedbsd/base/sys/conf/Makefile.i386#7 integrate
.. //depot/projects/trustedbsd/base/sys/conf/Makefile.ia64#9 integrate
.. //depot/projects/trustedbsd/base/sys/conf/Makefile.pc98#6 integrate
.. //depot/projects/trustedbsd/base/sys/conf/Makefile.powerpc#7 integrate
.. //depot/projects/trustedbsd/base/sys/conf/Makefile.sparc64#11 integrate
.. //depot/projects/trustedbsd/base/sys/conf/Makefile.x86_64#2 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.i386#14 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#13 integrate
.. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pst/pst-iop.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/pst/pst-iop.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/pst/pst-pci.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/pst/pst-raid.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/hid.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ucom.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ucomvar.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/udbp.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ufm.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ugen.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uhid.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uhub.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ukbd.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ulpt.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/umodem.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ums.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/urio.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usb.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usb_port.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uscanner.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uvisor.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uvscom.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_devs.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vfsops.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/net/bpf.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/net/bsd_comp.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/net/if.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_tun.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/if_ether.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/igmp.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_divert.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#1 branch
.. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.h#1 branch
.. //depot/projects/trustedbsd/base/sys/security/mac_bsdextended/mac_bsdextended.c#1 branch
.. //depot/projects/trustedbsd/base/sys/security/mac_bsdextended/mac_bsdextended.h#1 branch
.. //depot/projects/trustedbsd/base/sys/security/mac_ifoff/mac_ifoff.c#1 branch
.. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#1 branch
.. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.h#1 branch
.. //depot/projects/trustedbsd/base/sys/security/mac_none/mac_none.c#1 branch
.. //depot/projects/trustedbsd/base/sys/security/mac_seeotheruids/mac_seeotheruids.c#1 branch
.. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#1 branch
.. //depot/projects/trustedbsd/base/sys/sparc64/include/emul.h#2 delete
.. //depot/projects/trustedbsd/base/sys/sparc64/include/pv.h#5 delete
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/emul.c#4 delete
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/exception.s#12 delete
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/fp.c#4 delete
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/locore.s#7 delete
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_exception.s#6 delete
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_locore.s#5 delete
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pv.c#8 delete
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/support.s#11 delete
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/swtch.s#8 delete
.. //depot/projects/trustedbsd/base/sys/sys/unistd.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_glue.c#15 integrate

Differences ...

==== //depot/projects/trustedbsd/base/bin/cat/cat.c#7 (text+ko) ====

@@ -46,7 +46,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.26 2002/06/30 05:13:51 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.27 2002/07/31 16:50:21 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -121,6 +121,7 @@
 	if (fclose(stdout))
 		err(1, "stdout");
 	exit(rval);
+	/* NOTREACHED */
 }
 
 static void
@@ -128,6 +129,7 @@
 {
 	fprintf(stderr, "usage: cat [-benstuv] [file ...]\n");
 	exit(1);
+	/* NOTREACHED */
 }
 
 void

==== //depot/projects/trustedbsd/base/bin/cp/utils.c#6 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.37 2002/07/23 00:42:56 johan Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.38 2002/07/31 16:52:16 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -140,10 +140,10 @@
 			for (bufp = p, wresid = fs->st_size; ;
 			    bufp += wcount, wresid -= (size_t)wcount) {
 				wcount = write(to_fd, bufp, wresid);
-				if (wcount >= wresid || wcount <= 0)
+				if (wcount >= (ssize_t)wresid || wcount <= 0)
 					break;
 			}
-			if (wcount != wresid) {
+			if (wcount != (ssize_t)wresid) {
 				warn("%s", to.p_path);
 				rval = 1;
 			}
@@ -160,10 +160,10 @@
 			for (bufp = buf, wresid = rcount; ;
 			    bufp += wcount, wresid -= wcount) {
 				wcount = write(to_fd, bufp, wresid);
-				if (wcount >= wresid || wcount <= 0)
+				if (wcount >= (ssize_t)wresid || wcount <= 0)
 					break;
 			}
-			if (wcount != wresid) {
+			if (wcount != (ssize_t)wresid) {
 				warn("%s", to.p_path);
 				rval = 1;
 				break;

==== //depot/projects/trustedbsd/base/bin/ed/cbc.c#4 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.16 2002/06/30 05:13:53 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.17 2002/07/31 16:49:01 markm Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
@@ -56,11 +56,11 @@
 #define	MEMZERO(dest,len)	memset((dest), 0, (len))
 
 /* Hide the calls to the primitive encryption routines. */
-#define	DES_KEY(buf) \
-	if (des_setkey(buf)) \
+#define	DES_KEY(buf)							\
+	if (des_setkey(buf))						\
 		des_error("des_setkey");
-#define	DES_XFORM(buf) \
-	if (des_cipher(buf, buf, 0L, (inverse ? -1 : 1))) \
+#define	DES_XFORM(buf)							\
+	if (des_cipher((char *)buf, (char *)buf, 0L, inverse ? -1 : 1))	\
 		des_error("des_cipher");
 
 /*
@@ -332,7 +332,7 @@
  * This encrypts using the Cipher Block Chaining mode of DES
  */
 int
-cbc_encode(char *msgbuf, int n, FILE *fp)
+cbc_encode(unsigned char *msgbuf, int n, FILE *fp)
 {
 	int inverse = 0;	/* 0 to encrypt, 1 to decrypt */
 
@@ -370,7 +370,7 @@
  *	fp	input file descriptor
  */
 int
-cbc_decode(char *msgbuf, FILE *fp)
+cbc_decode(unsigned char *msgbuf, FILE *fp)
 {
 	Desbuf tbuf;	/* temp buffer for initialization vector */
 	int n;			/* number of bytes actually read */

==== //depot/projects/trustedbsd/base/bin/ed/ed.h#4 (text+ko) ====

@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp
- * $FreeBSD: src/bin/ed/ed.h,v 1.17 2002/06/20 05:28:02 jmallett Exp $
+ * $FreeBSD: src/bin/ed/ed.h,v 1.18 2002/07/31 16:49:01 markm Exp $
  */
 
 #include <sys/param.h>
@@ -180,8 +180,8 @@
 int append_lines(long);
 int apply_subst_template(const char *, regmatch_t *, int, int);
 int build_active_list(int);
-int cbc_decode(char *, FILE *);
-int cbc_encode(char *, int, FILE *);
+int cbc_decode(unsigned char *, FILE *);
+int cbc_encode(unsigned char *, int, FILE *);
 int check_addr_range(long, long);
 void clear_active_list(void);
 void clear_undo_stack(void);

==== //depot/projects/trustedbsd/base/bin/ln/ln.c#7 (text+ko) ====

@@ -43,7 +43,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.28 2002/06/30 05:13:54 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.29 2002/07/31 16:53:59 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -190,7 +190,7 @@
 		else
 			++p;
 		if (snprintf(path, sizeof(path), "%s/%s", source, p) >=
-		    sizeof(path)) {
+		    (ssize_t)sizeof(path)) {
 			errno = ENAMETOOLONG;
 			warn("%s", target);
 			return (1);

==== //depot/projects/trustedbsd/base/etc/rc.d/ipsec#3 (text+ko) ====

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/ipsec,v 1.2 2002/06/13 22:14:36 gordon Exp $
+# $FreeBSD: src/etc/rc.d/ipsec,v 1.3 2002/07/31 16:39:19 ume Exp $
 #
 
 # PROVIDE: ipsec
@@ -24,6 +24,15 @@
 reload_cmd="ipsec_reload"
 extra_commands="reload"
 
+case `${CMD_OSTYPE}` in
+FreeBSD)
+	ipsec_program="/usr/sbin/setkey"
+	;;
+NetBSD)
+	ipsec_program="/sbin/setkey"
+	;;
+esac
+
 ipsec_prestart()
 {
 	if [ ! -f "$ipsec_file" ]; then
@@ -45,7 +54,7 @@
 ipsec_start()
 {
 	echo "Installing ipsec manual keys/policies."
-	/sbin/setkey -f $ipsec_file
+	${ipsec_program} -f $ipsec_file
 }
 
 ipsec_stop()
@@ -56,16 +65,16 @@
 	# it is very questionable to do this during shutdown session, since
 	# it can hang any of remaining IPv4/v6 session.
 	#
-	/sbin/setkey -F
-	/sbin/setkey -FP
+	${ipsec_program} -F
+	${ipsec_program} -FP
 }
 
 ipsec_reload()
 {
 	echo "Reloading ipsec manual keys/policies."
-	/sbin/setkey -F
-	/sbin/setkey -FP
-	/sbin/setkey -f "$ipsec_file"
+	${ipsec_program} -F
+	${ipsec_program} -FP
+	${ipsec_program} -f "$ipsec_file"
 }
 
 load_rc_config $name

==== //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_array.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char *sccsid = "@(#)xdr_array.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.11 2002/07/31 12:50:28 darrenr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.13 2002/07/31 15:09:49 nectar Exp $");
 
 /*
  * xdr_array.c, Generic XDR routines impelmentation.
@@ -47,6 +47,7 @@
 
 #include "namespace.h"
 #include <err.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#32 (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.399 2002/07/31 04:01:12 bmah Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.400 2002/07/31 16:13:59 bmah Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -1945,6 +1945,12 @@
       url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:30.ktrace.asc">FreeBSD-SA-02:30</ulink>
       for more details. &merged;</para>
 
+    <para>A race condition in &man.pppd.8;, which could be used to
+      change the permissions of an arbitrary file, has been corrected.
+      For more information, see security advisory <ulink
+      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:32.pppd.asc">FreeBSD-SA-02:32</ulink>.
+      &merged;</para>
+
   </sect2>
 
   <sect2 id="userland">

==== //depot/projects/trustedbsd/base/sbin/atacontrol/atacontrol.c#6 (text+ko) ====

@@ -25,7 +25,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/sbin/atacontrol/atacontrol.c,v 1.16 2002/04/05 21:51:03 sos Exp $
+ * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.17 2002/07/31 18:30:38 sos Exp $
  */
 
 #include <stdio.h>
@@ -119,6 +119,7 @@
 	printf("\n");
 	printf("ATA/ATAPI revision    %d\n", version(parm->version_major));
 	printf("device model          %.40s\n", parm->model);
+	printf("serial number         %.20s\n", parm->serial);
 	printf("firmware revision     %.8s\n", parm->revision);
 
 	printf("cylinders             %d\n", parm->cylinders);

==== //depot/projects/trustedbsd/base/share/dict/propernames#2 (text+ko) ====

@@ -6,8 +6,6 @@
 Ahmed
 Ahmet
 Aimee
-Amy
-Ami
 Al
 Alain
 Alan
@@ -73,8 +71,8 @@
 Bart
 Barton
 Bea
+Beckie
 Becky
-Beckie
 Belinda
 Ben
 Benjamin
@@ -88,8 +86,8 @@
 Betty
 Beverly
 Bill
+Billie
 Billy
-Billie
 Bjorne
 Blaine
 Blair
@@ -136,19 +134,15 @@
 Caroline
 Carolyn
 Carsten
-Kirsten
-Cristi
-Kristi
 Carter
 Cary
 Case
 Casey
-Leith
 Casper
-Cathy
 Catherine
 Cathrin
 Cathryn
+Cathy
 Cecilia
 Celeste
 Celia
@@ -167,12 +161,11 @@
 Christophe
 Christopher
 Chuck
-Charles
 Cindie
 Cindy
+Claire
 Clara
 Clare
-Claire
 Clarence
 Clarissa
 Clark
@@ -181,12 +174,11 @@
 Claudio
 Clay
 Clayton
-Samuel
+Clem
 Cliff
 Clifford
 Clyde
 Cole
-Clem
 Coleen
 Colin
 Collin
@@ -197,7 +189,7 @@
 Courtney
 Craig
 Cris
-Kris
+Cristi
 Cristina
 Cristopher
 Curt
@@ -208,15 +200,14 @@
 Dalton
 Damon
 Damone
-Ramon
 Dan
 Dana
 Dani
 Daniel
 Daniele
 Danielle
+Dannie
 Danny
-Dannie
 Darci
 Daren
 Darin
@@ -240,17 +231,13 @@
 Dennis
 Derek
 Devon
-Huey
 Dewey
-Louis
-Louie
 Diana
 Diane
 Dick
-Richard
 Dieter
+Dimetry
 Dimitry
-Dimetry
 Dion
 Dirk
 Dominic
@@ -259,14 +246,14 @@
 Donal
 Donald
 Donn
+Donna
 Donne
-Donna
 Donnie
 Donovan
 Dori
-Dory
 Dorian
 Dorothy
+Dory
 Doug
 Douglas
 Doyle
@@ -281,22 +268,17 @@
 Earl
 Earle
 Earnie
-Ernie
 Ed
+Eddie
 Eddy
 Edgar
-Eddie
 Edith
 Edmond
 Edmund
 Eduardo
 Edward
 Edwin
-Eva
 Eileen
-Erick
-Erik
-Eric
 Elaine
 Eli
 Elias
@@ -310,12 +292,13 @@
 Elric
 Elsa
 Elvis
+Elwood
 Emil
 Emily
-Elwood
 Emma
 Emmett
 Eric
+Erick
 Erik
 Ernest
 Ernie
@@ -323,12 +306,12 @@
 Erwin
 Ethan
 Eugene
+Eva
 Evan
 Evelyn
 Everett
 Farouk
 Fay
-Frederick
 Felix
 Fletcher
 Floria
@@ -340,8 +323,6 @@
 Francois
 Frank
 Franklin
-Jerrie
-Jerry
 Fred
 Frederic
 Frederick
@@ -354,22 +335,16 @@
 Gene
 Geoff
 Geoffrey
-Jeff
-Jeffrey
-Jeffie
 George
 Gerald
-Jerald
-Hazel
 Gerard
 Gideon
 Gigi
 Gil
+Giles
 Gill
 Gilles
-Giles
 Ginny
-Jinny
 Giovanni
 Glen
 Glenn
@@ -404,6 +379,7 @@
 Hartmann
 Harv
 Harvey
+Hazel
 Heather
 Hector
 Heidi
@@ -437,6 +413,7 @@
 Hsuan
 Huashi
 Hubert
+Huey
 Hugh
 Hughes
 Hui
@@ -495,14 +472,17 @@
 Jef
 Jeff
 Jeffery
+Jeffie
 Jeffrey
 Jelske
 Jem
 Jenine
 Jennie
 Jennifer
+Jerald
 Jeremy
 Jerome
+Jerrie
 Jerry
 Jesper
 Jess
@@ -516,6 +496,7 @@
 Jin
 Jinchao
 Jingbai
+Jinny
 Jiri
 Jisheng
 Jitendra
@@ -606,6 +587,7 @@
 Kinch
 King
 Kirk
+Kirsten
 Kit
 Kitty
 Klaudia
@@ -651,9 +633,10 @@
 Leif
 Leigh
 Leila
+Leith
 Len
+Lenny
 Lenora
-Lenny
 Leo
 Leon
 Leonard
@@ -688,6 +671,7 @@
 Lorien
 Lorraine
 Lou
+Louie
 Louiqa
 Louis
 Louise
@@ -971,6 +955,7 @@
 Ramesh
 Ramiro
 Ramneek
+Ramon
 Ramsey
 Rand
 Randal
@@ -1305,8 +1290,8 @@
 Warren
 Wayne
 Wendell
+Wendi
 Wendy
-Wendi
 Werner
 Wes
 Will

==== //depot/projects/trustedbsd/base/share/examples/etc/make.conf#11 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/examples/etc/make.conf,v 1.195 2002/07/29 08:51:04 ru Exp $
+# $FreeBSD: src/share/examples/etc/make.conf,v 1.196 2002/07/31 15:06:09 ume Exp $
 #
 # NOTE:  Please would any committer updating this file also update the
 # make.conf(5) manual page, if necessary, which is located in
@@ -293,7 +293,7 @@
 # sendmail and its related utilities. For example, SASL support can be
 # added with settings such as:
 #
-#	SENDMAIL_CFLAGS=-I/usr/local/include/sasl -DSASL
+#	SENDMAIL_CFLAGS=-I/usr/local/include/sasl1 -DSASL
 #	SENDMAIL_LDFLAGS=-L/usr/local/lib
 #	SENDMAIL_LDADD=-lsasl
 #

==== //depot/projects/trustedbsd/base/sys/conf/Makefile.alpha#6 (text+ko) ====

@@ -1,7 +1,7 @@
 # Makefile.alpha -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.alpha	7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.124 2002/07/13 19:36:13 bde Exp $
+# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.125 2002/07/31 14:59:05 jake Exp $
 #
 # Makefile for FreeBSD
 #
@@ -90,6 +90,9 @@
 	@(echo "define(NAME,\`__reml')define(OP,\`rem')define(S,\`true')"; \
 	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
+locore.o: $S/$M/$M/locore.s assym.s
+	${NORMAL_S}
+
 %RULES
 
 .include "$S/conf/kern.post.mk"

==== //depot/projects/trustedbsd/base/sys/conf/Makefile.i386#7 (text+ko) ====

@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.i386,v 1.256 2002/07/13 19:36:13 bde Exp $
+# $FreeBSD: src/sys/conf/Makefile.i386,v 1.257 2002/07/31 14:59:05 jake Exp $
 #
 # Makefile for FreeBSD
 #
@@ -44,6 +44,9 @@
 
 %CLEAN
 
+locore.o: $S/$M/$M/locore.s assym.s
+	${NORMAL_S}
+
 %RULES
 
 .include "$S/conf/kern.post.mk"

==== //depot/projects/trustedbsd/base/sys/conf/Makefile.ia64#9 (text+ko) ====

@@ -1,7 +1,7 @@
 # Makefile.ia64 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: src/sys/conf/Makefile.alpha,v 1.76
-# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.51 2002/07/13 19:36:13 bde Exp $
+# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.52 2002/07/31 14:59:05 jake Exp $
 #
 # Makefile for FreeBSD
 #
@@ -46,6 +46,9 @@
 
 %CLEAN
 
+locore.o: $S/$M/$M/locore.s assym.s
+	${NORMAL_S}
+
 %RULES
 
 .include "$S/conf/kern.post.mk"

==== //depot/projects/trustedbsd/base/sys/conf/Makefile.pc98#6 (text+ko) ====

@@ -3,7 +3,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.157 2002/07/13 19:36:13 bde Exp $
+# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.158 2002/07/31 14:59:05 jake Exp $
 #
 # Makefile for FreeBSD
 #
@@ -45,6 +45,9 @@
 
 %CLEAN
 
+locore.o: $S/$M/$M/locore.s assym.s
+	${NORMAL_S}
+
 %RULES
 
 .include "$S/conf/kern.post.mk"

==== //depot/projects/trustedbsd/base/sys/conf/Makefile.powerpc#7 (text+ko) ====

@@ -1,7 +1,7 @@
 # Makefile.powerpc -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.262 2002/07/13 19:36:13 bde Exp $
+# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.263 2002/07/31 14:59:05 jake Exp $
 #
 # Makefile for FreeBSD
 #
@@ -54,6 +54,9 @@
 
 %CLEAN
 
+locore.o: $S/$M/$M/locore.s assym.s
+	${NORMAL_S}
+
 %RULES
 
 .include "$S/conf/kern.post.mk"

==== //depot/projects/trustedbsd/base/sys/conf/Makefile.sparc64#11 (text+ko) ====

@@ -1,7 +1,7 @@
 # Makefile.sparc64 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.20 2002/07/13 19:36:14 bde Exp $
+# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.22 2002/07/31 15:52:04 jake Exp $
 #
 # Makefile for FreeBSD
 #
@@ -39,7 +39,7 @@
 # XXX: this should probably go somewhere else
 COPTS+=		-mcmodel=medlow -msoft-float
 
-SYSTEM_SFILES= $S/$M/$M/locore.s $S/$M/$M/exception.s
+SYSTEM_SFILES= $S/$M/$M/locore.S $S/$M/$M/exception.S
 SYSTEM_OBJS= locore.o exception.o vnode_if.o ${OBJS} hints.o env.o config.o hack.So
 
 %BEFORE_DEPEND
@@ -60,7 +60,10 @@
 #	    grep -v 'struct/union .* never defined' | \
 #	    grep -v 'possible pointer alignment problem'
 
-exception.o: $S/$M/$M/exception.s assym.s
+exception.o: $S/$M/$M/exception.S assym.s
+	${NORMAL_S}
+
+locore.o: $S/$M/$M/locore.S assym.s
 	${NORMAL_S}
 
 %RULES

==== //depot/projects/trustedbsd/base/sys/conf/Makefile.x86_64#2 (text+ko) ====

@@ -2,7 +2,7 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
 #	from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49
-# $FreeBSD: src/sys/conf/Makefile.x86_64,v 1.2 2002/07/13 19:36:14 bde Exp $
+# $FreeBSD: src/sys/conf/Makefile.x86_64,v 1.3 2002/07/31 14:59:05 jake Exp $
 #
 # Makefile for FreeBSD
 #
@@ -45,6 +45,9 @@
 
 %CLEAN
 
+locore.o: $S/$M/$M/locore.s assym.s
+	${NORMAL_S}
+
 %RULES
 
 .include "$S/conf/kern.post.mk"

==== //depot/projects/trustedbsd/base/sys/conf/files.i386#14 (text+ko) ====

@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD: src/sys/conf/files.i386,v 1.408 2002/07/24 12:35:52 jhb Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.409 2002/07/31 18:27:30 sos Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -118,6 +118,9 @@
 dev/kbd/kbd.c			optional	ukbd
 dev/kbd/kbd.c			optional	vt
 dev/lnc/if_lnc_isa.c		optional	lnc isa
+dev/pst/pst-pci.c		optional	pst pci
+dev/pst/pst-iop.c		optional	pst
+dev/pst/pst-raid.c		optional	pst
 dev/sbni/if_sbni.c		optional	sbni
 dev/sbni/if_sbni_isa.c		optional	sbni isa
 dev/sbni/if_sbni_pci.c		optional	sbni pci

==== //depot/projects/trustedbsd/base/sys/conf/files.sparc64#13 (text+ko) ====

@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD: src/sys/conf/files.sparc64,v 1.28 2002/07/29 00:45:13 jake Exp $
+# $FreeBSD: src/sys/conf/files.sparc64,v 1.29 2002/07/31 15:52:04 jake Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -36,10 +36,10 @@
 sparc64/sparc64/db_trace.c	optional	ddb
 sparc64/sparc64/db_hwwatch.c	optional	ddb
 sparc64/sparc64/elf_machdep.c	standard
-# locore.s and exception.s need to be handled in Makefile to put them first.
-# Otherwise it's they're normal.
-# sparc64/sparc64/locore.s	standard
-# sparc64/sparc64/exception.s	standard
+# locore.S and exception.S need to be handled in the Makefile to put them
+# first.  Otherwise they're normal.
+# sparc64/sparc64/locore.S	standard
+# sparc64/sparc64/exception.S	standard
 sparc64/sparc64/eeprom.c	optional	eeprom
 sparc64/sparc64/eeprom_ebus.c	optional	eeprom ebus
 sparc64/sparc64/eeprom_sbus.c	optional	eeprom sbus
@@ -49,8 +49,8 @@
 sparc64/sparc64/iommu.c		standard
 sparc64/sparc64/machdep.c	standard
 sparc64/sparc64/mem.c		standard
-sparc64/sparc64/mp_exception.s	optional	smp
-sparc64/sparc64/mp_locore.s	optional	smp
+sparc64/sparc64/mp_exception.S	optional	smp
+sparc64/sparc64/mp_locore.S	optional	smp
 sparc64/sparc64/mp_machdep.c	optional	smp
 sparc64/sparc64/nexus.c		standard
 sparc64/sparc64/ofw_bus.c	standard
@@ -59,9 +59,9 @@
 sparc64/sparc64/prof_machdep.c	optional	profiling-routine
 sparc64/sparc64/rwindow.c	standard
 sparc64/sparc64/sparcbus_if.m	standard
-sparc64/sparc64/support.s	standard
+sparc64/sparc64/support.S	standard
 sparc64/sparc64/sys_machdep.c	standard
-sparc64/sparc64/swtch.s		standard
+sparc64/sparc64/swtch.S		standard
 sparc64/sparc64/tick.c		standard
 sparc64/sparc64/tlb.c		standard
 sparc64/sparc64/trap.c		standard

==== //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#12 (text+ko) ====

@@ -6,7 +6,7 @@
 # should be defined in the kern.pre.mk so that port makefiles can
 # override or augment them.
 #
-# $FreeBSD: src/sys/conf/kern.post.mk,v 1.23 2002/07/29 09:40:15 ru Exp $
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.24 2002/07/31 14:59:05 jake Exp $
 #
 
 # XXX why are only some phony targets marked phony?
@@ -60,9 +60,6 @@
 lint: ${CFILES}
 	${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC}
 
-locore.o: $S/$M/$M/locore.s assym.s
-	${NORMAL_S}
-
 # This is a hack.  BFD "optimizes" away dynamic mode if there are no
 # dynamic references.  We could probably do a '-Bforcedynamic' mode like
 # in the a.out ld.  For now, this works.

==== //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#14 (text+ko) ====

@@ -25,7 +25,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/sys/dev/ata/ata-all.c,v 1.151 2002/07/22 18:35:01 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.152 2002/07/31 18:29:34 sos Exp $
  */
 
 #include "opt_ata.h"
@@ -509,6 +509,9 @@
     bswap(ata_parm->revision, sizeof(ata_parm->revision));
     btrim(ata_parm->revision, sizeof(ata_parm->revision));
     bpack(ata_parm->revision, ata_parm->revision, sizeof(ata_parm->revision));
+    bswap(ata_parm->serial, sizeof(ata_parm->serial));
+    btrim(ata_parm->serial, sizeof(ata_parm->serial));
+    bpack(ata_parm->serial, ata_parm->serial, sizeof(ata_parm->serial));
     atadev->param = ata_parm;
     return 0;
 }

==== //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#3 (text+ko) ====

@@ -1,5 +1,5 @@
 /*	$NetBSD: uaudio.c,v 1.41 2001/01/23 14:04:13 augustss Exp $	*/

>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message



More information about the trustedbsd-cvs mailing list