Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 4 Jun 2003 16:43:14 -0700 (PDT)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 32604 for review
Message-ID:  <200306042343.h54NhEmT053114@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=32604

Change 32604 by peter@peter_daintree on 2003/06/04 16:43:09

	IFC @32603

Affected files ...

.. //depot/projects/hammer/MAINTAINERS#8 integrate
.. //depot/projects/hammer/bin/df/df.1#4 integrate
.. //depot/projects/hammer/bin/df/df.c#7 integrate
.. //depot/projects/hammer/bin/ed/cbc.c#3 integrate
.. //depot/projects/hammer/lib/csu/i386-elf/Makefile#3 integrate
.. //depot/projects/hammer/lib/libc/amd64/gen/_setjmp.S#6 integrate
.. //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#8 integrate
.. //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#9 integrate
.. //depot/projects/hammer/lib/libc/sys/extattr_get_file.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/kldload.2#3 integrate
.. //depot/projects/hammer/lib/libc_r/test/guard_b.c#3 integrate
.. //depot/projects/hammer/lib/libc_r/test/join_leak_d.c#2 integrate
.. //depot/projects/hammer/lib/libc_r/test/mutex_d.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#9 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#7 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#9 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#12 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#6 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigprocmask.c#3 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_init.c#5 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_private.h#6 integrate
.. //depot/projects/hammer/lib/libwrap/Makefile#4 integrate
.. //depot/projects/hammer/libexec/rtld-elf/Makefile#5 integrate
.. //depot/projects/hammer/libexec/tcpd/Makefile#3 integrate
.. //depot/projects/hammer/release/Makefile#28 integrate
.. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#9 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.c#8 integrate
.. //depot/projects/hammer/secure/Makefile#2 integrate
.. //depot/projects/hammer/secure/lib/libcipher/Makefile#3 delete
.. //depot/projects/hammer/secure/lib/libcipher/README#2 delete
.. //depot/projects/hammer/secure/lib/libcipher/README.FreeBSD#2 delete
.. //depot/projects/hammer/secure/lib/libcipher/cipher.3#2 delete
.. //depot/projects/hammer/secure/lib/libcipher/crypt.c#3 delete
.. //depot/projects/hammer/secure/lib/libcipher/test/Makefile#2 delete
.. //depot/projects/hammer/secure/lib/libcipher/test/README#2 delete
.. //depot/projects/hammer/secure/lib/libcipher/test/cert.c#2 delete
.. //depot/projects/hammer/secure/lib/libcipher/test/cert.input#2 delete
.. //depot/projects/hammer/secure/lib/libcipher/test/speedcrypt.c#2 delete
.. //depot/projects/hammer/secure/lib/libcipher/test/speeddes.c#2 delete
.. //depot/projects/hammer/share/man/man4/Makefile#14 integrate
.. //depot/projects/hammer/share/man/man4/cd.4#2 integrate
.. //depot/projects/hammer/share/man/man4/en.4#2 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#7 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/en.4#2 delete
.. //depot/projects/hammer/share/man/man9/VOP_GETEXTATTR.9#5 integrate
.. //depot/projects/hammer/share/man/man9/extattr.9#3 integrate
.. //depot/projects/hammer/share/mk/bsd.libnames.mk#12 integrate
.. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#7 integrate
.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#10 integrate
.. //depot/projects/hammer/sys/amd64/include/param.h#7 integrate
.. //depot/projects/hammer/sys/dev/aac/aac.c#9 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-card.c#7 integrate
.. //depot/projects/hammer/sys/dev/en/midway.c#10 integrate
.. //depot/projects/hammer/sys/dev/firewire/firewire.c#12 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwmem.c#6 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#8 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwohcireg.h#5 integrate
.. //depot/projects/hammer/sys/dev/firewire/sbp.c#14 integrate
.. //depot/projects/hammer/sys/dev/hifn/hifn7751.c#4 integrate
.. //depot/projects/hammer/sys/dev/hifn/hifn7751var.h#3 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi.h#2 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_cnfg.h#2 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_init.h#2 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_raid.h#2 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt.c#4 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt.h#2 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_freebsd.c#7 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_freebsd.h#4 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccarddevs#9 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccarddevs.h#9 integrate
.. //depot/projects/hammer/sys/dev/pci/pci.c#9 integrate
.. //depot/projects/hammer/sys/dev/ubsec/ubsec.c#7 integrate
.. //depot/projects/hammer/sys/dev/ubsec/ubsecvar.h#4 integrate
.. //depot/projects/hammer/sys/dev/vinum/vinum.c#6 integrate
.. //depot/projects/hammer/sys/geom/geom.h#18 integrate
.. //depot/projects/hammer/sys/geom/geom_ccd.c#1 branch
.. //depot/projects/hammer/sys/geom/geom_ctl.c#11 integrate
.. //depot/projects/hammer/sys/geom/geom_subr.c#15 integrate
.. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#10 integrate
.. //depot/projects/hammer/sys/i386/include/acpica_machdep.h#2 integrate
.. //depot/projects/hammer/sys/ia64/ia64/mem.c#5 integrate
.. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#9 integrate
.. //depot/projects/hammer/sys/kern/init_sysent.c#13 integrate
.. //depot/projects/hammer/sys/kern/kern_thr.c#8 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#28 integrate
.. //depot/projects/hammer/sys/kern/kern_timeout.c#4 integrate
.. //depot/projects/hammer/sys/kern/kern_umtx.c#3 integrate
.. //depot/projects/hammer/sys/kern/subr_mbuf.c#12 integrate
.. //depot/projects/hammer/sys/kern/syscalls.c#13 integrate
.. //depot/projects/hammer/sys/kern/syscalls.master#13 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#13 integrate
.. //depot/projects/hammer/sys/kern/vfs_vnops.c#8 integrate
.. //depot/projects/hammer/sys/modules/geom/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/geom/geom_vol_ffs/Makefile#1 branch
.. //depot/projects/hammer/sys/netinet/ip_dummynet.c#7 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw.h#5 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#9 integrate
.. //depot/projects/hammer/sys/netinet/tcp_timer.c#4 integrate
.. //depot/projects/hammer/sys/opencrypto/crypto.c#5 integrate
.. //depot/projects/hammer/sys/opencrypto/cryptodev.c#5 integrate
.. //depot/projects/hammer/sys/opencrypto/cryptodev.h#4 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#6 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#6 integrate
.. //depot/projects/hammer/sys/sys/extattr.h#4 integrate
.. //depot/projects/hammer/sys/sys/kernel.h#4 integrate
.. //depot/projects/hammer/sys/sys/kse.h#9 integrate
.. //depot/projects/hammer/sys/sys/proc.h#25 integrate
.. //depot/projects/hammer/sys/sys/syscall.h#13 integrate
.. //depot/projects/hammer/sys/sys/syscall.mk#13 integrate
.. //depot/projects/hammer/sys/sys/sysproto.h#13 integrate
.. //depot/projects/hammer/sys/sys/umtx.h#2 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#23 integrate
.. //depot/projects/hammer/sys/vm/vm_object.h#11 integrate
.. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.s3.out#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.s4.out#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.s5.out#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.sg.out#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.sh#2 integrate
.. //depot/projects/hammer/tools/tools/crypto/cryptotest.c#2 integrate
.. //depot/projects/hammer/usr.bin/kdump/kdump.1#2 integrate
.. //depot/projects/hammer/usr.bin/kdump/kdump.c#5 integrate
.. //depot/projects/hammer/usr.bin/mklocale/yacc.y#5 integrate
.. //depot/projects/hammer/usr.bin/sed/process.c#4 integrate
.. //depot/projects/hammer/usr.bin/unifdef/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#20 integrate
.. //depot/projects/hammer/usr.sbin/crunch/crunchide/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/crunch/crunchide/exec_elf32.c#6 integrate
.. //depot/projects/hammer/usr.sbin/mergemaster/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/disks.c#10 integrate
.. //depot/projects/hammer/usr.sbin/tcpdchk/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/tcpdmatch/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/ypbind/ypbind.8#2 integrate

Differences ...

==== //depot/projects/hammer/MAINTAINERS#8 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.60 2003/04/27 05:51:12 imp Exp $
+$FreeBSD: src/MAINTAINERS,v 1.64 2003/06/04 16:05:38 markm Exp $
 
 subsystem	login	notes
 -----------------------------
@@ -78,3 +78,102 @@
 sppp(4)		joerg	Just keep me informed of changes, try not to break it.
 libc		nectar	Opportuntity for pre-commit review appreciated for
 			nsdispatch(3) and its consumers.
+unifdef(1)	fanf	Pre-commit review requested.
+
+Following are the entries from the Makefiles, and a few other sources.
+Please remove stale entries from both their origin, and this file.
+
+Please also consider removing the lines from the files listed below and
+stating your preferences here instead.
+
+bin/dd/Makefile:MAINTAINER=	green@FreeBSD.org
+bin/rmail/Makefile:MAINTAINER=	gshapiro@FreeBSD.org
+contrib/cvs/FREEBSD-upgrade:MAINTAINER=	peter@FreeBSD.org
+games/fortune/datfiles/Makefile:MAINTAINER=	jkh@FreeBSD.org
+gnu/usr.bin/binutils/Makefile:MAINTAINER=	obrien@FreeBSD.org
+gnu/usr.bin/cvs/Makefile:MAINTAINER=	peter@FreeBSD.org
+gnu/usr.bin/cvs/contrib/Makefile:MAINTAINER=	peter@FreeBSD.org
+gnu/usr.bin/cvs/cvs/Makefile:MAINTAINER=	peter@FreeBSD.org
+gnu/usr.bin/cvs/cvsbug/Makefile:MAINTAINER=	peter@FreeBSD.org
+gnu/usr.bin/cvs/doc/Makefile:MAINTAINER=	peter@FreeBSD.org
+gnu/usr.bin/cvs/lib/Makefile:MAINTAINER=	peter@FreeBSD.org
+gnu/usr.bin/cvs/libdiff/Makefile:MAINTAINER=	peter@FreeBSD.org
+gnu/usr.bin/man/apropos/Makefile:MAINTAINER=	wosch@FreeBSD.org
+lib/libbz2/Makefile:MAINTAINER=	obrien@FreeBSD.org
+lib/libc/posix1e/Makefile.inc:MAINTAINER=	rwatson@FreeBSD.org
+lib/libcam/Makefile:MAINTAINER=	ken@FreeBSD.ORG
+lib/libdevstat/Makefile:MAINTAINER=	ken@FreeBSD.ORG
+lib/libmilter/Makefile:MAINTAINER=	gshapiro@FreeBSD.org
+lib/libsm/Makefile:MAINTAINER=	gshapiro@FreeBSD.org
+lib/libsmdb/Makefile:MAINTAINER=	gshapiro@FreeBSD.org
+lib/libsmutil/Makefile:MAINTAINER=	gshapiro@FreeBSD.org
+lib/libusbhid/Makefile:MAINTAINER=	n_hibma@FreeBSD.ORG
+lib/libz/Makefile:MAINTAINER=	peter@FreeBSD.org
+libexec/lukemftpd/Makefile:MAINTAINER=	obrien@FreeBSD.org
+libexec/mail.local/Makefile:MAINTAINER=	gshapiro@FreeBSD.org
+libexec/smrsh/Makefile:MAINTAINER=	gshapiro@FreeBSD.org
+sbin/camcontrol/Makefile:MAINTAINER=	ken@FreeBSD.org
+sbin/dhclient/Makefile.inc:MAINTAINER=	murray@FreeBSD.org
+sbin/ffsinfo/Makefile:MAINTAINER=	tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG
+sbin/growfs/Makefile:MAINTAINER=	tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG
+sbin/ipf/Makefile:MAINTAINER=	guido@freebsd.org
+sbin/ipfs/Makefile:MAINTAINER=	darrenr@freebsd.org
+sbin/ipfstat/Makefile:MAINTAINER=	guido@freebsd.org
+sbin/ipmon/Makefile:MAINTAINER=	guido@freebsd.org
+sbin/ipnat/Makefile:MAINTAINER=	guido@freebsd.org
+share/doc/smm/08.sendmailop/Makefile:MAINTAINER=	gshapiro@FreeBSD.org
+share/sendmail/Makefile:MAINTAINER=	gshapiro@FreeBSD.org
+sys/boot/i386/cdboot/Makefile:MAINTAINER=	jhb@FreeBSD.org
+sys/boot/i386/pxeldr/Makefile:MAINTAINER=	jhb@FreeBSD.org
+sys/compat/svr4/Makefile:MAINTAINER=	newton@freebsd.org
+sys/dev/asr/MAINTAINER:MAINTAINER=	obrien@freebsd.org, scott_long@btc.adaptec.com, mark_salyzyn@adaptec.com
+sys/dev/bktr/CHANGELOG.TXT:MAINTAINER=	Roger Hardiman <roger@freebsd.org>
+sys/dev/ep/if_ep.c:MAINTAINER=	Matthew N. Dodd <winter@jurai.net>
+sys/dev/ex/if_ex.c:MAINTAINER=	Matthew N. Dodd <winter@jurai.net>
+sys/dev/ie/if_ie.c:MAINTAINER=	Matthew N. Dodd <winter@jurai.net>
+sys/dev/sound/pcm/feeder_rate.c:MAINTAINER=	Orion Hodson <orion@freebsd.org>
+sys/modules/3dfx/Makefile:MAINTAINER=	cokane@FreeBSD.org
+sys/modules/bktr/bktr_mem/Makefile:MAINTAINER=	roger@freebsd.org
+sys/modules/cam/Makefile:MAINTAINER=	n_hibma@freebsd.org
+sys/modules/linux/Makefile:MAINTAINER=	emulation@FreeBSD.org
+sys/modules/osf1/Makefile:MAINTAINER=	gallatin@FreeBSD.org
+sys/modules/pecoff/Makefile:MAINTAINER=	takawata@FreeBSD.org
+sys/modules/streams/Makefile:MAINTAINER=	newton@atdot.dotat.org
+sys/modules/svr4/Makefile:MAINTAINER=	newton@FreeBSD.org
+sys/modules/udbp/Makefile:MAINTAINER=	n_hibma@freebsd.org
+sys/modules/ugen/Makefile:MAINTAINER=	n_hibma@freebsd.org
+sys/modules/uhid/Makefile:MAINTAINER=	n_hibma@freebsd.org
+sys/modules/ukbd/Makefile:MAINTAINER=	n_hibma@freebsd.org
+sys/modules/ulpt/Makefile:MAINTAINER=	n_hibma@freebsd.org
+sys/modules/umass/Makefile:MAINTAINER=	n_hibma@freebsd.org
+sys/modules/umodem/Makefile:MAINTAINER=	n_hibma@freebsd.org
+sys/modules/ums/Makefile:MAINTAINER=	n_hibma@freebsd.org
+sys/modules/urio/Makefile:MAINTAINER=	Iwasa Kazmi <kzmi@ca2.so-net.ne.jp>
+sys/modules/usb/Makefile:MAINTAINER=	n_hibma@freebsd.org
+sys/modules/uscanner/Makefile:MAINTAINER=	n_hibma@freebsd.org
+usr.bin/brandelf/Makefile:MAINTAINER=	obrien@FreeBSD.org
+usr.bin/bzip2/Makefile:MAINTAINER=	obrien@FreeBSD.org
+usr.bin/bzip2recover/Makefile:MAINTAINER=	obrien@FreeBSD.org
+usr.bin/chat/Makefile:MAINTAINER=	peter@freebsd.org
+usr.bin/locate/Makefile:MAINTAINER=	wosch@FreeBSD.org
+usr.bin/vacation/Makefile:MAINTAINER=	gshapiro@FreeBSD.org
+usr.bin/whois/Makefile:MAINTAINER=	mike@FreeBSD.org
+usr.sbin/editmap/Makefile:MAINTAINER=	gshapiro@FreeBSD.org
+usr.sbin/inetd/Makefile:MAINTAINER=	dwmalone@FreeBSD.org
+usr.sbin/iostat/Makefile:MAINTAINER=	ken@FreeBSD.ORG
+usr.sbin/ipftest/Makefile:MAINTAINER=	guido@freebsd.org
+usr.sbin/ipresend/Makefile:MAINTAINER=	guido@freebsd.org
+usr.sbin/ipsend/Makefile:MAINTAINER=	guido@freebsd.org
+usr.sbin/iptest/Makefile:MAINTAINER=	guido@freebsd.org
+usr.sbin/lpr/Makefile:MAINTAINER=	wollman@FreeBSD.org
+usr.sbin/lpr/Makefile:MAINTAINER+=	gad@FreeBSD.org
+usr.sbin/mailstats/Makefile:MAINTAINER=	gshapiro@FreeBSD.org
+usr.sbin/makemap/Makefile:MAINTAINER=	gshapiro@FreeBSD.org
+usr.sbin/ntp/Makefile:MAINTAINER=	roberto@FreeBSD.org
+usr.sbin/ntp/Makefile.inc:MAINTAINER=	roberto@FreeBSD.org
+usr.sbin/ntp/doc/Makefile:MAINTAINER=	sheldonh@FreeBSD.org
+usr.sbin/pppd/Makefile:MAINTAINER=	peter@freebsd.org
+usr.sbin/pppstats/Makefile:MAINTAINER=	peter@freebsd.org
+usr.sbin/praliases/Makefile:MAINTAINER=	gshapiro@FreeBSD.org
+usr.sbin/sendmail/Makefile:MAINTAINER=	gshapiro@FreeBSD.org
+usr.sbin/zic/Makefile:MAINTAINER=	wollman@FreeBSD.org

==== //depot/projects/hammer/bin/df/df.1#4 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\" $FreeBSD: src/bin/df/df.1,v 1.29 2003/05/06 21:54:46 trhodes Exp $
+.\" $FreeBSD: src/bin/df/df.1,v 1.30 2003/06/03 12:00:35 bde Exp $
 .\"
 .Dd May 8, 1995
 .Dt DF 1
@@ -148,9 +148,7 @@
 .Sh BUGS
 The
 .Fl n
-and
-.Fl t
-flags are ignored if a file or file system is specified.
+flag is ignored if a file or file system is specified.
 .Sh SEE ALSO
 .Xr lsvfs 1 ,
 .Xr quota 1 ,

==== //depot/projects/hammer/bin/df/df.c#7 (text+ko) ====

@@ -48,7 +48,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.48 2003/05/03 16:02:52 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.50 2003/06/03 11:54:42 bde Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -271,6 +271,7 @@
 			}
 		} else
 			mntpt = *argv;
+
 		/*
 		 * Statfs does not take a `wait' flag, so we cannot
 		 * implement nflag here.
@@ -280,6 +281,18 @@
 			rv = 1;
 			continue;
 		}
+
+		/*
+		 * Check to make sure the arguments we've been given are
+		 * satisfied.  Return an error if we have been asked to
+		 * list a mount point that does not match the other args
+		 * we've been given (-l, -t, etc.).
+		 */
+		if (checkvfsname(statfsbuf.f_fstypename, vfslist)) {
+			rv = 1;
+			continue;
+		}
+
 		if (argc == 1) {
 			bzero(&maxwidths, sizeof(maxwidths));
 			update_maxwidths(&maxwidths, &statfsbuf);

==== //depot/projects/hammer/bin/ed/cbc.c#3 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.18 2003/06/02 19:06:28 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.19 2003/06/03 17:03:48 jhay Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
@@ -76,8 +76,10 @@
 	MODE_ENCRYPT, MODE_DECRYPT, MODE_AUTHENTICATE
 } mode = MODE_ENCRYPT;
 
+#ifdef DES
 DES_cblock ivec;			/* initialization vector */
 DES_cblock pvec;			/* padding vector */
+#endif
 
 char bits[] = {				/* used to extract bits from a char */
 	'\200', '\100', '\040', '\020', '\010', '\004', '\002', '\001'
@@ -85,7 +87,9 @@
 
 int pflag;				/* 1 to preserve parity bits */
 
+#ifdef DES
 DES_key_schedule schedule;		/* expanded DES key */
+#endif
 
 unsigned char des_buf[8];	/* shared buffer for get_des_char/put_des_char */
 int des_ct = 0;			/* count for get_des_char/put_des_char */

==== //depot/projects/hammer/lib/csu/i386-elf/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/csu/i386-elf/Makefile,v 1.18 2003/05/04 18:34:00 obrien Exp $
+# $FreeBSD: src/lib/csu/i386-elf/Makefile,v 1.19 2003/06/04 11:21:18 bde Exp $
 
 .PATH: ${.CURDIR}/../common
 
@@ -6,10 +6,8 @@
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		gcrt1.o
 WARNS?=		6
-CFLAGS+=	-elf -Wall \
-		-I${.CURDIR}/../common \
+CFLAGS+=	-I${.CURDIR}/../common \
 		-I${.CURDIR}/../../libc/include
-LDFLAGS+=	-elf
 
 all: ${OBJS}
 

==== //depot/projects/hammer/lib/libc/amd64/gen/_setjmp.S#6 (text+ko) ====

@@ -38,7 +38,7 @@
 	.asciz "@(#)_setjmp.s	5.1 (Berkeley) 4/23/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/_setjmp.S,v 1.17 2003/04/30 18:09:33 peter Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/_setjmp.S,v 1.18 2003/06/02 22:37:53 peter Exp $");
 
 /*
  * C library -- _setjmp, _longjmp

==== //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#8 (text+ko) ====

@@ -38,7 +38,7 @@
 	.asciz "@(#)setjmp.s	5.1 (Berkeley) 4/23/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.25 2003/05/08 07:41:24 peter Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.26 2003/06/02 22:37:53 peter Exp $");
 
 /*
  * C library -- _setjmp, _longjmp

==== //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#9 (text+ko) ====

@@ -41,7 +41,7 @@
 	.asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.27 2003/06/02 21:59:13 peter Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.28 2003/06/02 22:37:53 peter Exp $");
 
 #include "SYS.h"
 

==== //depot/projects/hammer/lib/libc/sys/extattr_get_file.2#4 (text+ko) ====

@@ -1,5 +1,6 @@
 .\"
 .\" Copyright (c) 2001 Dima Dorfman <dima@unixfreak.org>
+.\" Copyright (c) 2003 Robert Watson <rwatson@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -23,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/extattr_get_file.2,v 1.12 2002/12/19 09:40:24 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/extattr_get_file.2,v 1.13 2003/06/04 04:00:26 rwatson Exp $
 .\"
 .Dd March 28, 2001
 .Dt EXTATTR 2
@@ -32,12 +33,15 @@
 .Nm extattr_get_fd ,
 .Nm extattr_set_fd ,
 .Nm extattr_delete_fd ,
+.Nm extattr_list_fd ,
 .Nm extattr_get_file ,
 .Nm extattr_set_file ,
 .Nm extattr_delete_file
+.Nm extattr_list_file ,
 .Nm extattr_get_link ,
 .Nm extattr_set_link ,
 .Nm extattr_delete_link
+.Nm extattr_list_link ,
 .Nd system calls to manipulate VFS extended attributes
 .Sh LIBRARY
 .Lb libc
@@ -52,23 +56,30 @@
 .Ft int
 .Fn extattr_delete_fd "int fd" "int attrnamespace" "const char *attrname"
 .Ft ssize_t
+.Fn extattr_list_fd "int fd" "int attrnamespace" "void *data" "size_t nbytes"
+.Ft ssize_t
 .Fn extattr_get_file "const char *path" "int attrnamespace" "const char *attrname" "void *data" "size_t nbytes"
 .Ft int
 .Fn extattr_set_file "const char *path" "int attrnamespace" "const char *attrname" "const void *data" "size_t nbytes"
 .Ft int
 .Fn extattr_delete_file "const char *path" "int attrnamespace" "const char *attrname"
 .Ft ssize_t
+.Fn extattr_list_file "const char *path" "int attrnamespace" "void *data" "size_t nbytes"
+.Ft ssize_t
 .Fn extattr_get_link "const char *path" "int attrnamespace" "const char *attrname" "void *data" "size_t nbytes"
 .Ft int
 .Fn extattr_set_link "const char *path" "int attrnamespace" "const char *attrname" "const void *data" "size_t nbytes"
 .Ft int
 .Fn extattr_delete_link "const char *path" "int attrnamespace" "const char *attrname"
+.Ft ssize_t
+.Fn extattr_list_link "const char *path" "int attrnamespace" "void *data" "size_t nbytes"
 .Sh DESCRIPTION
 Named extended attributes are meta-data associated with vnodes
 representing files and directories.
 They exist as
 .Qq Li name=value
 pairs within a set of namespaces.
+.Pp
 The
 .Fn extattr_get_file
 system call retrieves the value of the specified extended attribute into
@@ -85,18 +96,23 @@
 .Fn extattr_delete_file
 system call deletes the extended attribute specified.
 The
-.Fn extattr_get_file
+.Fn extattr_list_file
+returns a list of attributes present in the requested namespace, separated
+by ASCII 0 (nul) characters.
+The
+.Fn extattr_get_file ,
 and
-.Fn extattr_set_file
+.Fn extattr_list_file
 calls consume the
 .Fa data
 and
 .Fa nbytes
 arguments in the style of
-.Xr read 2
-and
-.Xr write 2 ,
-respectively.
+.Xr read 2 ;
+.Fn extattr_set_file
+consumes these arguments in the style of
+.Xr write 2.
+.Pp
 If
 .Fa data
 is
@@ -238,3 +254,13 @@
 .Fx 5.0 .
 It was developed to support security extensions requiring additional labels
 to be associated with each file or directory.
+.Sh BUGS
+In earlier versions of this API, passing an empty string for the
+attribute name to
+.Fn extattr_get_fd ,
+.Fn extattr_get_file ,
+or
+.Fn extattr_get_link
+would return the list of attributes defined for the target object.
+This interface has been deprecated in preference to using the explicit
+list API, and should not be used.

==== //depot/projects/hammer/lib/libc/sys/kldload.2#3 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/kldload.2,v 1.17 2002/12/18 09:22:30 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/kldload.2,v 1.18 2003/06/03 12:29:34 hmp Exp $
 .\"
 .Dd March 3, 1999
 .Dt KLDLOAD 2
@@ -71,6 +71,10 @@
 The file format of
 .Fa file
 was unrecognized.
+.It Bq Er EEXIST
+The supplied
+.Fa file
+has already been loaded.
 .El
 .Sh SEE ALSO
 .Xr kldfind 2 ,

==== //depot/projects/hammer/lib/libc_r/test/guard_b.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libc_r/test/guard_b.c,v 1.3 2003/06/01 23:03:49 rwatson Exp $
+ * $FreeBSD: src/lib/libc_r/test/guard_b.c,v 1.4 2003/06/04 20:36:08 marcel Exp $
  *
  * Test thread stack guard functionality.
  */
@@ -71,7 +71,7 @@
 	 */
 	if (parms->top - (void *)&top != FRAME_SIZE * parms->cur) {
 		fprintf(stderr, "Stack size (%d) != expected (%d), frame %d\n",
-		    parms->top - (void *)&top, FRAME_SIZE * parms->cur,
+		    (int)(parms->top - (void *)&top), FRAME_SIZE * parms->cur,
 		    parms->cur);
 	}
 

==== //depot/projects/hammer/lib/libc_r/test/join_leak_d.c#2 (text+ko) ====

@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libc_r/test/join_leak_d.c,v 1.1 2001/05/20 23:12:13 jasone Exp $
+ * $FreeBSD: src/lib/libc_r/test/join_leak_d.c,v 1.2 2003/06/04 08:16:32 mtm Exp $
  *
  * Test for leaked joined threads.
  */
@@ -65,6 +65,10 @@
 	for (i = 0; i < NITERATIONS; i++) {
 		if ((error = pthread_create(&thread, NULL, thread_entry, NULL))
 		    != 0) {
+			if (error == EAGAIN) {
+				i--;
+				continue;
+			}
 			fprintf(stderr, "Error in pthread_create(): %s\n",
 			    strerror(error));
 			exit(1);

==== //depot/projects/hammer/lib/libc_r/test/mutex_d.c#2 (text+ko) ====

@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libc_r/test/mutex_d.c,v 1.3 2002/07/02 01:26:16 deischen Exp $
+ * $FreeBSD: src/lib/libc_r/test/mutex_d.c,v 1.4 2003/06/04 20:38:54 marcel Exp $
  */
 #include <stdlib.h>
 #include <unistd.h>
@@ -37,6 +37,7 @@
 #include <sys/ioctl.h>
 #include <assert.h>
 #include <errno.h>
+#include <inttypes.h>
 #include "pthread.h"
 #include <sched.h>
 #include <signal.h>
@@ -465,8 +466,8 @@
 		pthread_mutex_unlock (&waiter_mutex);
 	}
 
-	log_trace ("Thread %d: Exiting thread 0x%x\n", (int) statep->id,
-	    (int) pthread_self());
+	log_trace ("Thread %d: Exiting thread 0x%" PRIxPTR "\n",
+	    (int) statep->id, (uintptr_t) pthread_self());
 	pthread_exit (arg);
 	return (NULL);
 }
@@ -512,8 +513,8 @@
 	if (statep->ret == 0)
 		pthread_mutex_unlock (statep->cmd.mutex);
 
-	log_trace ("Thread %d: Exiting thread 0x%x\n", (int) statep->id,
-	    (int) pthread_self());
+	log_trace ("Thread %d: Exiting thread 0x%" PRIxPTR "\n",
+	    (int) statep->id, (uintptr_t) pthread_self());
 	pthread_exit (arg);
 	return (NULL);
 }
@@ -522,8 +523,8 @@
 static void
 sighandler (int signo)
 {
-	log ("Signal handler caught signal %d, thread id 0x%x\n",
-	    signo, (int) pthread_self());
+	log ("Signal handler caught signal %d, thread id 0x%" PRIxPTR "\n",
+	    signo, (uintptr_t) pthread_self());
 
 	if (signo == SIGINT)
 		done = 1;

==== //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#9 (text+ko) ====

@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.43 2003/05/30 00:21:52 kan Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.44 2003/06/03 02:21:01 davidxu Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
@@ -152,6 +152,9 @@
 		/* Unlock the condition variable structure: */
 		THR_LOCK_RELEASE(curthread, &cv->c_lock);
 
+		/* Free the cond lock structure: */
+		_lock_destroy(&cv->c_lock);
+
 		/*
 		 * Free the memory allocated for the condition
 		 * variable structure:

==== //depot/projects/hammer/lib/libpthread/thread/thr_create.c#7 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libpthread/thread/thr_create.c,v 1.45 2003/05/24 02:29:25 deischen Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_create.c,v 1.46 2003/06/04 03:22:59 davidxu Exp $
  */
 #include <errno.h>
 #include <stdlib.h>
@@ -143,9 +143,6 @@
 		    || ((kseg = _kseg_alloc(curthread)) == NULL))) {
 			/* Insufficient memory to create a new KSE/KSEG: */
 			ret = EAGAIN;
-#ifndef	KMF_DONE
-#define	KMF_DONE	0x04
-#endif
 			if (kse != NULL) {
 				kse->k_mbx.km_flags |= KMF_DONE;
 				_kse_free(curthread, kse);

==== //depot/projects/hammer/lib/libpthread/thread/thr_init.c#9 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libpthread/thread/thr_init.c,v 1.54 2003/05/30 00:21:52 kan Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_init.c,v 1.55 2003/06/04 12:40:21 davidxu Exp $
  */
 
 /* Allocate space for global thread variables here: */
@@ -449,6 +449,35 @@
 		_thr_page_size = getpagesize();
 		_thr_guard_default = _thr_page_size;
 
+		/* Enter a loop to get the existing signal status: */
+		for (i = 1; i < NSIG; i++) {
+			/* Check for signals which cannot be trapped: */
+			if (i == SIGKILL || i == SIGSTOP) {
+			}
+
+			/* Get the signal handler details: */
+			else if (__sys_sigaction(i, NULL,
+			    &_thread_sigact[i - 1]) != 0) {
+				/*
+				 * Abort this process if signal
+				 * initialisation fails:
+				 */
+				PANIC("Cannot read signal handler info");
+			}
+		}
+		/*
+		 * Install the signal handler for SIGINFO.  It isn't
+		 * really needed, but it is nice to have for debugging
+		 * purposes.
+		 */
+		if (__sys_sigaction(SIGINFO, &act, NULL) != 0) {
+			/*
+			 * Abort this process if signal initialisation fails:
+			 */
+			PANIC("Cannot initialize signal handler");
+		}
+		_thread_sigact[SIGINFO - 1].sa_flags = SA_SIGINFO | SA_RESTART;
+
 		init_once = 1;	/* Don't do this again. */
 	} else {
 		/*
@@ -462,43 +491,14 @@
 		_lock_destroy(&_keytable_lock);
 	}
 
-
 	/* Initialize everything else. */
 	TAILQ_INIT(&_thread_list);
 	TAILQ_INIT(&_thread_gc_list);
 
 	/* Enter a loop to get the existing signal status: */
-	for (i = 1; i < NSIG; i++) {
-		/* Check for signals which cannot be trapped: */
-		if (i == SIGKILL || i == SIGSTOP) {
-		}
 
-		/* Get the signal handler details: */
-		else if (__sys_sigaction(i, NULL,
-		    &_thread_sigact[i - 1]) != 0) {
-			/*
-			 * Abort this process if signal
-			 * initialisation fails:
-			 */
-			PANIC("Cannot read signal handler info");
-		}
-
-		/* Initialize the SIG_DFL dummy handler count. */
-		_thread_dfl_count[i] = 0;
-	}
-
-	/*
-	 * Install the signal handler for SIGINFO.  It isn't
-	 * really needed, but it is nice to have for debugging
-	 * purposes.
-	 */
-	if (__sys_sigaction(SIGINFO, &act, NULL) != 0) {
-		/*
-		 * Abort this process if signal initialisation fails:
-		 */
-		PANIC("Cannot initialize signal handler");
-	}
-	_thread_sigact[SIGINFO - 1].sa_flags = SA_SIGINFO | SA_RESTART;
+	/* Initialize the SIG_DFL dummy handler count. */
+	bzero(_thread_dfl_count, sizeof(_thread_dfl_count));
 
 	/*
 	 * Initialize the lock for temporary installation of signal

==== //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#12 (text+ko) ====

@@ -33,7 +33,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.67 2003/05/24 02:29:25 deischen Exp $");
+__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.68 2003/06/04 03:22:59 davidxu Exp $");
 
 #include <sys/types.h>
 #include <sys/kse.h>
@@ -97,10 +97,6 @@
 
 #define KSE_RUNQ_THREADS(kse)	((kse)->k_schedq->sq_runq.pq_threads)
 
-#ifndef	KMF_DONE
-#define	KMF_DONE	0x04
-#endif
-
 /*
  * We've got to keep track of everything that is allocated, not only
  * to have a speedy free list, but also so they can be deallocated

==== //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#6 (text+ko) ====

@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libpthread/thread/thr_mutex.c,v 1.36 2003/05/30 00:21:52 kan Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_mutex.c,v 1.37 2003/06/03 02:21:01 davidxu Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
@@ -187,6 +187,8 @@
 				MUTEX_INIT_LINK(pmutex);
 				*mutex = pmutex;
 			} else {
+				/* Free the mutex lock structure: */
+				_lock_destroy(&pmutex->m_lock);
 				free(pmutex);
 				*mutex = NULL;
 			}
@@ -235,6 +237,10 @@
 			 * structure:
 			 */
 			MUTEX_ASSERT_NOT_OWNED(m);
+
+			/* Free the mutex lock structure: */
+			_lock_destroy(&m->m_lock);
+
 			free(m);
 		}
 	}

==== //depot/projects/hammer/lib/libpthread/thread/thr_sigprocmask.c#3 (text+ko) ====

@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libpthread/thread/thr_sigprocmask.c,v 1.14 2003/05/30 00:09:22 deischen Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_sigprocmask.c,v 1.15 2003/06/04 12:38:21 davidxu Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
@@ -44,8 +44,10 @@
 int
 _sigprocmask(int how, const sigset_t *set, sigset_t *oset)
 {
-	if (_kse_isthreaded() != 0)
-		return (pthread_sigmask(how, set, oset));
-	else
-		return (__sys_sigprocmask(how, set, oset));
+	int ret;
+
+	ret = pthread_sigmask(how, set, oset);
+	if ((ret == 0) && (_kse_isthreaded() == 0))
+		ret = __sys_sigprocmask(how, set, oset);
+	return (ret);
 }

==== //depot/projects/hammer/lib/libthr/thread/thr_init.c#5 (text+ko) ====

@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.7 2003/05/25 22:40:57 mtm Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.8 2003/06/04 08:23:05 mtm Exp $
  */
 
 /* Allocate space for global thread variables here: */
@@ -66,6 +66,8 @@
 
 #include "thr_private.h"
 
+extern void _thread_init_hack(void);
+
 /*
  * All weak references used within libc should be in this table.
  * This will is so that static libraries will work.
@@ -73,6 +75,8 @@
  * XXXTHR - Check this list.
  */
 static void *references[] = {
+	&_thread_init_hack,
+	&_thread_init,
 	&_accept,
 	&_bind,
 	&_close,
@@ -135,6 +139,8 @@
  * libraries, then the actual functions will not be loaded.
  */
 static void *libgcc_references[] = {
+	&_thread_init_hack,
+	&_thread_init,
 	&_pthread_once,
 	&_pthread_key_create,
 	&_pthread_key_delete,

==== //depot/projects/hammer/lib/libthr/thread/thr_private.h#6 (text+ko) ====

@@ -31,7 +31,7 @@
  *
  * Private thread definitions for the uthread kernel.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.14 2003/05/26 00:37:07 mtm Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.15 2003/06/03 09:31:33 mtm Exp $
  */
 
 #ifndef _THR_PRIVATE_H
@@ -141,7 +141,7 @@
  */
 #define TAILQ_INITIALIZER	{ NULL, NULL }
 
-#define	UMTX_INITIALIZER	{ NULL, NULL }
+#define	UMTX_INITIALIZER	{ NULL }
 
 struct pthread_mutex_attr {
 	enum pthread_mutextype	m_type;

==== //depot/projects/hammer/lib/libwrap/Makefile#4 (text+ko) ====

@@ -1,9 +1,7 @@
 #
-# $FreeBSD: src/lib/libwrap/Makefile,v 1.12 2003/05/12 21:59:16 hmp Exp $
+# $FreeBSD: src/lib/libwrap/Makefile,v 1.13 2003/06/04 16:01:37 markm Exp $
 #
 
-MAINTAINER=markm@FreeBSD.org
-
 LIB=	wrap
 SHLIB_MAJOR= 3
 INCS=	tcpd.h

==== //depot/projects/hammer/libexec/rtld-elf/Makefile#5 (text+ko) ====

@@ -1,9 +1,10 @@
-# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.19 2003/05/29 22:58:22 kan Exp $
+# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.20 2003/06/04 05:42:04 obrien Exp $
 
 PROG=		ld-elf.so.1
 SRCS=		rtld_start.S rtld.c rtld_lock.c map_object.c malloc.c \
 		xmalloc.c debug.c reloc.c
 MAN=		rtld.1
+CSTD?=		gnu99
 CFLAGS+=	-Wall -DFREEBSD_ELF -DIN_RTLD
 CFLAGS+=	-I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR}
 LDFLAGS+=	-nostdlib -e .rtld_start

==== //depot/projects/hammer/libexec/tcpd/Makefile#3 (text+ko) ====

@@ -1,6 +1,4 @@
-# $FreeBSD: src/libexec/tcpd/Makefile,v 1.2 2003/06/02 02:35:58 obrien Exp $
-
-MAINTAINER=	markm@FreeBSD.org
+# $FreeBSD: src/libexec/tcpd/Makefile,v 1.3 2003/06/04 15:59:13 markm Exp $
 
 PROG=	tcpd
 MAN=	tcpd.8

==== //depot/projects/hammer/release/Makefile#28 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.780 2003/06/02 20:15:12 jhb Exp $
+# $FreeBSD: src/release/Makefile,v 1.782 2003/06/04 22:24:43 peter Exp $
 #
 # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
 #     [RELEASETAG=tag]
@@ -463,17 +463,12 @@
 	echo "	cd /usr/src"			>> ${_MK}
 	echo "	${CROSSMAKE} ${WORLD_FLAGS} -DNOCLEAN buildworld && \\" >> ${_MK}
 	echo "	touch /tmp/.world_done"		>> ${_MK}
-	echo "  ${CROSSMAKE} -DNOGAMES -DNOHTML -DNOINFO -DNOMAN \\" >> ${_MK}
-	echo "  	-DNOPROFILE installworld" >> ${_MK}
 	echo "fi"				>> ${_MK}
-.if defined(NOPORTS) || defined(NOPORTREADMES)
-	echo "if false; then"			>> ${_MK}
-.else
-	echo "if true; then"			>> ${_MK}
-.endif
+	echo "if [ ! -f /tmp/.skip_ports ]; then" >> ${_MK}
 	echo "	echo \">>> make readmes started on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK}
 	echo "	cd /usr/ports"			>> ${_MK}
 	echo "	make ${PORTREADMES_FLAGS} readmes" >> ${_MK}
+	echo "	touch /tmp/.skip_ports"		>> ${_MK}
 	echo "	echo \">>> make readmes finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK}
 	echo "fi"				>> ${_MK}
 	echo "cd /usr/src/release"		>> ${_MK}
@@ -481,6 +476,9 @@
 	echo "make \$${_RELTARGET}"		>> ${_MK}
 	echo "echo \">>> make ${.TARGET} for ${TARGET} finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK}
 	chmod 755 ${_MK}
+.if defined(NOPORTS) || defined(NOPORTREADMES)
+	touch ${CHROOTDIR}/tmp/.skip_ports
+.endif
 	# Ensure md.ko is loaded if md(4) is not statically compiled into the kernel
 	-mdconfig 2>/dev/null
 	env -i /usr/sbin/chroot ${CHROOTDIR} /mk

==== //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#9 (text+ko) ====

@@ -53,7 +53,7 @@
 #endif /* not lint */
 #endif

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306042343.h54NhEmT053114>