Subject: toolchain/26080: Support for MKIPFILTER / MKPF
To: None <gnats-bugs@gnats.NetBSD.org>
From: Peter Postma <peter@pointless.nl>
List: netbsd-bugs
Date: 06/27/2004 13:13:42
>Number: 26080
>Category: toolchain
>Synopsis: Support for MKIPFILTER / MKPF
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: toolchain-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sun Jun 27 11:15:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator: Peter Postma
>Release: NetBSD 2.0F
>Organization:
>Environment:
System: NetBSD mercury.pointless.nl 2.0F NetBSD 2.0F (mercury) #7: Fri Jun 25 17:53:46 CEST 2004 peter@mercury.pointless.nl:/usr/obj/sys/arch/sparc64/compile/mercury sparc64
Architecture: sparc64
Machine: sparc64
>Description:
With the recent addition of pf, it might be desirable to build only
one firewall package, or maybe none at all. We can do this by introducing
the options MKIPFILTER and MKPF (which default to 'yes').
I've tried to implement this in the patch below, the only thing that's
not handled at the moment are the include (.h) files (i'm not sure how /
if it's needed). Buildworld works, with or without the new options.
>How-To-Repeat:
>Fix:
Index: distrib/sets/sets.subr
===================================================================
RCS file: /cvsroot/src/distrib/sets/sets.subr,v
retrieving revision 1.33
diff -u -r1.33 sets.subr
--- distrib/sets/sets.subr 13 Jun 2004 22:35:02 -0000 1.33
+++ distrib/sets/sets.subr 27 Jun 2004 02:21:29 -0000
@@ -36,6 +36,7 @@
MKGDB \
MKHESIOD \
MKINFO \
+ MKIPFILTER \
MKKERBEROS \
MKKERBEROS4 \
MKLINT \
@@ -43,6 +44,7 @@
MKMANPAGES \
MKMANZ \
MKNLS \
+ MKPF \
MKPIC \
MKPOSTFIX \
MKPROFILE \
@@ -151,12 +153,14 @@
# gdb ${MKGDB} != no
# hesiod ${MKHESIOD} != no
# info ${MKINFO} != no
+# ipfilter ${MKIPFILTER} != no
# kerberos ${MKKERBEROS} != no
# kerberos4 ${MKKERBEROS4} != no
# lint ${MKLINT} != no
# man ${MKMAN} != no
# manz ${MKMANZ} != no
# nls ${MKNLS} != no
+# pf ${MKPF} != no
# postfix ${MKPOSTFIX} != no
# profile ${MKPROFILE} != no
# sendmail ${MKSENDMAIL} != no
Index: distrib/sets/lists/base/mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/base/mi,v
retrieving revision 1.491
diff -u -r1.491 mi
--- distrib/sets/lists/base/mi 25 Jun 2004 16:34:45 -0000 1.491
+++ distrib/sets/lists/base/mi 27 Jun 2004 02:21:32 -0000
@@ -128,7 +128,7 @@
./sbin/halt base-sysutil-root
./sbin/ifconfig base-netutil-root
./sbin/init base-sysutil-root
-./sbin/ipf base-netutil-root
+./sbin/ipf base-netutil-root ipfilter
./sbin/ipppctl base-netutil-root
./sbin/ispppcontrol base-obsolete obsolete
./sbin/lmcctl base-netutil-root
@@ -166,7 +166,7 @@
./sbin/nfsd base-obsolete obsolete
./sbin/nfsiod base-obsolete obsolete
./sbin/nologin base-sysutil-root
-./sbin/pfctl base-netutil-root
+./sbin/pfctl base-netutil-root pf
./sbin/ping base-netutil-root
./sbin/ping6 base-netutil-root
./sbin/poweroff base-sysutil-root
@@ -827,7 +827,7 @@
./usr/libexec/cpp base-obsolete obsolete
./usr/libexec/dnskeygen base-bind-bin obsolete
./usr/libexec/fingerd base-netutil-bin
-./usr/libexec/ftp-proxy base-netutil-bin
+./usr/libexec/ftp-proxy base-netutil-bin pf
./usr/libexec/ftpd base-netutil-bin
./usr/libexec/getNAME base-man-bin
./usr/libexec/getty base-sysutil-bin
@@ -885,9 +885,9 @@
./usr/libexec/sftp-server base-secsh-bin crypto
./usr/libexec/sm.bin base-sendmail-usr
./usr/libexec/smrsh base-sendmail-bin sendmail
-./usr/libexec/spamd base-netutil-bin
-./usr/libexec/spamd-setup base-netutil-bin
-./usr/libexec/spamlogd base-netutil-bin
+./usr/libexec/spamd base-netutil-bin pf
+./usr/libexec/spamd-setup base-netutil-bin pf
+./usr/libexec/spamlogd base-netutil-bin pf
./usr/libexec/ssh-keysign base-secsh-bin crypto
./usr/libexec/telnetd base-netutil-bin
./usr/libexec/tftpd base-netutil-bin
@@ -910,7 +910,7 @@
./usr/sbin/amd base-amd-bin
./usr/sbin/amq base-amd-bin
./usr/sbin/arp base-netutil-bin
-./usr/sbin/authpf base-netutil-bin
+./usr/sbin/authpf base-netutil-bin pf
./usr/sbin/bootpd base-bootserver-bin
./usr/sbin/bootpef base-bootserver-bin
./usr/sbin/bootpgw base-bootserver-bin
@@ -964,15 +964,15 @@
./usr/sbin/installboot base-sysutil-bin
./usr/sbin/iopctl base-sysutil-bin
./usr/sbin/iostat base-sysutil-bin
-./usr/sbin/ipfs base-netutil-bin
-./usr/sbin/ipfstat base-netutil-bin
-./usr/sbin/ipftest base-netutil-bin
-./usr/sbin/ipmon base-netutil-bin
-./usr/sbin/ipnat base-router-bin
-./usr/sbin/ippool base-netutil-root
-./usr/sbin/ipresend base-netutil-bin
-./usr/sbin/ipsend base-netutil-bin
-./usr/sbin/iptest base-netutil-bin
+./usr/sbin/ipfs base-netutil-bin ipfilter
+./usr/sbin/ipfstat base-netutil-bin ipfilter
+./usr/sbin/ipftest base-netutil-bin ipfilter
+./usr/sbin/ipmon base-netutil-bin ipfilter
+./usr/sbin/ipnat base-router-bin ipfilter
+./usr/sbin/ippool base-netutil-root ipfilter
+./usr/sbin/ipresend base-netutil-bin ipfilter
+./usr/sbin/ipsend base-netutil-bin ipfilter
+./usr/sbin/iptest base-netutil-bin ipfilter
./usr/sbin/irdaattach base-sysutil-bin
./usr/sbin/isdnd base-isdn-bin
./usr/sbin/isdnmonitor base-isdn-bin
@@ -1115,7 +1115,7 @@
./usr/sbin/slstats base-slip-bin
./usr/sbin/smrsh base-obsolete obsolete
./usr/sbin/sntp base-ntp-bin
-./usr/sbin/spamdb base-netutil-bin
+./usr/sbin/spamdb base-netutil-bin pf
./usr/sbin/spawn base-obsolete obsolete
./usr/sbin/spray base-rpcutil-bin
./usr/sbin/sshd base-secsh-bin crypto
Index: distrib/sets/lists/etc/mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/etc/mi,v
retrieving revision 1.142
diff -u -r1.142 mi
--- distrib/sets/lists/etc/mi 22 Jun 2004 18:24:06 -0000 1.142
+++ distrib/sets/lists/etc/mi 27 Jun 2004 02:21:32 -0000
@@ -85,8 +85,8 @@
./etc/obsolete/text etc-obsolete obsolete
./etc/passwd etc-sys-etc
./etc/passwd.conf etc-sys-etc
-./etc/pf.conf etc-net-etc
-./etc/pf.os etc-net-etc
+./etc/pf.conf etc-net-etc pf
+./etc/pf.os etc-net-etc pf
./etc/phones etc-uucp-etc
./etc/postfix/README etc-postfix-etc
./etc/postfix/main.cf etc-postfix-etc
@@ -229,7 +229,7 @@
./etc/skel/.logout etc-sys-etc
./etc/skel/.profile etc-sys-etc
./etc/skeykeys etc-sys-etc
-./etc/spamd.conf etc-net-etc
+./etc/spamd.conf etc-net-etc pf
./etc/spwd.db etc-sys-etc
./etc/ssh/ssh_config etc-secsh-etc crypto
./etc/ssh/ssh_known_hosts etc-secsh-etc crypto
Index: distrib/sets/lists/man/mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/man/mi,v
retrieving revision 1.709
diff -u -r1.709 mi
--- distrib/sets/lists/man/mi 25 Jun 2004 16:34:45 -0000 1.709
+++ distrib/sets/lists/man/mi 27 Jun 2004 02:21:36 -0000
@@ -172,10 +172,10 @@
./usr/share/man/cat1/intro.0 man-sys-catman .cat
./usr/share/man/cat1/ipcrm.0 man-util-catman .cat
./usr/share/man/cat1/ipcs.0 man-util-catman .cat
-./usr/share/man/cat1/ipftest.0 man-ipf-catman .cat
-./usr/share/man/cat1/ipresend.0 man-ipf-catman .cat
-./usr/share/man/cat1/ipsend.0 man-ipf-catman .cat
-./usr/share/man/cat1/iptest.0 man-ipf-catman .cat
+./usr/share/man/cat1/ipftest.0 man-ipf-catman ipfilter,.cat
+./usr/share/man/cat1/ipresend.0 man-ipf-catman ipfilter,.cat
+./usr/share/man/cat1/ipsend.0 man-ipf-catman ipfilter,.cat
+./usr/share/man/cat1/iptest.0 man-ipf-catman ipfilter,.cat
./usr/share/man/cat1/jobs.0 man-util-catman .cat
./usr/share/man/cat1/join.0 man-util-catman .cat
./usr/share/man/cat1/jot.0 man-util-catman .cat
@@ -234,7 +234,7 @@
./usr/share/man/cat1/mkdep.0 man-c-catman .cat
./usr/share/man/cat1/mkdir.0 man-util-catman .cat
./usr/share/man/cat1/mkfifo.0 man-sysutil-catman .cat
-./usr/share/man/cat1/mkfilters.0 man-ipf-catman .cat
+./usr/share/man/cat1/mkfilters.0 man-ipf-catman ipfilter,.cat
./usr/share/man/cat1/mklocale.0 man-util-catman .cat
./usr/share/man/cat1/mktemp.0 man-util-catman .cat
./usr/share/man/cat1/mopa.out.0 man-obsolete obsolete
@@ -878,12 +878,12 @@
./usr/share/man/cat4/iopsp.0 man-sys-catman .cat
./usr/share/man/cat4/ip.0 man-sys-catman .cat
./usr/share/man/cat4/ip6.0 man-sys-catman .cat
-./usr/share/man/cat4/ipf.0 man-sys-catman .cat
-./usr/share/man/cat4/ipfilter.0 man-sys-catman .cat
+./usr/share/man/cat4/ipf.0 man-sys-catman ipfilter,.cat
+./usr/share/man/cat4/ipfilter.0 man-sys-catman ipfilter,.cat
./usr/share/man/cat4/ipip.0 man-obsolete obsolete
./usr/share/man/cat4/ipkdb.0 man-sys-catman .cat
-./usr/share/man/cat4/ipl.0 man-sys-catman .cat
-./usr/share/man/cat4/ipnat.0 man-sys-catman .cat
+./usr/share/man/cat4/ipl.0 man-sys-catman ipfilter,.cat
+./usr/share/man/cat4/ipnat.0 man-sys-catman ipfilter,.cat
./usr/share/man/cat4/ippp.0 man-sys-catman .cat
./usr/share/man/cat4/ipsec.0 man-sys-catman .cat
./usr/share/man/cat4/irda.0 man-sys-catman .cat
@@ -1024,8 +1024,8 @@
./usr/share/man/cat4/pcscp.0 man-sys-catman .cat
./usr/share/man/cat4/pcweasel.0 man-sys-catman .cat
./usr/share/man/cat4/pdcide.0 man-sys-catman .cat
-./usr/share/man/cat4/pf.0 man-sys-catman .cat
-./usr/share/man/cat4/pflog.0 man-sys-catman .cat
+./usr/share/man/cat4/pf.0 man-sys-catman pf,.cat
+./usr/share/man/cat4/pflog.0 man-sys-catman pf,.cat
./usr/share/man/cat4/phy.0 man-sys-catman .cat
./usr/share/man/cat4/piixide.0 man-sys-catman .cat
./usr/share/man/cat4/plip.0 man-sys-catman .cat
@@ -1403,14 +1403,14 @@
./usr/share/man/cat5/info.0 man-texinfo-catman .cat
./usr/share/man/cat5/inode.0 man-sys-catman .cat
./usr/share/man/cat5/intro.0 man-sys-catman .cat
-./usr/share/man/cat5/ipf.0 man-ipf-catman .cat
-./usr/share/man/cat5/ipf.conf.0 man-ipf-catman .cat
-./usr/share/man/cat5/ipf6.conf.0 man-ipf-catman .cat
-./usr/share/man/cat5/ipnat.0 man-ipf-catman .cat
-./usr/share/man/cat5/ipnat.conf.0 man-ipf-catman .cat
-./usr/share/man/cat5/ippool.0 man-ipf-catman .cat
+./usr/share/man/cat5/ipf.0 man-ipf-catman ipfilter,.cat
+./usr/share/man/cat5/ipf.conf.0 man-ipf-catman ipfilter,.cat
+./usr/share/man/cat5/ipf6.conf.0 man-ipf-catman ipfilter,.cat
+./usr/share/man/cat5/ipnat.0 man-ipf-catman ipfilter,.cat
+./usr/share/man/cat5/ipnat.conf.0 man-ipf-catman ipfilter,.cat
+./usr/share/man/cat5/ippool.0 man-ipf-catman ipfilter,.cat
./usr/share/man/cat5/ipsec.conf.0 man-netutil-catman .cat
-./usr/share/man/cat5/ipsend.0 man-ipf-catman .cat
+./usr/share/man/cat5/ipsend.0 man-ipf-catman ipfilter,.cat
./usr/share/man/cat5/isdnd.acct.0 man-isdn-catman .cat
./usr/share/man/cat5/isdnd.rates.0 man-isdn-catman .cat
./usr/share/man/cat5/isdnd.rc.0 man-isdn-catman .cat
@@ -1447,8 +1447,8 @@
./usr/share/man/cat5/passwd.conf.0 man-sys-catman .cat
./usr/share/man/cat5/pcfs.0 man-obsolete obsolete
./usr/share/man/cat5/pcre_table.0 man-postfix-catman postfix,.cat
-./usr/share/man/cat5/pf.conf.0 man-sys-catman .cat
-./usr/share/man/cat5/pf.os.0 man-sys-catman .cat
+./usr/share/man/cat5/pf.conf.0 man-sys-catman pf,.cat
+./usr/share/man/cat5/pf.os.0 man-sys-catman pf,.cat
./usr/share/man/cat5/phones.0 man-uucp-catman .cat
./usr/share/man/cat5/pim6dd.conf.0 man-obsolete obsolete
./usr/share/man/cat5/pim6sd.conf.0 man-obsolete obsolete
@@ -1472,7 +1472,7 @@
./usr/share/man/cat5/services.0 man-net-catman .cat
./usr/share/man/cat5/shells.0 man-sys-catman .cat
./usr/share/man/cat5/siginfo.0 man-obsolete obsolete
-./usr/share/man/cat5/spamd.conf.0 man-netutil-catman .cat
+./usr/share/man/cat5/spamd.conf.0 man-netutil-catman pf,.cat
./usr/share/man/cat5/ssh_config.0 man-secsh-catman crypto,.cat
./usr/share/man/cat5/sshd_config.0 man-secsh-catman crypto,.cat
./usr/share/man/cat5/stab.0 man-sys-catman .cat
@@ -1573,7 +1573,7 @@
./usr/share/man/cat8/atari/installboot.0 man-sysutil-catman .cat
./usr/share/man/cat8/atari/makedev.0 man-obsolete obsolete
./usr/share/man/cat8/atrun.0 man-cron-catman .cat
-./usr/share/man/cat8/authpf.0 man-sys-cat .cat
+./usr/share/man/cat8/authpf.0 man-sys-cat pf,.cat
./usr/share/man/cat8/bad144.0 man-sysutil-catman .cat
./usr/share/man/cat8/badsect.0 man-sysutil-catman .cat
./usr/share/man/cat8/bebox/MAKEDEV.0 man-obsolete obsolete
@@ -1672,7 +1672,7 @@
./usr/share/man/cat8/fsinfo.0 man-sysutil-catman .cat
./usr/share/man/cat8/fsirand.0 man-sysutil-catman .cat
./usr/share/man/cat8/fssconfig.0 man-sysutil-catman .cat
-./usr/share/man/cat8/ftp-proxy.0 man-netutil-catman .cat
+./usr/share/man/cat8/ftp-proxy.0 man-netutil-catman pf,.cat
./usr/share/man/cat8/ftpd.0 man-netutil-catman .cat
./usr/share/man/cat8/genassym.sh.0 man-sys-catman .cat
./usr/share/man/cat8/getNAME.0 man-man-catman .cat
@@ -1739,12 +1739,12 @@
./usr/share/man/cat8/intro.0 man-sys-catman .cat
./usr/share/man/cat8/iopctl.0 man-sysutil-catman .cat
./usr/share/man/cat8/iostat.0 man-sysutil-catman .cat
-./usr/share/man/cat8/ipf.0 man-ipf-catman .cat
-./usr/share/man/cat8/ipfs.0 man-ipf-catman .cat
-./usr/share/man/cat8/ipfstat.0 man-ipf-catman .cat
-./usr/share/man/cat8/ipmon.0 man-ipf-catman .cat
-./usr/share/man/cat8/ipnat.0 man-ipf-catman .cat
-./usr/share/man/cat8/ippool.0 man-ipf-catman .cat
+./usr/share/man/cat8/ipf.0 man-ipf-catman ipfilter,.cat
+./usr/share/man/cat8/ipfs.0 man-ipf-catman ipfilter,.cat
+./usr/share/man/cat8/ipfstat.0 man-ipf-catman ipfilter,.cat
+./usr/share/man/cat8/ipmon.0 man-ipf-catman ipfilter,.cat
+./usr/share/man/cat8/ipnat.0 man-ipf-catman ipfilter,.cat
+./usr/share/man/cat8/ippool.0 man-ipf-catman ipfilter,.cat
./usr/share/man/cat8/ipppctl.0 man-isdn-catman .cat
./usr/share/man/cat8/irda.0 man-sysutil-catman .cat
./usr/share/man/cat8/irdaattach.0 man-sysutil-catman .cat
@@ -1901,7 +1901,7 @@
./usr/share/man/cat8/pcnfsd.0 man-nfsserver-catman .cat
./usr/share/man/cat8/pdisk.0 man-sysutil-catman .cat
./usr/share/man/cat8/peace.0 man-sys-catman .cat
-./usr/share/man/cat8/pfctl.0 man-sys-catman .cat
+./usr/share/man/cat8/pfctl.0 man-sys-catman pf,.cat
./usr/share/man/cat8/pickup.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/pim6dd.0 man-obsolete obsolete
./usr/share/man/cat8/pim6sd.0 man-obsolete obsolete
@@ -2018,10 +2018,10 @@
./usr/share/man/cat8/smrsh.0 man-sendmail-catman sendmail,.cat
./usr/share/man/cat8/smtp.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/smtpd.0 man-postfix-catman postfix,.cat
-./usr/share/man/cat8/spamd-setup.0 man-netutil-catman .cat
-./usr/share/man/cat8/spamd.0 man-netutil-catman .cat
-./usr/share/man/cat8/spamdb.0 man-netutil-catman .cat
-./usr/share/man/cat8/spamlogd.0 man-netutil-catman .cat
+./usr/share/man/cat8/spamd-setup.0 man-netutil-catman pf,.cat
+./usr/share/man/cat8/spamd.0 man-netutil-catman pf,.cat
+./usr/share/man/cat8/spamdb.0 man-netutil-catman pf,.cat
+./usr/share/man/cat8/spamlogd.0 man-netutil-catman pf,.cat
./usr/share/man/cat8/sparc/MAKEDEV.0 man-obsolete obsolete
./usr/share/man/cat8/sparc/binstall.0 man-sysutil-catman .cat
./usr/share/man/cat8/sparc/boot.0 man-sys-catman .cat
@@ -2291,10 +2291,10 @@
./usr/share/man/man1/intro.1 man-sys-man .man
./usr/share/man/man1/ipcrm.1 man-util-man .man
./usr/share/man/man1/ipcs.1 man-util-man .man
-./usr/share/man/man1/ipftest.1 man-ipf-man .man
-./usr/share/man/man1/ipresend.1 man-ipf-man .man
-./usr/share/man/man1/ipsend.1 man-ipf-man .man
-./usr/share/man/man1/iptest.1 man-ipf-man .man
+./usr/share/man/man1/ipftest.1 man-ipf-man ipfilter,.man
+./usr/share/man/man1/ipresend.1 man-ipf-man ipfilter,.man
+./usr/share/man/man1/ipsend.1 man-ipf-man ipfilter,.man
+./usr/share/man/man1/iptest.1 man-ipf-man ipfilter,.man
./usr/share/man/man1/jobs.1 man-util-man .man
./usr/share/man/man1/join.1 man-util-man .man
./usr/share/man/man1/jot.1 man-util-man .man
@@ -2353,7 +2353,7 @@
./usr/share/man/man1/mkdep.1 man-c-man .man
./usr/share/man/man1/mkdir.1 man-util-man .man
./usr/share/man/man1/mkfifo.1 man-sysutil-man .man
-./usr/share/man/man1/mkfilters.1 man-ipf-man .man
+./usr/share/man/man1/mkfilters.1 man-ipf-man ipfilter,.man
./usr/share/man/man1/mklocale.1 man-util-man .man
./usr/share/man/man1/mktemp.1 man-util-man .man
./usr/share/man/man1/mopa.out.1 man-obsolete obsolete
@@ -2997,13 +2997,13 @@
./usr/share/man/man4/iopsp.4 man-sys-man .man
./usr/share/man/man4/ip.4 man-sys-man .man
./usr/share/man/man4/ip6.4 man-sys-man .man
-./usr/share/man/man4/ipf.4 man-sys-man .man
-./usr/share/man/man4/ipfilter.4 man-sys-man .man
-./usr/share/man/man4/ipfilter.4 man-sys-man .man
+./usr/share/man/man4/ipf.4 man-sys-man ipfilter,.man
+./usr/share/man/man4/ipfilter.4 man-sys-man ipfilter,.man
+./usr/share/man/man4/ipfilter.4 man-sys-man ipfilter,.man
./usr/share/man/man4/ipip.4 man-obsolete obsolete
./usr/share/man/man4/ipkdb.4 man-sys-man .man
-./usr/share/man/man4/ipl.4 man-sys-man .man
-./usr/share/man/man4/ipnat.4 man-sys-man .man
+./usr/share/man/man4/ipl.4 man-sys-man ipfilter,.man
+./usr/share/man/man4/ipnat.4 man-sys-man ipfilter,.man
./usr/share/man/man4/ippp.4 man-sys-man .man
./usr/share/man/man4/ipsec.4 man-sys-man .man
./usr/share/man/man4/irda.4 man-sys-man .man
@@ -3145,8 +3145,8 @@
./usr/share/man/man4/pcscp.4 man-sys-man .man
./usr/share/man/man4/pcweasel.4 man-sys-man .man
./usr/share/man/man4/pdcide.4 man-sys-man .man
-./usr/share/man/man4/pf.4 man-sys-man .man
-./usr/share/man/man4/pflog.4 man-sys-man .man
+./usr/share/man/man4/pf.4 man-sys-man pf,.man
+./usr/share/man/man4/pflog.4 man-sys-man pf,.man
./usr/share/man/man4/phy.4 man-sys-man .man
./usr/share/man/man4/piixide.4 man-sys-man .man
./usr/share/man/man4/plip.4 man-sys-man .man
@@ -3524,14 +3524,14 @@
./usr/share/man/man5/info.5 man-texinfo-man .man
./usr/share/man/man5/inode.5 man-sys-man .man
./usr/share/man/man5/intro.5 man-sys-man .man
-./usr/share/man/man5/ipf.5 man-ipf-man .man
-./usr/share/man/man5/ipf.conf.5 man-ipf-man .man
-./usr/share/man/man5/ipf6.conf.5 man-ipf-man .man
-./usr/share/man/man5/ipnat.5 man-ipf-man .man
-./usr/share/man/man5/ipnat.conf.5 man-ipf-man .man
-./usr/share/man/man5/ippool.5 man-ipf-man .man
+./usr/share/man/man5/ipf.5 man-ipf-man ipfilter,.man
+./usr/share/man/man5/ipf.conf.5 man-ipf-man ipfilter,.man
+./usr/share/man/man5/ipf6.conf.5 man-ipf-man ipfilter,.man
+./usr/share/man/man5/ipnat.5 man-ipf-man ipfilter,.man
+./usr/share/man/man5/ipnat.conf.5 man-ipf-man ipfilter,.man
+./usr/share/man/man5/ippool.5 man-ipf-man ipfilter,.man
./usr/share/man/man5/ipsec.conf.5 man-netutil-man .man
-./usr/share/man/man5/ipsend.5 man-ipf-man .man
+./usr/share/man/man5/ipsend.5 man-ipf-man ipfilter,.man
./usr/share/man/man5/isdnd.acct.5 man-isdn-man .man
./usr/share/man/man5/isdnd.rates.5 man-isdn-man .man
./usr/share/man/man5/isdnd.rc.5 man-isdn-man .man
@@ -3568,8 +3568,8 @@
./usr/share/man/man5/passwd.conf.5 man-sys-man .man
./usr/share/man/man5/pcfs.5 man-obsolete obsolete
./usr/share/man/man5/pcre_table.5 man-postfix-man postfix,.man
-./usr/share/man/man5/pf.conf.5 man-sys-man .man
-./usr/share/man/man5/pf.os.5 man-sys-man .man
+./usr/share/man/man5/pf.conf.5 man-sys-man pf,.man
+./usr/share/man/man5/pf.os.5 man-sys-man pf,.man
./usr/share/man/man5/phones.5 man-uucp-man .man
./usr/share/man/man5/pim6dd.conf.5 man-obsolete obsolete
./usr/share/man/man5/pim6sd.conf.5 man-obsolete obsolete
@@ -3593,7 +3593,7 @@
./usr/share/man/man5/services.5 man-net-man .man
./usr/share/man/man5/shells.5 man-sys-man .man
./usr/share/man/man5/siginfo.5 man-obsolete obsolete
-./usr/share/man/man5/spamd.conf.5 man-netutil-man .man
+./usr/share/man/man5/spamd.conf.5 man-netutil-man pf,.man
./usr/share/man/man5/ssh_config.5 man-secsh-man crypto,.man
./usr/share/man/man5/sshd_config.5 man-secsh-man crypto,.man
./usr/share/man/man5/stab.5 man-sys-man .man
@@ -3693,7 +3693,7 @@
./usr/share/man/man8/atari/installboot.8 man-sysutil-man .man
./usr/share/man/man8/atari/makedev.8 man-obsolete obsolete
./usr/share/man/man8/atrun.8 man-cron-man .man
-./usr/share/man/man8/authpf.8 man-sys-man .man
+./usr/share/man/man8/authpf.8 man-sys-man pf,.man
./usr/share/man/man8/bad144.8 man-sysutil-man .man
./usr/share/man/man8/badsect.8 man-sysutil-man .man
./usr/share/man/man8/bebox/MAKEDEV.8 man-obsolete obsolete
@@ -3792,7 +3792,7 @@
./usr/share/man/man8/fsinfo.8 man-sysutil-man .man
./usr/share/man/man8/fsirand.8 man-sysutil-man .man
./usr/share/man/man8/fssconfig.8 man-sysutil-man .man
-./usr/share/man/man8/ftp-proxy.8 man-netutil-man .man
+./usr/share/man/man8/ftp-proxy.8 man-netutil-man pf,.man
./usr/share/man/man8/ftpd.8 man-netutil-man .man
./usr/share/man/man8/genassym.sh.8 man-sys-man .man
./usr/share/man/man8/getNAME.8 man-man-man .man
@@ -3860,12 +3860,12 @@
./usr/share/man/man8/intro.8 man-sys-man .man
./usr/share/man/man8/iopctl.8 man-sysutil-man .man
./usr/share/man/man8/iostat.8 man-sysutil-man .man
-./usr/share/man/man8/ipf.8 man-ipf-man .man
-./usr/share/man/man8/ipfs.8 man-ipf-man .man
-./usr/share/man/man8/ipfstat.8 man-ipf-man .man
-./usr/share/man/man8/ipmon.8 man-ipf-man .man
-./usr/share/man/man8/ipnat.8 man-ipf-man .man
-./usr/share/man/man8/ippool.8 man-ipf-man .man
+./usr/share/man/man8/ipf.8 man-ipf-man ipfilter,.man
+./usr/share/man/man8/ipfs.8 man-ipf-man ipfilter,.man
+./usr/share/man/man8/ipfstat.8 man-ipf-man ipfilter,.man
+./usr/share/man/man8/ipmon.8 man-ipf-man ipfilter,.man
+./usr/share/man/man8/ipnat.8 man-ipf-man ipfilter,.man
+./usr/share/man/man8/ippool.8 man-ipf-man ipfilter,.man
./usr/share/man/man8/ipppctl.8 man-isdn-man .man
./usr/share/man/man8/irda.8 man-sysutil-man .man
./usr/share/man/man8/irdaattach.8 man-sysutil-man .man
@@ -4022,7 +4022,7 @@
./usr/share/man/man8/pcnfsd.8 man-nfsserver-man .man
./usr/share/man/man8/pdisk.8 man-sysutil-man .man
./usr/share/man/man8/peace.8 man-sys-man .man
-./usr/share/man/man8/pfctl.8 man-sys-man .man
+./usr/share/man/man8/pfctl.8 man-sys-man pf,.man
./usr/share/man/man8/pickup.8 man-postfix-man postfix,.man
./usr/share/man/man8/pim6dd.8 man-obsolete obsolete
./usr/share/man/man8/pim6sd.8 man-obsolete obsolete
@@ -4139,10 +4139,10 @@
./usr/share/man/man8/smrsh.8 man-sendmail-man sendmail,.man
./usr/share/man/man8/smtp.8 man-postfix-man postfix,.man
./usr/share/man/man8/smtpd.8 man-postfix-man postfix,.man
-./usr/share/man/man8/spamd-setup.8 man-netutil-man .man
-./usr/share/man/man8/spamd.8 man-netutil-man .man
-./usr/share/man/man8/spamdb.8 man-netutil-man .man
-./usr/share/man/man8/spamlogd.8 man-netutil-man .man
+./usr/share/man/man8/spamd-setup.8 man-netutil-man pf,.man
+./usr/share/man/man8/spamd.8 man-netutil-man pf,.man
+./usr/share/man/man8/spamdb.8 man-netutil-man pf,.man
+./usr/share/man/man8/spamlogd.8 man-netutil-man pf,.man
./usr/share/man/man8/sparc/MAKEDEV.8 man-obsolete obsolete
./usr/share/man/man8/sparc/binstall.8 man-sys-man .man
./usr/share/man/man8/sparc/boot.8 man-sys-man .man
Index: distrib/sets/lists/misc/mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/misc/mi,v
retrieving revision 1.103
diff -u -r1.103 mi
--- distrib/sets/lists/misc/mi 18 May 2004 05:38:18 -0000 1.103
+++ distrib/sets/lists/misc/mi 27 Jun 2004 02:21:37 -0000
@@ -482,32 +482,32 @@
./usr/share/examples/fstab/fstab.wd0.cobalt misc-fstab-examples share
./usr/share/examples/ftpd/ftpd.conf misc-netutil-examples share
./usr/share/examples/ftpd/ftpusers misc-netutil-examples share
-./usr/share/examples/ipf/BASIC.NAT misc-netutil-examples share
-./usr/share/examples/ipf/BASIC_1.FW misc-netutil-examples share
-./usr/share/examples/ipf/BASIC_2.FW misc-netutil-examples share
-./usr/share/examples/ipf/example.1 misc-netutil-examples share
-./usr/share/examples/ipf/example.10 misc-netutil-examples share
-./usr/share/examples/ipf/example.11 misc-netutil-examples share
-./usr/share/examples/ipf/example.12 misc-netutil-examples share
-./usr/share/examples/ipf/example.13 misc-netutil-examples share
-./usr/share/examples/ipf/example.2 misc-netutil-examples share
-./usr/share/examples/ipf/example.3 misc-netutil-examples share
-./usr/share/examples/ipf/example.4 misc-netutil-examples share
-./usr/share/examples/ipf/example.5 misc-netutil-examples share
-./usr/share/examples/ipf/example.6 misc-netutil-examples share
-./usr/share/examples/ipf/example.7 misc-netutil-examples share
-./usr/share/examples/ipf/example.8 misc-netutil-examples share
-./usr/share/examples/ipf/example.9 misc-netutil-examples share
-./usr/share/examples/ipf/example.sr misc-netutil-examples share
-./usr/share/examples/ipf/firewall misc-netutil-examples share
-./usr/share/examples/ipf/ftp-proxy misc-netutil-examples share
-./usr/share/examples/ipf/ftppxy misc-netutil-examples share
-./usr/share/examples/ipf/mediaone misc-netutil-examples share
-./usr/share/examples/ipf/mkfilters misc-netutil-examples share
-./usr/share/examples/ipf/nat-setup misc-netutil-examples share
-./usr/share/examples/ipf/nat.eg misc-netutil-examples share
-./usr/share/examples/ipf/server misc-netutil-examples share
-./usr/share/examples/ipf/tcpstate misc-netutil-examples share
+./usr/share/examples/ipf/BASIC.NAT misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/BASIC_1.FW misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/BASIC_2.FW misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/example.1 misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/example.10 misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/example.11 misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/example.12 misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/example.13 misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/example.2 misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/example.3 misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/example.4 misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/example.5 misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/example.6 misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/example.7 misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/example.8 misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/example.9 misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/example.sr misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/firewall misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/ftp-proxy misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/ftppxy misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/mediaone misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/mkfilters misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/nat-setup misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/nat.eg misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/server misc-netutil-examples ipfilter,share
+./usr/share/examples/ipf/tcpstate misc-netutil-examples ipfilter,share
./usr/share/examples/isdn/holidays.D.SH misc-isdn-examples share
./usr/share/examples/isdn/isdnd.rates.A misc-isdn-examples share
./usr/share/examples/isdn/isdnd.rates.D misc-isdn-examples share
Index: etc/Makefile
===================================================================
RCS file: /cvsroot/src/etc/Makefile,v
retrieving revision 1.290
diff -u -r1.290 Makefile
--- etc/Makefile 22 Jun 2004 18:21:55 -0000 1.290
+++ etc/Makefile 27 Jun 2004 02:21:37 -0000
@@ -168,10 +168,10 @@
MKBFD MKCATPAGES \
MKCRYPTO MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKCVS \
MKDOC MKDYNAMICROOT MKGCC MKGCCCMDS MKGDB \
- MKHESIOD MKHOSTOBJ MKHTML MKIEEEFP MKINFO \
+ MKHESIOD MKHOSTOBJ MKHTML MKIEEEFP MKINFO MKIPFILTER \
MKKERBEROS4 MKKERBEROS MKLINKLIB MKLINT \
MKMAN MKMANZ MKNLS MKOBJ MKOBJDIRS \
- MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
+ MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
MKSENDMAIL MKSHARE MKSKEY MKSOFTFLOAT MKSTATICLIB \
MKUNPRIVED MKUPDATE MKUUCP MKX11 MKYP \
NBUILDJOBS NETBSDSRCDIR \
@@ -296,12 +296,14 @@
/dev/null ${DESTDIR}/var/run/utmp
${ETC_INSTALL_FILE} -o ${BINOWN} -g ${UTMPGRP} -m 664 \
/dev/null ${DESTDIR}/var/run/utmpx
+.if (${MKPF} != "no")
${ETC_INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 644 \
pf.os ${DESTDIR}/etc
${ETC_INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 644 \
pf.conf ${DESTDIR}/etc
${ETC_INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 644 \
spamd.conf ${DESTDIR}/etc
+.endif
${ETC_INSTALL_FILE} -o games -g games -m 664 \
/dev/null ${DESTDIR}/var/games/atc_score
${ETC_INSTALL_FILE} -o games -g games -m 664 \
Index: share/mk/bsd.README
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.README,v
retrieving revision 1.155
diff -u -r1.155 bsd.README
--- share/mk/bsd.README 13 Jun 2004 08:17:22 -0000 1.155
+++ share/mk/bsd.README 27 Jun 2004 02:21:38 -0000
@@ -165,6 +165,9 @@
Texinfo source files.
Default: yes
+MKIPFILTER if "no", don't build or install the ipfilter programs.
+ Default: yes
+
MKKERBEROS4 If "no", disables building of Kerberos v4
infrastructure (libraries and support programs).
Default: yes
@@ -204,6 +207,9 @@
MKOBJDIRS If "no", don't create objdirs during a "make build".
Default: no
+MKPF If "no", don't build or install the pf programs and spamd.
+ Default: yes
+
MKPIC If "no", don't build or install shared libraries, and
also acts as "MKPICLIB=no"
Default: yes (for MACHINE_ARCHs that support it)
Index: share/mk/bsd.own.mk
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.own.mk,v
retrieving revision 1.421
diff -u -r1.421 bsd.own.mk
--- share/mk/bsd.own.mk 11 Jun 2004 07:14:16 -0000 1.421
+++ share/mk/bsd.own.mk 27 Jun 2004 02:21:38 -0000
@@ -548,13 +548,13 @@
DOC \
GCC GCCCMDS GDB \
HESIOD HTML \
- IEEEFP INET6 INFO \
+ IEEEFP INET6 INFO IPFILTER \
KERBEROS KERBEROS4 \
LINKLIB LINT \
MAN \
NLS \
OBJ \
- PIC PICINSTALL PICLIB POSTFIX PROFILE \
+ PF PIC PICINSTALL PICLIB POSTFIX PROFILE \
SENDMAIL SHARE SKEY STATICLIB \
UUCP \
YP
Index: sbin/Makefile
===================================================================
RCS file: /cvsroot/src/sbin/Makefile,v
retrieving revision 1.87
diff -u -r1.87 Makefile
--- sbin/Makefile 22 Jun 2004 15:16:30 -0000 1.87
+++ sbin/Makefile 27 Jun 2004 02:21:38 -0000
@@ -50,6 +50,8 @@
SUBDIR+= setkey
# PF
+.if (${MKPF} != "no")
SUBDIR+= pfctl
+.endif
.include <bsd.subdir.mk>
Index: libexec/Makefile
===================================================================
RCS file: /cvsroot/src/libexec/Makefile,v
retrieving revision 1.48
diff -u -r1.48 Makefile
--- libexec/Makefile 25 Jun 2004 16:34:45 -0000 1.48
+++ libexec/Makefile 27 Jun 2004 02:21:38 -0000
@@ -14,6 +14,8 @@
.endif
# PF
+.if (${MKPF} != "no")
SUBDIR+=spamd spamd-setup ftp-proxy spamlogd
+.endif
.include <bsd.subdir.mk>
Index: usr.sbin/Makefile
===================================================================
RCS file: /cvsroot/src/usr.sbin/Makefile,v
retrieving revision 1.192
diff -u -r1.192 Makefile
--- usr.sbin/Makefile 26 Jun 2004 13:14:27 -0000 1.192
+++ usr.sbin/Makefile 27 Jun 2004 02:21:38 -0000
@@ -8,7 +8,7 @@
dhcp diskpart dumpfs dumplfs edquota eeprom \
envstat eshconfig etcupdate fssconfig grfconfig \
grfinfo gspa hilinfo ifwatchd inetd installboot \
- iopctl iostat ipf irdaattach isdn iteconfig \
+ iopctl iostat irdaattach isdn iteconfig \
kgmon lastlogin link lpr mailwrapper makefs \
map-mbone mdconfig memswitch mlxctl mopd mountd moused \
mrinfo mrouted mscdlabel mtrace \
@@ -16,7 +16,7 @@
pstat pwd_mkdb powerd quot quotacheck quotaon rarpd rbootd rdate \
repquota rmt rpc.bootparamd rpc.lockd rpc.pcnfsd \
rpc.statd rpcbind rwhod sa screenblank sesd \
- sliplogin slstats spamdb sntp \
+ sliplogin slstats sntp \
spray sunlabel sup sushi syslogd tadpolectl tcpdchk \
tcpdmatch tcpdump timed tpctl traceroute trpt trsp unlink \
usbdevs user videomode vipw vnconfig wiconfig wsconscfg \
@@ -47,7 +47,14 @@
SUBDIR+= racoon
.endif
+# IPFilter
+.if (${MKIPFILTER} != "no")
+SUBDIR+= ipf
+.endif
+
# PF
-SUBDIR+=authpf
+.if (${MKPF} != "no")
+SUBDIR+= authpf spamdb
+.endif
.include <bsd.subdir.mk>
Index: share/man/man4/Makefile
===================================================================
RCS file: /cvsroot/src/share/man/man4/Makefile,v
retrieving revision 1.324
diff -u -r1.324 Makefile
--- share/man/man4/Makefile 22 Jun 2004 14:58:41 -0000 1.324
+++ share/man/man4/Makefile 27 Jun 2004 02:21:39 -0000
@@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.324 2004/06/22 14:58:41 itojun Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
+.include <bsd.own.mk>
+
MAN= aac.4 acardide.4 aceride.4 acphy.4 adc.4 adv.4 \
adw.4 agp.4 ahb.4 ahc.4 amdpm.4 amhphy.4 amr.4 \
an.4 aria.4 artsata.4 ata.4 atalk.4 ath.4 atppc.4 atw.4 \
@@ -94,7 +96,9 @@
ifpci.4 isic.4 iwic.4 isdncapi.4 iavc.4
# PF
+.if (${MKPF} != "no")
MAN+= pf.4 pflog.4
+.endif
MLINKS+=bha.4 bt.4
MLINKS+=cardbus.4 cbb.4
Index: share/man/man5/Makefile
===================================================================
RCS file: /cvsroot/src/share/man/man5/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- share/man/man5/Makefile 25 Jun 2004 16:31:20 -0000 1.51
+++ share/man/man5/Makefile 27 Jun 2004 02:21:39 -0000
@@ -3,6 +3,8 @@
# missing: dump.5 plot.5
+.include <bsd.own.mk>
+
MAN= a.out.5 acct.5 ar.5 core.5 daily.conf.5 dir.5 disktab.5 elf.5 \
ethers.5 fs.5 fstab.5 genassym.cf.5 group.5 hesiod.conf.5 \
hosts.5 hosts.equiv.5 ifaliases.5 ifconfig.if.5 intro.5 \
@@ -17,7 +19,9 @@
utmp.5 utmpx.5 weekly.conf.5 wscons.conf.5
# PF
+.if (${MKPF} != "no")
MAN+= pf.os.5 pf.conf.5 spamd.conf.5
+.endif
MLINKS= dir.5 dirent.5 fs.5 inode.5 hosts.equiv.5 rhosts.5
MLINKS+=utmp.5 wtmp.5 utmp.5 lastlog.5 passwd.5 master.passwd.5
>Release-Note:
>Audit-Trail:
>Unformatted: