PERFORCE change 33187 for review

Marcel Moolenaar marcel at FreeBSD.org
Sat Jun 14 23:49:50 PDT 2003


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

Change 33187 by marcel at marcel_nfs on 2003/06/14 23:48:46

	IFC @33184

Affected files ...

.. //depot/projects/ia64/MAINTAINERS#30 integrate
.. //depot/projects/ia64/Makefile.inc1#66 integrate
.. //depot/projects/ia64/UPDATING#43 integrate
.. //depot/projects/ia64/bin/Makefile.inc#5 integrate
.. //depot/projects/ia64/bin/csh/Makefile#8 integrate
.. //depot/projects/ia64/bin/date/Makefile#4 integrate
.. //depot/projects/ia64/bin/dd/Makefile#5 integrate
.. //depot/projects/ia64/bin/df/Makefile#4 integrate
.. //depot/projects/ia64/bin/ed/Makefile#6 integrate
.. //depot/projects/ia64/bin/expr/Makefile#4 integrate
.. //depot/projects/ia64/bin/kenv/Makefile#3 integrate
.. //depot/projects/ia64/bin/ls/Makefile#7 integrate
.. //depot/projects/ia64/bin/pax/Makefile#5 integrate
.. //depot/projects/ia64/bin/ps/Makefile#9 integrate
.. //depot/projects/ia64/etc/defaults/rc.conf#34 integrate
.. //depot/projects/ia64/etc/pam.d/Makefile#8 integrate
.. //depot/projects/ia64/etc/pam.d/login#10 integrate
.. //depot/projects/ia64/etc/pam.d/su#10 integrate
.. //depot/projects/ia64/etc/pam.d/system#1 branch
.. //depot/projects/ia64/gnu/lib/libgcc/Makefile#16 integrate
.. //depot/projects/ia64/gnu/lib/libobjc/Makefile#7 integrate
.. //depot/projects/ia64/gnu/lib/libstdc++/Makefile#18 integrate
.. //depot/projects/ia64/gnu/usr.bin/binutils/Makefile#8 integrate
.. //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/freebsd-native.h#8 integrate
.. //depot/projects/ia64/include/bitstring.h#2 integrate
.. //depot/projects/ia64/lib/libalias/alias.c#6 integrate
.. //depot/projects/ia64/lib/libalias/libalias.3#5 integrate
.. //depot/projects/ia64/lib/libbz2/Makefile#4 integrate
.. //depot/projects/ia64/lib/libc/amd64/gen/alloca.S#3 delete
.. //depot/projects/ia64/lib/libc/i386/gen/alloca.S#3 integrate
.. //depot/projects/ia64/lib/libc/locale/frune.c#4 integrate
.. //depot/projects/ia64/lib/libc/locale/mbrune.c#4 integrate
.. //depot/projects/ia64/lib/libc/locale/setinvalidrune.c#4 integrate
.. //depot/projects/ia64/lib/libc/locale/utf2.c#3 integrate
.. //depot/projects/ia64/lib/libc/sys/close.2#5 integrate
.. //depot/projects/ia64/lib/libcam/Makefile#2 integrate
.. //depot/projects/ia64/lib/libdevstat/Makefile#4 integrate
.. //depot/projects/ia64/lib/libkvm/kvm_proc.c#18 integrate
.. //depot/projects/ia64/lib/libutil/auth.c#2 integrate
.. //depot/projects/ia64/lib/libutil/login_auth.c#3 integrate
.. //depot/projects/ia64/lib/libutil/login_cap.c#5 integrate
.. //depot/projects/ia64/lib/libutil/login_class.c#6 integrate
.. //depot/projects/ia64/lib/libutil/login_ok.c#2 integrate
.. //depot/projects/ia64/lib/libutil/login_times.c#2 integrate
.. //depot/projects/ia64/lib/libutil/login_tty.c#2 integrate
.. //depot/projects/ia64/lib/libutil/logout.c#5 integrate
.. //depot/projects/ia64/lib/libutil/property.c#5 integrate
.. //depot/projects/ia64/lib/libutil/pty.c#3 integrate
.. //depot/projects/ia64/lib/libutil/pw_util.c#8 integrate
.. //depot/projects/ia64/lib/libutil/realhostname.c#3 integrate
.. //depot/projects/ia64/lib/libutil/uucplock.c#2 integrate
.. //depot/projects/ia64/lib/libxpg4/fakelib.c#2 integrate
.. //depot/projects/ia64/libexec/bootpd/bootpd.c#5 integrate
.. //depot/projects/ia64/libexec/getty/main.c#6 integrate
.. //depot/projects/ia64/libexec/lukemftpd/Makefile#11 integrate
.. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#14 integrate
.. //depot/projects/ia64/sbin/camcontrol/Makefile#6 integrate
.. //depot/projects/ia64/sbin/natd/natd.8#8 integrate
.. //depot/projects/ia64/sbin/natd/natd.c#6 integrate
.. //depot/projects/ia64/share/man/man4/Makefile#48 integrate
.. //depot/projects/ia64/share/man/man4/en.4#2 integrate
.. //depot/projects/ia64/share/man/man4/natm.4#2 integrate
.. //depot/projects/ia64/share/man/man4/natmip.4#1 branch
.. //depot/projects/ia64/share/man/man5/rc.conf.5#41 integrate
.. //depot/projects/ia64/share/man/man7/security.7#6 integrate
.. //depot/projects/ia64/share/man/man9/bus_dma.9#2 integrate
.. //depot/projects/ia64/share/mk/bsd.libnames.mk#17 integrate
.. //depot/projects/ia64/share/mk/bsd.sys.mk#21 integrate
.. //depot/projects/ia64/sys/alpha/alpha/interrupt.c#13 integrate
.. //depot/projects/ia64/sys/alpha/alpha/pmap.c#30 integrate
.. //depot/projects/ia64/sys/alpha/alpha/trap.c#28 integrate
.. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#21 integrate
.. //depot/projects/ia64/sys/alpha/include/param.h#5 integrate
.. //depot/projects/ia64/sys/alpha/linux/linux_sysvec.c#11 integrate
.. //depot/projects/ia64/sys/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/ia64/sys/amd64/amd64/trap.c#7 integrate
.. //depot/projects/ia64/sys/amd64/include/param.h#5 integrate
.. //depot/projects/ia64/sys/cam/cam.c#5 integrate
.. //depot/projects/ia64/sys/cam/cam_ccb.h#4 integrate
.. //depot/projects/ia64/sys/cam/scsi/scsi_low.c#12 integrate
.. //depot/projects/ia64/sys/compat/svr4/svr4_sysvec.c#14 integrate
.. //depot/projects/ia64/sys/conf/NOTES#52 integrate
.. //depot/projects/ia64/sys/conf/files#80 integrate
.. //depot/projects/ia64/sys/conf/kern.post.mk#33 integrate
.. //depot/projects/ia64/sys/conf/kern.pre.mk#17 integrate
.. //depot/projects/ia64/sys/conf/options.pc98#17 integrate
.. //depot/projects/ia64/sys/ddb/db_ps.c#19 integrate
.. //depot/projects/ia64/sys/dev/advansys/advansys.c#6 integrate
.. //depot/projects/ia64/sys/dev/advansys/adwcam.c#6 integrate
.. //depot/projects/ia64/sys/dev/ahb/ahb.c#7 integrate
.. //depot/projects/ia64/sys/dev/aic/aic.c#6 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.c#12 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.c#12 integrate
.. //depot/projects/ia64/sys/dev/amd/amd.c#5 integrate
.. //depot/projects/ia64/sys/dev/amr/amr_cam.c#7 integrate
.. //depot/projects/ia64/sys/dev/ata/atapi-cam.c#12 integrate
.. //depot/projects/ia64/sys/dev/dpt/dpt_scsi.c#9 integrate
.. //depot/projects/ia64/sys/dev/en/if_en_pci.c#1 branch
.. //depot/projects/ia64/sys/dev/en/midway.c#16 integrate
.. //depot/projects/ia64/sys/dev/en/midwayvar.h#6 integrate
.. //depot/projects/ia64/sys/dev/firewire/firewire.c#30 integrate
.. //depot/projects/ia64/sys/dev/firewire/firewirereg.h#18 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwcrom.c#5 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwohci.c#25 integrate
.. //depot/projects/ia64/sys/dev/firewire/iec13213.h#7 integrate
.. //depot/projects/ia64/sys/dev/firewire/sbp.c#34 integrate
.. //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#14 integrate
.. //depot/projects/ia64/sys/dev/mpt/mpt_freebsd.c#11 integrate
.. //depot/projects/ia64/sys/dev/pccard/pccard.c#20 integrate
.. //depot/projects/ia64/sys/dev/sym/sym_hipd.c#11 integrate
.. //depot/projects/ia64/sys/dev/trm/trm.c#9 integrate
.. //depot/projects/ia64/sys/dev/usb/umass.c#28 integrate
.. //depot/projects/ia64/sys/dev/usb/usbdevs#37 integrate
.. //depot/projects/ia64/sys/dev/usb/usbdevs.h#36 integrate
.. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#36 integrate
.. //depot/projects/ia64/sys/dev/usb/uscanner.c#9 integrate
.. //depot/projects/ia64/sys/dev/vinum/vinumio.c#17 integrate
.. //depot/projects/ia64/sys/fs/fifofs/fifo_vnops.c#23 integrate
.. //depot/projects/ia64/sys/fs/procfs/procfs_status.c#12 integrate
.. //depot/projects/ia64/sys/fs/smbfs/smbfs_subr.c#4 integrate
.. //depot/projects/ia64/sys/fs/unionfs/union.h#6 integrate
.. //depot/projects/ia64/sys/fs/unionfs/union_subr.c#12 integrate
.. //depot/projects/ia64/sys/fs/unionfs/union_vnops.c#9 integrate
.. //depot/projects/ia64/sys/i386/i386/pmap.c#44 integrate
.. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#16 integrate
.. //depot/projects/ia64/sys/i386/i386/trap.c#33 integrate
.. //depot/projects/ia64/sys/i386/include/param.h#7 integrate
.. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#26 integrate
.. //depot/projects/ia64/sys/ia64/conf/SKI#14 integrate
.. //depot/projects/ia64/sys/ia64/ia64/pmap.c#66 integrate
.. //depot/projects/ia64/sys/ia64/ia64/trap.c#58 integrate
.. //depot/projects/ia64/sys/ia64/include/param.h#8 integrate
.. //depot/projects/ia64/sys/kern/kern_clock.c#23 integrate
.. //depot/projects/ia64/sys/kern/kern_exec.c#51 integrate
.. //depot/projects/ia64/sys/kern/kern_exit.c#46 integrate
.. //depot/projects/ia64/sys/kern/kern_fork.c#41 integrate
.. //depot/projects/ia64/sys/kern/kern_mtxpool.c#7 integrate
.. //depot/projects/ia64/sys/kern/kern_proc.c#41 integrate
.. //depot/projects/ia64/sys/kern/kern_sig.c#53 integrate
.. //depot/projects/ia64/sys/kern/kern_switch.c#26 integrate
.. //depot/projects/ia64/sys/kern/kern_synch.c#39 integrate
.. //depot/projects/ia64/sys/kern/kern_thread.c#51 integrate
.. //depot/projects/ia64/sys/kern/sched_4bsd.c#13 integrate
.. //depot/projects/ia64/sys/kern/sched_ule.c#17 integrate
.. //depot/projects/ia64/sys/kern/subr_trap.c#31 integrate
.. //depot/projects/ia64/sys/kern/tty.c#28 integrate
.. //depot/projects/ia64/sys/kern/vfs_cache.c#15 integrate
.. //depot/projects/ia64/sys/modules/Makefile#52 integrate
.. //depot/projects/ia64/sys/modules/geom/Makefile.inc#1 branch
.. //depot/projects/ia64/sys/modules/i2c/controllers/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/i2c/controllers/lpbb/Makefile#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket.c#3 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#8 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#7 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#6 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate
.. //depot/projects/ia64/sys/netsmb/smb_iod.c#11 integrate
.. //depot/projects/ia64/sys/pc98/conf/NOTES#8 integrate
.. //depot/projects/ia64/sys/pci/agp_i810.c#15 integrate
.. //depot/projects/ia64/sys/pci/if_devar.h#5 integrate
.. //depot/projects/ia64/sys/pci/if_en_pci.c#8 integrate
.. //depot/projects/ia64/sys/pci/if_ti.c#24 integrate
.. //depot/projects/ia64/sys/pci/ncr.c#10 integrate
.. //depot/projects/ia64/sys/powerpc/include/param.h#7 integrate
.. //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#24 integrate
.. //depot/projects/ia64/sys/sparc64/include/param.h#8 integrate
.. //depot/projects/ia64/sys/sparc64/pci/apb.c#4 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#37 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/trap.c#27 integrate
.. //depot/projects/ia64/sys/sys/bitstring.h#1 branch
.. //depot/projects/ia64/sys/sys/cdefs.h#14 integrate
.. //depot/projects/ia64/sys/sys/proc.h#68 integrate
.. //depot/projects/ia64/sys/vm/pmap.h#17 integrate
.. //depot/projects/ia64/sys/vm/swap_pager.c#28 integrate
.. //depot/projects/ia64/sys/vm/vm_extern.h#13 integrate
.. //depot/projects/ia64/sys/vm/vm_glue.c#30 integrate
.. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#13 integrate
.. //depot/projects/ia64/usr.bin/brandelf/Makefile#3 integrate
.. //depot/projects/ia64/usr.bin/bzip2/Makefile#2 integrate
.. //depot/projects/ia64/usr.bin/bzip2recover/Makefile#2 integrate
.. //depot/projects/ia64/usr.bin/compress/compress.c#8 integrate
.. //depot/projects/ia64/usr.bin/find/extern.h#6 integrate
.. //depot/projects/ia64/usr.bin/find/find.c#7 integrate
.. //depot/projects/ia64/usr.bin/find/function.c#12 integrate
.. //depot/projects/ia64/usr.bin/find/getdate.y#3 integrate
.. //depot/projects/ia64/usr.bin/find/ls.c#7 integrate
.. //depot/projects/ia64/usr.bin/find/main.c#5 integrate
.. //depot/projects/ia64/usr.bin/find/misc.c#4 integrate
.. //depot/projects/ia64/usr.bin/find/operator.c#7 integrate
.. //depot/projects/ia64/usr.bin/find/option.c#7 integrate
.. //depot/projects/ia64/usr.bin/find/parsedate.y#3 delete
.. //depot/projects/ia64/usr.bin/xargs/xargs.c#25 integrate
.. //depot/projects/ia64/usr.sbin/iostat/Makefile#3 integrate
.. //depot/projects/ia64/usr.sbin/rarpd/rarpd.c#6 integrate
.. //depot/projects/ia64/usr.sbin/ypserv/Makefile.yp#4 integrate

Differences ...

==== //depot/projects/ia64/MAINTAINERS#30 (text+ko) ====

@@ -1,15 +1,8 @@
-$FreeBSD: src/MAINTAINERS,v 1.69 2003/06/12 03:37:55 gad Exp $
+$FreeBSD: src/MAINTAINERS,v 1.71 2003/06/14 19:27:10 obrien Exp $
 
 subsystem	login	notes
 -----------------------------
 mergemaster	dougb	Prefers to pre-approve commits
-binutils	obrien	Insists to keep BU blocked from other's unapproved
-			commits
-file		obrien	Insists to keep file blocked from other's unapproved
-			commits
-one-true-awk	obrien	Insists to keep one-true-awk blocked from other's
-			unapproved commits
-lukemftpd	obrien	Pre-commit review requested.
 libc/posix1e	rwatson	Pre-commit review requested.
 POSIX.1e ACLs	rwatson	Pre-commit review requested.
 UFS EAs		rwatson	Pre-commit review requested.
@@ -107,8 +100,6 @@
 gnu/usr.bin/man/apropos/Makefile:MAINTAINER=	wosch at FreeBSD.org
 lib/libbz2/Makefile:MAINTAINER=	obrien at FreeBSD.org
 lib/libc/posix1e/Makefile.inc:MAINTAINER=	rwatson at FreeBSD.org
-lib/libcam/Makefile:MAINTAINER=	ken at FreeBSD.ORG
-lib/libdevstat/Makefile:MAINTAINER=	ken at FreeBSD.ORG
 lib/libmilter/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
 lib/libsm/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
 lib/libsmdb/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
@@ -118,7 +109,6 @@
 libexec/lukemftpd/Makefile:MAINTAINER=	obrien at FreeBSD.org
 libexec/mail.local/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
 libexec/smrsh/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
-sbin/camcontrol/Makefile:MAINTAINER=	ken at FreeBSD.org
 sbin/dhclient/Makefile.inc:MAINTAINER=	murray at FreeBSD.org
 sbin/ffsinfo/Makefile:MAINTAINER=	tomsoft at FreeBSD.ORG, chm at FreeBSD.ORG
 sbin/growfs/Makefile:MAINTAINER=	tomsoft at FreeBSD.ORG, chm at FreeBSD.ORG
@@ -165,7 +155,6 @@
 usr.bin/vacation/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
 usr.sbin/editmap/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
 usr.sbin/inetd/Makefile:MAINTAINER=	dwmalone at FreeBSD.org
-usr.sbin/iostat/Makefile:MAINTAINER=	ken at FreeBSD.ORG
 usr.sbin/ipftest/Makefile:MAINTAINER=	darrenr at freebsd.org
 usr.sbin/ipresend/Makefile:MAINTAINER=	darrenr at freebsd.org
 usr.sbin/ipsend/Makefile:MAINTAINER=	darrenr at freebsd.org

==== //depot/projects/ia64/Makefile.inc1#66 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.365 2003/06/08 04:15:05 imp Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.367 2003/06/14 17:50:13 imp Exp $
 #
 # Make command line options:
 #	-DNO_KERBEROS Do not build Heimdal (Kerberos 5)
@@ -202,9 +202,6 @@
 		PATH=${BPATH}:${PATH} \
 		WORLDTMP=${WORLDTMP} \
 		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
-.if ${BOOTSTRAPPING} < 501100
-BMAKEENV+=	CSTD=
-.endif
 BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
 		BOOTSTRAPPING=${OSRELDATE} \
@@ -777,6 +774,8 @@
 # gnu/lib/csu, gnu/lib/libgcc and lib/csu must be built before all
 # shared libraries for ELF.
 #
+# lib/libc (libc_pic.a) must be built before lib/libpthread.
+#
 _startup_libs=	gnu/lib/csu gnu/lib/libgcc
 .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf)
 _startup_libs+=	lib/csu/${MACHINE_ARCH}-elf
@@ -784,7 +783,7 @@
 _startup_libs+=	lib/csu/${MACHINE_ARCH}
 .endif
 
-_prebuild_libs+= lib/libc
+_prebuild_libs=
 _generic_libs=	gnu/lib
 
 .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
@@ -796,6 +795,9 @@
 _generic_libs+=	kerberos5/lib
 .endif
 
+.if !defined(NOLIBPTHREAD)
+_prebuild_libs+= lib/libc
+.endif
 _prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \
 		lib/libkvm lib/libmd \
 		lib/libncurses lib/libopie lib/libpam lib/libradius \

==== //depot/projects/ia64/UPDATING#43 (text+ko) ====

@@ -17,6 +17,24 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20030613: [retrospective]
+	There was a small window in which sed(1) was broken.  If you
+	happen to have sed(1) installed during that window, which is
+	evidenced by an inability to build world with the failure
+	given below, you need to manually build and install sed(1)
+	(and only sed(1)) before doing anything else. This is a one-
+	time snafu. Typical failure mode:
+
+	In file included from /usr/src/contrib/binutils/bfd/targets.c:1092:
+	targmatch.h:7:1: null character(s) ignored
+	targmatch.h:12:1: null character(s) ignored
+	targmatch.h:16:1: null character(s) ignored
+		:
+
+	The window of "sed(1)-uction" is from Wed Jun 4 15:31:55 2003 UTC
+	to Thu Jun 5 12:10:19 2003 UTC (from rev 1.30 to rev 1.31 of
+	usr.bin/sed/process.c).
+
 20030610:
 	Remove deprecated locale names and transition period code
 	for them, finishing switching to the new scheme. Check your
@@ -1291,4 +1309,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.254 2003/06/11 06:37:55 phk Exp $
+$FreeBSD: src/UPDATING,v 1.255 2003/06/13 20:05:46 marcel Exp $

==== //depot/projects/ia64/bin/Makefile.inc#5 (text+ko) ====

@@ -1,7 +1,6 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/Makefile.inc,v 1.15 2002/05/10 01:48:15 obrien Exp $
+# $FreeBSD: src/bin/Makefile.inc,v 1.16 2003/06/13 07:04:01 markm Exp $
 
 BINDIR?=	/bin
 NOSHARED?=	YES
-WARNS?=		2
-WFORMAT?=	1
+WARNS?=		6

==== //depot/projects/ia64/bin/csh/Makefile#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/bin/csh/Makefile,v 1.31 2003/06/06 13:46:55 kuriyama Exp $
+# $FreeBSD: src/bin/csh/Makefile,v 1.32 2003/06/13 07:04:01 markm Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 #
 # C Shell with process control; VM/UNIX VAX Makefile
@@ -12,7 +12,7 @@
 PROG=	csh
 DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"'
 CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS}
-WARNS=	1
+WARNS=	2
 SRCS=	sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \
 	sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \
 	sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \

==== //depot/projects/ia64/bin/date/Makefile#4 (text+ko) ====

@@ -1,10 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/date/Makefile,v 1.10 2002/02/04 02:49:18 kris Exp $
+# $FreeBSD: src/bin/date/Makefile,v 1.11 2003/06/13 07:04:01 markm Exp $
 
 PROG=	date
 SRCS=	date.c netdate.c vary.c
-WARNS=	0
-WFORMAT=0
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 

==== //depot/projects/ia64/bin/dd/Makefile#5 (text+ko) ====

@@ -1,9 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/dd/Makefile,v 1.11 2003/02/27 18:04:53 markm Exp $
+# $FreeBSD: src/bin/dd/Makefile,v 1.12 2003/06/13 07:04:01 markm Exp $
 
 PROG=	dd
 SRCS=	args.c conv.c conv_tab.c dd.c misc.c position.c
-WARNS?=	4
 
 MAINTAINER=	green at FreeBSD.org
 

==== //depot/projects/ia64/bin/df/Makefile#4 (text+ko) ====

@@ -1,16 +1,15 @@
 #	@(#)Makefile	8.3 (Berkeley) 5/8/95
-# $FreeBSD: src/bin/df/Makefile,v 1.15 2002/05/12 19:24:09 phk Exp $
+# $FreeBSD: src/bin/df/Makefile,v 1.16 2003/06/13 07:04:01 markm Exp $
+
+MOUNT=	${.CURDIR}/../../sbin/mount
+.PATH:	${MOUNT}
 
 PROG=	df
 SRCS=	df.c vfslist.c
 
-MOUNT=	${.CURDIR}/../../sbin/mount
 CFLAGS+= -I${MOUNT}
-.PATH:	${MOUNT}
 
 DPADD=	${LIBM}
 LDADD=	-lm
 
-WARNS?=	5
-
 .include <bsd.prog.mk>

==== //depot/projects/ia64/bin/ed/Makefile#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/bin/ed/Makefile,v 1.24 2003/06/08 08:24:07 markm Exp $
+# $FreeBSD: src/bin/ed/Makefile,v 1.25 2003/06/13 07:04:01 markm Exp $
 
 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
@@ -8,6 +8,7 @@
 .if exists(${.CURDIR}/../../crypto) && !defined(NO_OPENSSL)
 DISTRIBUTION=crypto
 CFLAGS+=-DDES
+WARNS=	2
 DPADD=	${LIBCRYPTO}
 LDADD=	-lcrypto
 .endif

==== //depot/projects/ia64/bin/expr/Makefile#4 (text+ko) ====

@@ -1,9 +1,7 @@
-# $FreeBSD: src/bin/expr/Makefile,v 1.17 2002/03/23 00:44:00 wollman Exp $
+# $FreeBSD: src/bin/expr/Makefile,v 1.18 2003/06/13 07:04:02 markm Exp $
 
 PROG=	expr
 SRCS=	expr.y
 YFLAGS=
 
-NO_WERROR=	"GCC can't handle C99 printf formats."
-
 .include <bsd.prog.mk>

==== //depot/projects/ia64/bin/kenv/Makefile#3 (text+ko) ====

@@ -1,6 +1,5 @@
-# $FreeBSD: src/bin/kenv/Makefile,v 1.3 2003/01/20 17:56:25 obrien Exp $
+# $FreeBSD: src/bin/kenv/Makefile,v 1.4 2003/06/13 07:04:02 markm Exp $
 
 PROG=	kenv
-WARNS?=	4
 
 .include <bsd.prog.mk>

==== //depot/projects/ia64/bin/ls/Makefile#7 (text+ko) ====

@@ -1,10 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
-# $FreeBSD: src/bin/ls/Makefile,v 1.24 2002/10/24 00:07:30 rwatson Exp $
+# $FreeBSD: src/bin/ls/Makefile,v 1.25 2003/06/13 07:04:02 markm Exp $
 
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
-NO_WERROR=1
-WFORMAT=0
 DPADD=	${LIBM}
 LDADD=	-lm
 

==== //depot/projects/ia64/bin/pax/Makefile#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #       @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/pax/Makefile,v 1.10 2002/10/06 03:20:27 tjr Exp $
+# $FreeBSD: src/bin/pax/Makefile,v 1.11 2003/06/13 07:04:02 markm Exp $
 
 # To install on versions prior to BSD 4.4 the following may have to be
 # defined with CFLAGS +=
@@ -29,7 +29,6 @@
 SRCS=	ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c \
 	gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \
 	tables.c tar.c tty_subs.c
-WFORMAT=0
 #XXX NOTYET
 #MAN=	pax.1 tar.1 cpio.1
 #LINKS=	${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio

==== //depot/projects/ia64/bin/ps/Makefile#9 (text+ko) ====

@@ -1,16 +1,15 @@
-# $FreeBSD: src/bin/ps/Makefile,v 1.23 2003/05/02 01:05:05 obrien Exp $
+# $FreeBSD: src/bin/ps/Makefile,v 1.24 2003/06/13 07:04:02 markm Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 
 PROG=	ps
 SRCS=	fmt.c keyword.c nlist.c print.c ps.c
+WARNS=	5
 #
 # To support "lazy" ps for non root/wheel users
 # add -DLAZY_PS to the cflags.  This helps
 # keep ps from being an unnecessary load
 # on large systems.
 #
-WARNS=	1
-WFORMAT=0
 CFLAGS+=-DLAZY_PS
 DPADD=	${LIBM} ${LIBKVM}
 LDADD=	-lm -lkvm

==== //depot/projects/ia64/etc/defaults/rc.conf#34 (text+ko) ====

@@ -13,7 +13,7 @@
 #
 # All arguments must be in double or single quotes.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.178 2003/06/07 10:31:17 mtm Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.179 2003/06/14 22:26:30 mtm Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -144,7 +144,7 @@
 named_chrootdir=""		# Chroot directory (or "" not to auto-chroot it)
 named_chroot_autoupdate="YES"	# Automatically install/update chrooted
 				# components of named. See /etc/rc.d/named.
-named_symlink_enable="YES"	# Symlink /var/run/named.pid and /var/run/ndc
+named_symlink_enable="YES"	# Symlink ${named_pidfile} and /var/run/ndc
 				# to their chrooted counterparts.
 
 #

==== //depot/projects/ia64/etc/pam.d/Makefile#8 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/etc/pam.d/Makefile,v 1.9 2003/03/14 09:01:22 ru Exp $
+# $FreeBSD: src/etc/pam.d/Makefile,v 1.10 2003/06/14 12:35:05 des Exp $
 
 NOOBJ=	noobj
 FILES=	README ftpd gdm imap kde login other passwd pop3 \
-	rexecd rsh sshd su telnetd xdm
+	rexecd rsh sshd su system telnetd xdm
 FILESDIR=	/etc/pam.d
 FILESMODE=	644
 FILESMODE_README=	444

==== //depot/projects/ia64/etc/pam.d/login#10 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/login,v 1.15 2003/04/30 21:57:54 markm Exp $
+# $FreeBSD: src/etc/pam.d/login,v 1.16 2003/06/14 12:35:05 des Exp $
 #
 # PAM configuration for the "login" service
 #
@@ -7,22 +7,14 @@
 # auth
 auth		required	pam_nologin.so		no_warn
 auth		sufficient	pam_self.so		no_warn
-auth		sufficient	pam_opie.so		no_warn no_fake_prompts
-auth		requisite	pam_opieaccess.so	no_warn allow_local
-#auth		sufficient	pam_krb5.so		no_warn try_first_pass
-#auth		sufficient	pam_ssh.so		no_warn try_first_pass
-auth		required	pam_unix.so		no_warn try_first_pass nullok
+auth		include		system
 
 # account
-#account 	required	pam_krb5.so
-account		required	pam_login_access.so
-account		required	pam_securetty.so
-account		required	pam_unix.so
+account		requisite	pam_securetty.so
+account		include		system
 
 # session
-#session 	optional	pam_ssh.so
-session		required	pam_lastlog.so		no_fail
+session		include		system
 
 # password
-#password	sufficient	pam_krb5.so		no_warn try_first_pass
-password	required	pam_unix.so		no_warn try_first_pass
+password	include		system

==== //depot/projects/ia64/etc/pam.d/su#10 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/su,v 1.14 2003/04/30 21:57:54 markm Exp $
+# $FreeBSD: src/etc/pam.d/su,v 1.15 2003/06/14 12:35:05 des Exp $
 #
 # PAM configuration for the "su" service
 #
@@ -7,16 +7,11 @@
 # auth
 auth		sufficient	pam_rootok.so		no_warn
 auth		sufficient	pam_self.so		no_warn
-auth		requisite	pam_group.so		no_warn root_only fail_safe
-auth		sufficient	pam_opie.so		no_warn no_fake_prompts
-auth		requisite	pam_opieaccess.so	no_warn allow_local
-#auth		sufficient	pam_krb5.so		no_warn try_first_pass auth_as_self
-#auth		required	pam_ssh.so		no_warn try_first_pass
-auth		required	pam_unix.so		no_warn try_first_pass nullok
+auth		requisite	pam_group.so		no_warn group=wheel root_only fail_safe
+auth		include		system
 
 # account
-#account 	required	pam_krb5.so
-account		required	pam_unix.so
+account		include		system
 
 # session
-#session 	optional	pam_ssh.so
+session		include		system

==== //depot/projects/ia64/gnu/lib/libgcc/Makefile#16 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.47 2002/09/28 00:25:27 peter Exp $
+# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.48 2003/06/13 22:07:39 peter Exp $
 
 .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
 
@@ -12,6 +12,9 @@
 
 #SHLIB_MAJOR=	1
 
+# We need to install libgcc_pic.a as well, for use by shared libs.
+INSTALL_PIC_ARCHIVE=    yes     
+
 #
 # XXX This is a hack, but it seems to work.
 # libgcc2.a is meant to be compiled by *this* version of gcc.

==== //depot/projects/ia64/gnu/lib/libobjc/Makefile#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.18 2003/06/02 02:30:52 obrien Exp $
+# $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.19 2003/06/14 13:30:32 des Exp $
 
 OBJCDIR=${.CURDIR}/../../../contrib/libobjc
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
@@ -23,7 +23,6 @@
 CFLAGS+= -fpic
 .endif
 
-CSTD?=
 CFLAGS+= -fgnu-runtime -DHAVE_GTHR_DEFAULT -DIN_TARGET_LIBS
 CFLAGS+= -I. -I${.CURDIR}/../../usr.bin/cc/cc_tools
 CFLAGS+= -I${OBJCDIR}/objc -I${OBJCDIR} 

==== //depot/projects/ia64/gnu/lib/libstdc++/Makefile#18 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.44 2003/06/02 06:12:14 obrien Exp $
+# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.45 2003/06/14 13:30:32 des Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 SRCDIR=	${.CURDIR}/../../../contrib/libstdc++
@@ -18,7 +18,6 @@
 LIB=		stdc++
 SHLIB_MAJOR=	4
 
-CSTD?=
 CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
 CFLAGS+=	-I${.CURDIR} -I${SUPDIR} -I${GCCDIR}
 CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections -Wno-deprecated

==== //depot/projects/ia64/gnu/usr.bin/binutils/Makefile#8 (text+ko) ====

@@ -1,8 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.24 2002/10/20 21:42:55 obrien Exp $
-
-#	In my absence, bde and jdp have pre-approval for any commit they feel
-#	necessary.
-MAINTAINER=	obrien at FreeBSD.org
+# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.25 2003/06/14 19:32:51 obrien Exp $
 
 SUBDIR=		libiberty libbfd libopcodes libbinutils \
 		addr2line ar as gasp ld nm objcopy objdump ranlib readelf \

==== //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/freebsd-native.h#8 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.21 2002/06/09 00:03:56 obrien Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.22 2003/06/13 22:25:41 peter Exp $ */
 
 /* FREEBSD_NATIVE is defined when gcc is integrated into the FreeBSD
    source tree so it can be configured appropriately without using
@@ -48,7 +48,8 @@
 
 /* For the native system compiler, we actually build libgcc in a profiled
    version.  So we should use it with -pg.  */
-#define LIBGCC_SPEC		"%{!pg: -lgcc} %{pg: -lgcc_p}"
+#define LIBGCC_SPEC		"%{shared: -lgcc_pic} \
+    %{!shared: %{!pg: -lgcc} %{pg: -lgcc_p}}"
 #define LIBSTDCXX_PROFILE	"-lstdc++_p"
 #define MATH_LIBRARY_PROFILE	"-lm_p"
 #define FORTRAN_LIBRARY_PROFILE	"-lg2c_p"

==== //depot/projects/ia64/include/bitstring.h#2 (text+ko) ====

@@ -1,9 +1,6 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Vixie.
+/*-
+ * Copyright (c) 2003 Poul-Henning Kamp
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -13,18 +10,11 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -33,118 +23,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/include/bitstring.h,v 1.2 2000/10/09 12:34:51 dwmalone Exp $
+ * $FreeBSD: src/include/bitstring.h,v 1.3 2003/06/13 19:40:13 phk Exp $
  */
 
 #ifndef _BITSTRING_H_
 #define	_BITSTRING_H_
 
-typedef	unsigned char bitstr_t;
+#include <sys/bitstring.h>
 
-/* internal macros */
-				/* byte of the bitstring bit is in */
-#define	_bit_byte(bit) \
-	((bit) >> 3)
-
-				/* mask for the bit within its byte */
-#define	_bit_mask(bit) \
-	(1 << ((bit)&0x7))
+#endif /* _BITSTRING_H_ */
 
-/* external macros */
-				/* bytes in a bitstring of nbits bits */
-#define	bitstr_size(nbits) \
-	(((nbits) + 7) >> 3)
-
-				/* allocate a bitstring */
-#define	bit_alloc(nbits) \
-	(bitstr_t *)calloc((size_t)bitstr_size(nbits), sizeof(bitstr_t))
-
-				/* allocate a bitstring on the stack */
-#define	bit_decl(name, nbits) \
-	((name)[bitstr_size(nbits)])
-
-				/* is bit N of bitstring name set? */
-#define	bit_test(name, bit) \
-	((name)[_bit_byte(bit)] & _bit_mask(bit))
-
-				/* set bit N of bitstring name */
-#define	bit_set(name, bit) \
-	((name)[_bit_byte(bit)] |= _bit_mask(bit))
-
-				/* clear bit N of bitstring name */
-#define	bit_clear(name, bit) \
-	((name)[_bit_byte(bit)] &= ~_bit_mask(bit))
-
-				/* clear bits start ... stop in bitstring */
-#define	bit_nclear(name, start, stop) do { \
-	register bitstr_t *_name = (name); \
-	register int _start = (start), _stop = (stop); \
-	register int _startbyte = _bit_byte(_start); \
-	register int _stopbyte = _bit_byte(_stop); \
-	if (_startbyte == _stopbyte) { \
-		_name[_startbyte] &= ((0xff >> (8 - (_start&0x7))) | \
-				      (0xff << ((_stop&0x7) + 1))); \
-	} else { \
-		_name[_startbyte] &= 0xff >> (8 - (_start&0x7)); \
-		while (++_startbyte < _stopbyte) \
-			_name[_startbyte] = 0; \
-		_name[_stopbyte] &= 0xff << ((_stop&0x7) + 1); \
-	} \
-} while (0)
-
-				/* set bits start ... stop in bitstring */
-#define	bit_nset(name, start, stop) do { \
-	register bitstr_t *_name = (name); \
-	register int _start = (start), _stop = (stop); \
-	register int _startbyte = _bit_byte(_start); \
-	register int _stopbyte = _bit_byte(_stop); \
-	if (_startbyte == _stopbyte) { \
-		_name[_startbyte] |= ((0xff << (_start&0x7)) & \
-				    (0xff >> (7 - (_stop&0x7)))); \
-	} else { \
-		_name[_startbyte] |= 0xff << ((_start)&0x7); \
-		while (++_startbyte < _stopbyte) \
-	    		_name[_startbyte] = 0xff; \
-		_name[_stopbyte] |= 0xff >> (7 - (_stop&0x7)); \
-	} \
-} while (0)
-
-				/* find first bit clear in name */
-#define	bit_ffc(name, nbits, value) do { \
-	register bitstr_t *_name = (name); \
-	register int _byte, _nbits = (nbits); \
-	register int _stopbyte = _bit_byte(_nbits - 1), _value = -1; \
-	if (_nbits > 0) \
-		for (_byte = 0; _byte <= _stopbyte; ++_byte) \
-			if (_name[_byte] != 0xff) { \
-				bitstr_t _lb; \
-				_value = _byte << 3; \
-				for (_lb = _name[_byte]; (_lb&0x1); \
-				    ++_value, _lb >>= 1); \
-				break; \
-			} \
-	if (_value >= nbits) \
-		_value = -1; \
-	*(value) = _value; \
-} while (0)
-
-				/* find first bit set in name */
-#define	bit_ffs(name, nbits, value) do { \
-	register bitstr_t *_name = (name); \
-	register int _byte, _nbits = (nbits); \
-	register int _stopbyte = _bit_byte(_nbits - 1), _value = -1; \
-	if (_nbits > 0) \
-		for (_byte = 0; _byte <= _stopbyte; ++_byte) \
-			if (_name[_byte]) { \
-				bitstr_t _lb; \
-				_value = _byte << 3; \
-				for (_lb = _name[_byte]; !(_lb&0x1); \
-				    ++_value, _lb >>= 1); \
-				break; \
-			} \
-	if (_value >= nbits) \
-		_value = -1; \
-	*(value) = _value; \
-} while (0)
-
-#endif /* !_BITSTRING_H_ */

