Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 8 Mar 2004 21:47:17 -0800 (PST)
From:      Marcel Moolenaar <marcel@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 48482 for review
Message-ID:  <200403090547.i295lHiJ080645@repoman.freebsd.org>

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

Change 48482 by marcel@marcel_nfs on 2004/03/08 21:46:39

	IFC @48480

Affected files ...

.. //depot/projects/gdb/UPDATING#4 integrate
.. //depot/projects/gdb/bin/dd/Makefile#3 integrate
.. //depot/projects/gdb/contrib/pf/pfctl/parse.y#2 integrate
.. //depot/projects/gdb/contrib/pf/pfctl/pfctl_altq.c#2 integrate
.. //depot/projects/gdb/etc/Makefile#3 integrate
.. //depot/projects/gdb/etc/group#2 integrate
.. //depot/projects/gdb/etc/inetd.conf#2 integrate
.. //depot/projects/gdb/etc/master.passwd#2 integrate
.. //depot/projects/gdb/etc/pf.conf#1 branch
.. //depot/projects/gdb/etc/pf.os#1 branch
.. //depot/projects/gdb/etc/protocols#2 integrate
.. //depot/projects/gdb/etc/rc#3 integrate
.. //depot/projects/gdb/etc/rc.d/abi#2 integrate
.. //depot/projects/gdb/etc/rc.d/accounting#4 integrate
.. //depot/projects/gdb/etc/rc.d/addswap#2 integrate
.. //depot/projects/gdb/etc/rc.d/adjkerntz#2 integrate
.. //depot/projects/gdb/etc/rc.d/amd#4 integrate
.. //depot/projects/gdb/etc/rc.d/apm#2 integrate
.. //depot/projects/gdb/etc/rc.d/apmd#3 integrate
.. //depot/projects/gdb/etc/rc.d/archdep#2 integrate
.. //depot/projects/gdb/etc/rc.d/atm1#2 integrate
.. //depot/projects/gdb/etc/rc.d/atm2#2 integrate
.. //depot/projects/gdb/etc/rc.d/atm3#2 integrate
.. //depot/projects/gdb/etc/rc.d/bgfsck#2 integrate
.. //depot/projects/gdb/etc/rc.d/bootparams#3 integrate
.. //depot/projects/gdb/etc/rc.d/ccd#3 integrate
.. //depot/projects/gdb/etc/rc.d/devd#2 integrate
.. //depot/projects/gdb/etc/rc.d/devfs#2 integrate
.. //depot/projects/gdb/etc/rc.d/dhclient#4 integrate
.. //depot/projects/gdb/etc/rc.d/diskless#2 integrate
.. //depot/projects/gdb/etc/rc.d/dmesg#2 integrate
.. //depot/projects/gdb/etc/rc.d/dumpon#3 integrate
.. //depot/projects/gdb/etc/rc.d/fsck#3 integrate
.. //depot/projects/gdb/etc/rc.d/gbde#3 integrate
.. //depot/projects/gdb/etc/rc.d/gbde_swap#2 integrate
.. //depot/projects/gdb/etc/rc.d/ike#2 integrate
.. //depot/projects/gdb/etc/rc.d/initdiskless#2 integrate
.. //depot/projects/gdb/etc/rc.d/initrandom#2 integrate
.. //depot/projects/gdb/etc/rc.d/ip6addrctl#2 integrate
.. //depot/projects/gdb/etc/rc.d/ip6fw#3 integrate
.. //depot/projects/gdb/etc/rc.d/ipfilter#4 integrate
.. //depot/projects/gdb/etc/rc.d/ipfs#3 integrate
.. //depot/projects/gdb/etc/rc.d/ipfw#2 integrate
.. //depot/projects/gdb/etc/rc.d/ipmon#3 integrate
.. //depot/projects/gdb/etc/rc.d/ipnat#3 integrate
.. //depot/projects/gdb/etc/rc.d/ipsec#4 integrate
.. //depot/projects/gdb/etc/rc.d/ipxrouted#2 integrate
.. //depot/projects/gdb/etc/rc.d/isdnd#3 integrate
.. //depot/projects/gdb/etc/rc.d/jail#3 integrate
.. //depot/projects/gdb/etc/rc.d/kldxref#2 integrate
.. //depot/projects/gdb/etc/rc.d/lomac#2 integrate
.. //depot/projects/gdb/etc/rc.d/mountcritlocal#3 integrate
.. //depot/projects/gdb/etc/rc.d/mountcritremote#3 integrate
.. //depot/projects/gdb/etc/rc.d/mountd#4 integrate
.. //depot/projects/gdb/etc/rc.d/moused#3 integrate
.. //depot/projects/gdb/etc/rc.d/mroute6d#2 integrate
.. //depot/projects/gdb/etc/rc.d/mrouted#3 integrate
.. //depot/projects/gdb/etc/rc.d/netif#3 integrate
.. //depot/projects/gdb/etc/rc.d/netoptions#2 integrate
.. //depot/projects/gdb/etc/rc.d/network_ipv6#2 integrate
.. //depot/projects/gdb/etc/rc.d/nfsclient#2 integrate
.. //depot/projects/gdb/etc/rc.d/nfsd#3 integrate
.. //depot/projects/gdb/etc/rc.d/nfslocking#4 integrate
.. //depot/projects/gdb/etc/rc.d/nfsserver#2 integrate
.. //depot/projects/gdb/etc/rc.d/ntpd#3 integrate
.. //depot/projects/gdb/etc/rc.d/ntpdate#3 integrate
.. //depot/projects/gdb/etc/rc.d/pccard#2 integrate
.. //depot/projects/gdb/etc/rc.d/pcvt#2 integrate
.. //depot/projects/gdb/etc/rc.d/power_profile#2 integrate
.. //depot/projects/gdb/etc/rc.d/ppp-user#2 integrate
.. //depot/projects/gdb/etc/rc.d/pppoed#2 integrate
.. //depot/projects/gdb/etc/rc.d/quota#2 integrate
.. //depot/projects/gdb/etc/rc.d/random#3 integrate
.. //depot/projects/gdb/etc/rc.d/rarpd#3 integrate
.. //depot/projects/gdb/etc/rc.d/root#3 integrate
.. //depot/projects/gdb/etc/rc.d/route6d#3 integrate
.. //depot/projects/gdb/etc/rc.d/routed#4 integrate
.. //depot/projects/gdb/etc/rc.d/routing#2 integrate
.. //depot/projects/gdb/etc/rc.d/rtadvd#3 integrate
.. //depot/projects/gdb/etc/rc.d/savecore#3 integrate
.. //depot/projects/gdb/etc/rc.d/serial#2 integrate
.. //depot/projects/gdb/etc/rc.d/sppp#2 integrate
.. //depot/projects/gdb/etc/rc.d/swap1#3 integrate
.. //depot/projects/gdb/etc/rc.d/syscons#2 integrate
.. //depot/projects/gdb/etc/rc.d/timed#3 integrate
.. //depot/projects/gdb/etc/rc.d/usbd#2 integrate
.. //depot/projects/gdb/etc/rc.d/vinum#2 integrate
.. //depot/projects/gdb/etc/rc.d/watchdogd#2 integrate
.. //depot/projects/gdb/lib/libc/stdio/_flock_stub.c#2 integrate
.. //depot/projects/gdb/lib/libc/stdio/local.h#2 integrate
.. //depot/projects/gdb/lib/libc/stdlib/malloc.c#3 integrate
.. //depot/projects/gdb/lib/libgeom/geom_xml2tree.c#2 integrate
.. //depot/projects/gdb/libexec/Makefile#3 integrate
.. //depot/projects/gdb/sbin/Makefile#4 integrate
.. //depot/projects/gdb/share/examples/etc/make.conf#3 integrate
.. //depot/projects/gdb/share/man/man4/Makefile#4 integrate
.. //depot/projects/gdb/share/man/man4/ng_atmllc.4#1 branch
.. //depot/projects/gdb/share/man/man9/pmap_pinit.9#2 integrate
.. //depot/projects/gdb/sys/alpha/alpha/pmap.c#2 integrate
.. //depot/projects/gdb/sys/amd64/amd64/local_apic.c#3 integrate
.. //depot/projects/gdb/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/gdb/sys/amd64/amd64/mp_machdep.c#3 integrate
.. //depot/projects/gdb/sys/amd64/amd64/pmap.c#3 integrate
.. //depot/projects/gdb/sys/amd64/amd64/trap.c#3 integrate
.. //depot/projects/gdb/sys/amd64/include/cpufunc.h#4 integrate
.. //depot/projects/gdb/sys/boot/efi/libefi/efi_console.c#2 integrate
.. //depot/projects/gdb/sys/conf/NOTES#4 integrate
.. //depot/projects/gdb/sys/conf/files#4 integrate
.. //depot/projects/gdb/sys/conf/options#4 integrate
.. //depot/projects/gdb/sys/i386/i386/elan-mmcr.c#3 integrate
.. //depot/projects/gdb/sys/i386/i386/pmap.c#3 integrate
.. //depot/projects/gdb/sys/i386/i386/vm_machdep.c#2 integrate
.. //depot/projects/gdb/sys/ia64/ia64/pmap.c#3 integrate
.. //depot/projects/gdb/sys/kern/kern_fork.c#4 integrate
.. //depot/projects/gdb/sys/kern/kern_synch.c#4 integrate
.. //depot/projects/gdb/sys/kern/subr_smp.c#3 integrate
.. //depot/projects/gdb/sys/kern/vfs_syscalls.c#3 integrate
.. //depot/projects/gdb/sys/modules/Makefile#4 integrate
.. //depot/projects/gdb/sys/modules/netgraph/atmllc/Makefile#1 branch
.. //depot/projects/gdb/sys/netgraph/ng_atmllc.c#1 branch
.. //depot/projects/gdb/sys/netgraph/ng_atmllc.h#1 branch
.. //depot/projects/gdb/sys/netgraph/ng_iface.c#2 integrate
.. //depot/projects/gdb/sys/netgraph/ng_iface.h#2 integrate
.. //depot/projects/gdb/sys/netinet/ip_mroute.c#2 integrate
.. //depot/projects/gdb/sys/netinet/pim.h#2 integrate
.. //depot/projects/gdb/sys/powerpc/powerpc/pmap.c#4 integrate
.. //depot/projects/gdb/sys/sparc64/sparc64/pmap.c#2 integrate
.. //depot/projects/gdb/sys/sys/param.h#4 integrate
.. //depot/projects/gdb/sys/sys/pcpu.h#2 integrate
.. //depot/projects/gdb/sys/vm/pmap.h#2 integrate
.. //depot/projects/gdb/sys/vm/vm_glue.c#4 integrate
.. //depot/projects/gdb/sys/vm/vm_map.c#3 integrate
.. //depot/projects/gdb/sys/vm/vm_object.c#4 integrate
.. //depot/projects/gdb/usr.bin/mail/mail.1#3 integrate
.. //depot/projects/gdb/usr.bin/printf/printf.c#2 integrate
.. //depot/projects/gdb/usr.sbin/Makefile#3 integrate
.. //depot/projects/gdb/usr.sbin/ac/Makefile#2 integrate
.. //depot/projects/gdb/usr.sbin/ac/ac.c#3 integrate
.. //depot/projects/gdb/usr.sbin/pw/edgroup.c#2 integrate
.. //depot/projects/gdb/usr.sbin/pw/fileupd.c#2 integrate

Differences ...

==== //depot/projects/gdb/UPDATING#4 (text+ko) ====

@@ -17,6 +17,17 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20040308:
+	The packet filter (pf) is now installed with the base system. Make
+	sure to run mergemaster -p before installworld to create required
+	user accounts. If you do not want to build pf with your system you
+	can use the NO_PF knob in make.conf.
+	Also note that pf requires "options PFIL_HOOKS" in the kernel. The
+	pf system consists of the following three devices:
+	device		pf		# required
+	device		pflog		# optional
+	device		pfsync		# optional
+
 20040303:
 	If you are having trouble with the libc_r -> libpthread transition
 	(see the 20040130 entry), place the following lines at the top of
@@ -1530,4 +1541,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.297 2004/03/03 09:17:06 des Exp $
+$FreeBSD: src/UPDATING,v 1.298 2004/03/08 22:26:46 mlaier Exp $

==== //depot/projects/gdb/bin/dd/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/dd/Makefile,v 1.16 2004/03/06 06:54:58 ache Exp $
+# $FreeBSD: src/bin/dd/Makefile,v 1.17 2004/03/08 18:09:33 ache Exp $
 
 PROG=	dd
 SRCS=	args.c conv.c conv_tab.c dd.c misc.c position.c
@@ -8,7 +8,6 @@
 
 .include <bsd.prog.mk>
 
-CLEANFILES+= a.out
 #
 # Test the character conversion functions.  We have to be explicit about
 # which LC_LANG we use because the definition of upper and lower case
@@ -24,3 +23,4 @@
 	  /usr/bin/env -i LC_CTYPE=en_US.US-ASCII hexdump -C | \
 	  diff -IFreeBSD - ${.CURDIR}/ref.${conv}
 .endfor
+	@rm -f a.out

==== //depot/projects/gdb/contrib/pf/pfctl/parse.y#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/contrib/pf/pfctl/parse.y,v 1.2 2004/02/28 18:41:43 mlaier Exp $	*/
+/*	$FreeBSD: src/contrib/pf/pfctl/parse.y,v 1.3 2004/03/08 15:19:55 mlaier Exp $	*/
 /*	$OpenBSD: parse.y,v 1.415 2003/09/01 15:07:40 henning Exp $	*/
 
 /*
@@ -2737,7 +2737,7 @@
 				memcpy(&r.rpool.key, $8.key,
 				    sizeof(struct pf_poolhashkey));
 
-			if ($9 != NULL) {
+			if ($9 != 0) {
 				if (r.action != PF_NAT) {
 					yyerror("the 'static-port' option is "
 					    "only valid with nat rules");

==== //depot/projects/gdb/contrib/pf/pfctl/pfctl_altq.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.2 2004/02/28 17:32:52 mlaier Exp $	*/
+/*	$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.3 2004/03/08 15:19:55 mlaier Exp $	*/
 /*	$OpenBSD: pfctl_altq.c,v 1.77 2003/08/22 21:50:34 david Exp $	*/
 
 /*
@@ -165,7 +165,7 @@
 print_altq(const struct pf_altq *a, unsigned level, struct node_queue_bw *bw,
 	struct node_queue_opt *qopts)
 {
-	if (a->qname[0] != NULL) {
+	if (a->qname[0] != '\0') {
 		print_queue(a, level, bw, 0, qopts);
 		return;
 	}

==== //depot/projects/gdb/etc/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.324 2004/01/22 08:18:37 ru Exp $
+# $FreeBSD: src/etc/Makefile,v 1.325 2004/03/08 22:03:27 mlaier Exp $
 
 .if !defined(NO_SENDMAIL)
 SUBDIR=	sendmail
@@ -11,7 +11,7 @@
 	hosts hosts.allow hosts.equiv hosts.lpd \
 	inetd.conf login.access login.conf \
 	mac.conf motd netconfig network.subr networks newsyslog.conf \
-	phones profile protocols \
+	pf.conf pf.os phones profile protocols \
 	rc rc.firewall rc.firewall6 rc.sendmail rc.shutdown \
 	rc.subr remote rpc services \
 	shells sysctl.conf syslog.conf usbd.conf \

==== //depot/projects/gdb/etc/group#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/group,v 1.28 2003/04/27 05:49:53 imp Exp $
+# $FreeBSD: src/etc/group,v 1.29 2004/03/08 22:03:27 mlaier Exp $
 #
 wheel:*:0:root
 daemon:*:1:
@@ -17,6 +17,8 @@
 mailnull:*:26:
 guest:*:31:
 bind:*:53:
+proxy:*:62
+authpf:*:63
 uucp:*:66:
 dialer:*:68:
 network:*:69:

==== //depot/projects/gdb/etc/inetd.conf#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/inetd.conf,v 1.63 2003/06/09 21:04:30 markm Exp $
+# $FreeBSD: src/etc/inetd.conf,v 1.65 2004/03/08 23:18:50 ale Exp $
 #
 # Internet server configuration database
 #
@@ -117,3 +117,9 @@
 #netbios-ssn stream tcp	nowait		root	/usr/local/sbin/smbd	smbd
 #netbios-ns dgram udp	wait		root	/usr/local/sbin/nmbd	nmbd
 #swat	stream	tcp	nowait/400	root	/usr/local/sbin/swat	swat
+#
+# Enable the following entry to enable ftp-proxy to NAT ftp sessions with pf
+# N.B.: inetd binds to * in the default installation so you should add
+#	an appropriate block rule to your pf.conf
+#
+#ftp-proxy stream tcp nowait root /usr/local/libexec/ftp-proxy ftp-proxy

==== //depot/projects/gdb/etc/master.passwd#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/master.passwd,v 1.34 2003/04/27 05:45:29 imp Exp $
+# $FreeBSD: src/etc/master.passwd,v 1.35 2004/03/08 22:03:27 mlaier Exp $
 #
 root::0:0::0:0:Charlie &:/root:/bin/csh
 toor:*:0:0::0:0:Bourne-again Superuser:/root:
@@ -14,6 +14,7 @@
 smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/sbin/nologin
 mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/sbin/nologin
 bind:*:53:53::0:0:Bind Sandbox:/:/sbin/nologin
+proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/sbin/nologin
 uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico
 pop:*:68:6::0:0:Post Office Owner:/nonexistent:/sbin/nologin
 www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/sbin/nologin

==== //depot/projects/gdb/etc/protocols#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # Internet protocols
 #
-# $FreeBSD: src/etc/protocols,v 1.18 2002/12/13 09:18:09 fenner Exp $
+# $FreeBSD: src/etc/protocols,v 1.19 2004/03/08 22:03:27 mlaier Exp $
 #	from: @(#)protocols	5.1 (Berkeley) 4/17/89
 #
 # See also http://www.iana.org/assignments/protocol-numbers
@@ -65,7 +65,7 @@
 mobile	55	MOBILE		# IP Mobility
 tlsp	56	TLSP		# Transport Layer Security Protocol
 skip	57	SKIP		# SKIP
-ipv6-icmp	58	IPV6-ICMP	# ICMP for IPv6
+ipv6-icmp	58	IPV6-ICMP	icmp6	# ICMP for IPv6
 ipv6-nonxt	59	IPV6-NONXT	# no next header for ipv6
 ipv6-opts	60	IPV6-OPTS	# destination options for ipv6
 #	61			# any host internal protocol

==== //depot/projects/gdb/etc/rc#3 (text+ko) ====

@@ -25,7 +25,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)rc	5.27 (Berkeley) 6/5/91
-# $FreeBSD: src/etc/rc,v 1.330 2004/02/27 10:44:33 mtm Exp $
+# $FreeBSD: src/etc/rc,v 1.331 2004/03/08 12:02:07 pjd Exp $
 #
 
 # System startup script run by init on autoboot
@@ -66,9 +66,9 @@
 fi
 
 os=`eval ${CMD_OSTYPE}`
-skip="nostart"
-[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && skip="$skip nojail"
-files=`rcorder -k ${os} -s ${skip} /etc/rc.d/* 2>/dev/null`
+skip="-s nostart"
+[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && skip="$skip -s nojail"
+files=`rcorder -k ${os} ${skip} /etc/rc.d/* 2>/dev/null`
 
 for _rc_elem in ${files}; do
 	run_rc_script ${_rc_elem} ${_boot}

==== //depot/projects/gdb/etc/rc.d/abi#2 (text+ko) ====

@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/abi,v 1.2 2003/05/05 15:38:41 mtm Exp $
+# $FreeBSD: src/etc/rc.d/abi,v 1.3 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: abi
 # REQUIRE: LOGIN
 # BEFORE:  securelevel
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/accounting#4 (text+ko) ====

@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/accounting,v 1.7 2004/03/05 07:43:38 mtm Exp $
+# $FreeBSD: src/etc/rc.d/accounting,v 1.8 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: accounting
 # REQUIRE: mountcritremote
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/addswap#2 (text+ko) ====

@@ -2,13 +2,13 @@
 #
 # Add additional swap files
 #
-# $FreeBSD: src/etc/rc.d/addswap,v 1.2 2002/10/12 10:31:31 schweikh Exp $
+# $FreeBSD: src/etc/rc.d/addswap,v 1.3 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: addswap
 # REQUIRE: mountcritlocal
 # BEFORE: sysctl
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/adjkerntz#2 (text+ko) ====

@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/adjkerntz,v 1.2 2003/04/18 17:55:05 mtm Exp $
+# $FreeBSD: src/etc/rc.d/adjkerntz,v 1.3 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: adjkerntz
 # REQUIRE: diskless mountcritlocal random
 # BEFORE: netif
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/amd#4 (text+ko) ====

@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $
-# $FreeBSD: src/etc/rc.d/amd,v 1.12 2004/03/05 07:43:38 mtm Exp $
+# $FreeBSD: src/etc/rc.d/amd,v 1.13 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: amd
 # REQUIRE: rpcbind ypbind nfsclient
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/apm#2 (text+ko) ====

@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/apm,v 1.4 2003/06/09 17:44:30 mtm Exp $
+# $FreeBSD: src/etc/rc.d/apm,v 1.5 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: apm
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/apmd#3 (text+ko) ====

@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/apmd,v 1.10 2004/01/17 11:25:16 mtm Exp $
+# $FreeBSD: src/etc/rc.d/apmd,v 1.11 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: apmd
 # REQUIRE: DAEMON apm
 # BEFORE:  LOGIN
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/archdep#2 (text+ko) ====

@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/archdep,v 1.5 2003/05/06 00:09:51 obrien Exp $
+# $FreeBSD: src/etc/rc.d/archdep,v 1.6 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: archdep
 # REQUIRE: LOGIN
 # BEFORE: abi
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/atm1#2 (text+ko) ====

@@ -24,13 +24,13 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.d/atm1,v 1.13 2003/07/28 13:30:42 harti Exp $
+# $FreeBSD: src/etc/rc.d/atm1,v 1.14 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: atm1
 # REQUIRE: root
 # BEFORE: netif
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/atm2#2 (text+ko) ====

@@ -24,13 +24,13 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.d/atm2,v 1.14 2003/07/28 13:30:42 harti Exp $
+# $FreeBSD: src/etc/rc.d/atm2,v 1.15 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: atm2
 # REQUIRE: atm1 netif
 # BEFORE:  routing
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 #
 # Additional ATM interface configuration

==== //depot/projects/gdb/etc/rc.d/atm3#2 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.d/atm3,v 1.12 2003/10/13 08:20:55 dougb Exp $
+# $FreeBSD: src/etc/rc.d/atm3,v 1.13 2004/03/08 12:25:05 pjd Exp $
 #
 
 # Start ATM daemons
@@ -32,7 +32,7 @@
 # PROVIDE: atm3
 # REQUIRE: atm2
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/bgfsck#2 (text+ko) ====

@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/bgfsck,v 1.4 2003/04/23 15:38:02 matusita Exp $
+# $FreeBSD: src/etc/rc.d/bgfsck,v 1.5 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: bgfsck
 # REQUIRE: cron devfs
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/bootparams#3 (text+ko) ====

@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $NetBSD: bootparams,v 1.6 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/bootparams,v 1.5 2004/01/17 10:40:45 mtm Exp $
+# $FreeBSD: src/etc/rc.d/bootparams,v 1.6 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: bootparams
 # REQUIRE: rpcbind DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/ccd#3 (text+ko) ====

@@ -1,11 +1,11 @@
 #!/bin/sh
 #
 # $NetBSD: ccd,v 1.3 2000/05/13 08:45:06 lukem Exp $
-# $FreeBSD: src/etc/rc.d/ccd,v 1.3 2004/01/17 10:16:38 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ccd,v 1.4 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: disks
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/devd#2 (text+ko) ====

@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/devd,v 1.5 2003/02/12 04:22:40 imp Exp $
+# $FreeBSD: src/etc/rc.d/devd,v 1.6 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: devd
 # REQUIRE: NETWORKING
 # BEFORE: mountcritremote
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/devfs#2 (text+ko) ====

@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/devfs,v 1.6 2003/08/20 06:15:18 mtm Exp $
+# $FreeBSD: src/etc/rc.d/devfs,v 1.7 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: devfs
 # REQUIRE: LOGIN
 # BEFORE:  securelevel
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/dhclient#4 (text+ko) ====

@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/dhclient,v 1.14 2004/03/05 07:43:38 mtm Exp $
+# $FreeBSD: src/etc/rc.d/dhclient,v 1.15 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: dhclient
 # REQUIRE: netif ipfw ipfilter mountcritlocal
 # BEFORE:  NETWORKING
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 #
 #	Note that there no syslog logging of dhclient messages at boot because
 #	dhclient needs to start before services that syslog depends upon do.

==== //depot/projects/gdb/etc/rc.d/diskless#2 (text+ko) ====

@@ -24,13 +24,13 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.d/diskless,v 1.30 2004/01/05 19:14:47 brooks Exp $
+# $FreeBSD: src/etc/rc.d/diskless,v 1.31 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: diskless
 # REQUIRE: initdiskless rcconf mountcritlocal
 # BEFORE: addswap random
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null`
 [ ${dlv:=0} -eq 0 ] && exit 0

==== //depot/projects/gdb/etc/rc.d/dmesg#2 (text+ko) ====

@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $NetBSD: dmesg,v 1.8 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/dmesg,v 1.2 2002/06/13 22:14:36 gordon Exp $
+# $FreeBSD: src/etc/rc.d/dmesg,v 1.3 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: dmesg
 # REQUIRE: mountcritremote
 # BEFORE:  DAEMON
-# KEYWORD: FreeBSD Daemon
+# KEYWORD: FreeBSD Daemon nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/dumpon#3 (text+ko) ====

@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/dumpon,v 1.2 2004/02/02 19:05:06 pjd Exp $
+# $FreeBSD: src/etc/rc.d/dumpon,v 1.3 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: dumpon
 # REQUIRE: initrandom
 # BEFORE: disks savecore
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/fsck#3 (text+ko) ====

@@ -1,12 +1,12 @@
 #!/bin/sh
 #
 # $NetBSD: fsck,v 1.2 2001/06/18 06:42:35 lukem Exp $
-# $FreeBSD: src/etc/rc.d/fsck,v 1.7 2004/01/17 11:52:37 mtm Exp $
+# $FreeBSD: src/etc/rc.d/fsck,v 1.8 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: fsck
 # REQUIRE: localswap
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/gbde#3 (text+ko) ====

@@ -3,11 +3,11 @@
 # This file, originally written by Garrett A. Wollman, is in the public
 # domain.
 #
-# $FreeBSD: src/etc/rc.d/gbde,v 1.3 2004/02/03 10:22:55 des Exp $
+# $FreeBSD: src/etc/rc.d/gbde,v 1.4 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: disks
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/gbde_swap#2 (text+ko) ====

@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/gbde_swap,v 1.3 2004/02/05 21:40:37 des Exp $
+# $FreeBSD: src/etc/rc.d/gbde_swap,v 1.4 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: disks
 # REQUIRE: initrandom
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/ike#2 (text+ko) ====

@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ike,v 1.1 2003/11/28 17:28:42 bms Exp $
+# $FreeBSD: src/etc/rc.d/ike,v 1.2 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: ike
 # REQUIRE: root beforenetlkm mountcritlocal
 # BEFORE:  DAEMON
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/initdiskless#2 (text+ko) ====

@@ -24,10 +24,10 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.d/initdiskless,v 1.28 2003/10/13 08:20:55 dougb Exp $
+# $FreeBSD: src/etc/rc.d/initdiskless,v 1.29 2004/03/08 12:25:05 pjd Exp $
 #
 # PROVIDE: initdiskless
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 
 # On entry to this script the entire system consists of a read-only root

==== //depot/projects/gdb/etc/rc.d/initrandom#2 (text+ko) ====

@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/initrandom,v 1.1 2002/06/13 22:14:36 gordon Exp $
+# $FreeBSD: src/etc/rc.d/initrandom,v 1.2 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: initrandom
 # REQUIRE: initdiskless
 # BEFORE: disks
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/ip6addrctl#2 (text+ko) ====

@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.1 2003/10/30 17:55:52 ume Exp $
+# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.2 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: ip6addrctl
 # REQUIRE: mountcritlocal netif
 # BEFORE: network_ipv6
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 . /etc/network.subr

==== //depot/projects/gdb/etc/rc.d/ip6fw#3 (text+ko) ====

@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ip6fw,v 1.4 2004/02/19 06:53:24 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ip6fw,v 1.5 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: ip6fw
 # REQUIRE: routing
 # BEFORE: network_ipv6
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/ipfilter#4 (text+ko) ====

@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $
-# $FreeBSD: src/etc/rc.d/ipfilter,v 1.18 2004/03/05 07:43:38 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ipfilter,v 1.19 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: ipfilter
 # REQUIRE: root mountcritlocal ipmon
 # BEFORE:  netif
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/ipfs#3 (text+ko) ====

@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $NetBSD: ipfs,v 1.3 2002/02/11 13:55:42 lukem Exp $
-# $FreeBSD: src/etc/rc.d/ipfs,v 1.4 2004/01/17 10:40:45 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ipfs,v 1.5 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: ipfs
 # REQUIRE: ipnat
 # BEFORE:  netif
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: FreeBSD nojail shutdown
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/ipfw#2 (text+ko) ====

@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ipfw,v 1.5 2003/07/27 20:34:30 mbr Exp $
+# $FreeBSD: src/etc/rc.d/ipfw,v 1.6 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: ipfw
 # REQUIRE: ppp-user
 # BEFORE: NETWORKING
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 . /etc/network.subr

==== //depot/projects/gdb/etc/rc.d/ipmon#3 (text+ko) ====

@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $NetBSD: ipmon,v 2002/04/18 05:02:01 lukem Exp $
-# $FreeBSD: src/etc/rc.d/ipmon,v 1.8 2004/01/17 10:40:45 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ipmon,v 1.9 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: ipmon
 # REQUIRE: mountcritlocal hostname sysctl cleanvar
 # BEFORE:  SERVERS
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/ipnat#3 (text+ko) ====

@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $
-# $FreeBSD: src/etc/rc.d/ipnat,v 1.12 2004/01/17 10:40:45 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ipnat,v 1.13 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: ipnat
 # REQUIRE: ipfilter
 # BEFORE:  DAEMON netif
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/ipsec#4 (text+ko) ====

@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/ipsec,v 1.9 2004/03/05 07:43:38 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ipsec,v 1.10 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: ipsec
 # REQUIRE: root mountcritlocal
 # BEFORE:  DAEMON
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 #	it does not really require beforenetlkm.
 

==== //depot/projects/gdb/etc/rc.d/ipxrouted#2 (text+ko) ====

@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ipxrouted,v 1.1 2002/06/13 22:14:36 gordon Exp $
+# $FreeBSD: src/etc/rc.d/ipxrouted,v 1.2 2004/03/08 12:25:05 pjd Exp $
 #
 
 # PROVIDE: ipxrouted
 # REQUIRE: SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nojail
 
 . /etc/rc.subr
 

==== //depot/projects/gdb/etc/rc.d/isdnd#3 (text+ko) ====

@@ -1,14 +1,14 @@
 #!/bin/sh

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



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