==== //depot/projects/ia64/lib/libalias/alias.c#6 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libalias/alias.c,v 1.36 2002/07/23 00:16:19 ru Exp $");
+__FBSDID("$FreeBSD: src/lib/libalias/alias.c,v 1.37 2003/06/13 21:54:01 ru Exp $");
 
 /*
     Alias.c provides supervisory control for the functions of the
@@ -1425,6 +1425,10 @@
             SetDefaultAliasAddress(pip->ip_src);
         }
     }
+    else if (packetAliasMode & PKT_ALIAS_PROXY_ONLY)
+    {
+        SetDefaultAliasAddress(pip->ip_src);
+    }
 
     iresult = PKT_ALIAS_IGNORED;
     if ((ntohs(pip->ip_off) & IP_OFFMASK) == 0)

==== //depot/projects/ia64/lib/libalias/libalias.3#5 (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/libalias/libalias.3,v 1.44 2003/06/08 09:53:08 charnier Exp $
+.\" $FreeBSD: src/lib/libalias/libalias.3,v 1.47 2003/06/13 21:39:22 ru Exp $
 .\"
 .Dd April 13, 2000
 .Dt LIBALIAS 3
@@ -600,20 +600,18 @@
 server.
 If
 .Cm encode_ip_hdr
-is specified, the original address and port is passed as an extra IP
-option.
+is specified, the original destination address and port are passed
+as an extra IP option.
 If
 .Cm encode_tcp_stream
-is specified, the original address and port is passed as the first
-piece of data in the TCP stream in the format
-.Dq DEST Ar IP port .
+is specified, the original destination address and port are passed
+as the first piece of data in the TCP stream in the format
+.Dq Li DEST Ar IP port .
 .It Cm port Ar portnum
 Only packets with the destination port
 .Ar portnum
 are proxied.
-.It Cm server Ar host Ns Xo
-.Op : Ns Ar portnum
-.Xc
+.It Cm server Ar host Ns Op : Ns Ar portnum
 This specifies the
 .Ar host
 and
@@ -648,9 +646,7 @@
 are deleted.
 .It Cm proto tcp | udp
 If specified, only packets of the given protocol type are matched.
-.It Cm src Ar IP Ns Xo
-.Op / Ns Ar bits
-.Xc
+.It Cm src Ar IP Ns Op / Ns Ar bits
 If specified, only packets with a source address matching the given
 .Ar IP
 are matched.
@@ -662,9 +658,7 @@
 .Ar IP
 are taken as a network specification, and all IP addresses from that
 network will be matched.
-.It Cm dst Ar IP Ns Xo
-.Op / Ns Ar bits
-.Xc
+.It Cm dst Ar IP Ns Op / Ns Ar bits
 If specified, only packets with a destination address matching the given
 .Ar IP
 are matched.
@@ -885,6 +879,8 @@
 added support for PPTP and RTSP.
 .An Junichi Satoh Aq junichi at junichi.org
 added support for RTSP/PNA.
+.An Ruslan Ermilov Aq ru at FreeBSD.org
+added support for PPTP and LSNAT as well as general hacking.
 .Sh ACKNOWLEDGMENTS
 Listed below, in approximate chronological order, are individuals who
 have provided valuable comments and/or debugging assistance.

==== //depot/projects/ia64/lib/libbz2/Makefile#4 (text+ko) ====

@@ -1,6 +1,4 @@
-# $FreeBSD: src/lib/libbz2/Makefile,v 1.4 2002/09/28 00:25:28 peter Exp $
-
-MAINTAINER=	obrien at FreeBSD.org
+# $FreeBSD: src/lib/libbz2/Makefile,v 1.5 2003/06/14 19:32:51 obrien Exp $
 
 BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 .PATH: ${BZ2DIR}

==== //depot/projects/ia64/lib/libc/i386/gen/alloca.S#3 (text+ko) ====

@@ -34,11 +34,12 @@
  * SUCH DAMAGE.
  */
 
+#ifndef __GNUC__
 #if defined(LIBC_SCCS) && !defined(lint)
 	.asciz "@(#)alloca.s	5.2 (Berkeley) 5/14/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/gen/alloca.S,v 1.10 2002/03/23 02:44:18 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/alloca.S,v 1.11 2003/06/14 06:04:23 obrien Exp $");
 
 
 /* like alloc, but automatic automatic free in return */
@@ -56,3 +57,4 @@
 	pushl	0(%ecx)
 	pushl	%eax		/* dummy to pop at callsite */
 	jmp	*%edx		/* "return" */
+#endif	/*__GNUC__*/

==== //depot/projects/ia64/lib/libc/locale/frune.c#4 (text+ko) ====

@@ -34,11 +34,14 @@
  * SUCH DAMAGE.
  */
 
+/* f*rune() are obsolete in FreeBSD 6 -- use ANSI functions instead. */
+#define	OBSOLETE_IN_6
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)frune.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/frune.c,v 1.3 2002/09/18 06:19:12 tjr Exp $");

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


More information about the p4-projects mailing list