Module Name: src
Committed By: rmind
Date: Thu Feb 10 14:04:30 UTC 2011
Modified Files:
src/dist/pf/usr.sbin/ftp-proxy: filter.h
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi
Log Message:
- Fix man pages list for MKNPF=no case. Based on a patch from Scott Ellis.
- Fix build with MKNPF=yes and MKIPFILTER=no as well; close PR/44512.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/dist/pf/usr.sbin/ftp-proxy/filter.h
cvs rdiff -u -r1.1584 -r1.1585 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1286 -r1.1287 src/distrib/sets/lists/man/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/pf/usr.sbin/ftp-proxy/filter.h
diff -u src/dist/pf/usr.sbin/ftp-proxy/filter.h:1.3 src/dist/pf/usr.sbin/ftp-proxy/filter.h:1.4
--- src/dist/pf/usr.sbin/ftp-proxy/filter.h:1.3 Wed Feb 2 02:20:26 2011
+++ src/dist/pf/usr.sbin/ftp-proxy/filter.h Thu Feb 10 14:04:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: filter.h,v 1.3 2011/02/02 02:20:26 rmind Exp $ */
+/* $NetBSD: filter.h,v 1.4 2011/02/10 14:04:30 rmind Exp $ */
/*
* Copyright (c) 2004, 2005 Camiel Dobbelaar, <[email protected]>
@@ -36,14 +36,19 @@
extern const ftp_proxy_ops_t pf_fprx_ops;
-#if defined(__NetBSD__) && defined(WITH_NPF)
-extern const ftp_proxy_ops_t npf_fprx_ops;
+#if defined(__NetBSD__)
+
extern const char * netif;
+
+#if defined(WITH_NPF)
+extern const ftp_proxy_ops_t npf_fprx_ops;
+extern char * npfopts;
#endif
-#if defined(__NetBSD__) && defined(WITH_IPF)
+#if defined(WITH_IPF)
extern const ftp_proxy_ops_t ipf_fprx_ops;
-extern char * npfopts;
+#endif
+
#endif
#endif
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1584 src/distrib/sets/lists/comp/mi:1.1585
--- src/distrib/sets/lists/comp/mi:1.1584 Tue Feb 8 03:20:14 2011
+++ src/distrib/sets/lists/comp/mi Thu Feb 10 14:04:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1584 2011/02/08 03:20:14 haad Exp $
+# $NetBSD: mi,v 1.1585 2011/02/10 14:04:29 rmind Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1501,8 +1501,8 @@
./usr/include/net/if_vlanvar.h comp-c-include
./usr/include/net/net_stats.h comp-c-include
./usr/include/net/netisr.h comp-c-include
-./usr/include/net/npf.h comp-npf-include npf
-./usr/include/net/npf_ncode.h comp-npf-include npf
+./usr/include/net/npf.h comp-c-include
+./usr/include/net/npf_ncode.h comp-c-include
./usr/include/net/pfil.h comp-c-include
./usr/include/net/pfkeyv2.h comp-c-include
./usr/include/net/pfvar.h comp-c-include
@@ -7460,7 +7460,7 @@
./usr/share/man/cat3/noqiflush.0 comp-c-catman .cat
./usr/share/man/cat3/noraw.0 comp-c-catman .cat
./usr/share/man/cat3/notimeout.0 comp-c-catman .cat
-./usr/share/man/cat3/npf.0 comp-npf-catman .cat
+./usr/share/man/cat3/npf.0 comp-npf-catman .cat,npf
./usr/share/man/cat3/nrand48.0 comp-c-catman .cat
./usr/share/man/cat3/ns.0 comp-obsolete obsolete
./usr/share/man/cat3/ns_addr.0 comp-obsolete obsolete
@@ -13477,7 +13477,7 @@
./usr/share/man/html3/noqiflush.html comp-c-htmlman html
./usr/share/man/html3/noraw.html comp-c-htmlman html
./usr/share/man/html3/notimeout.html comp-c-htmlman html
-./usr/share/man/html3/npf.html comp-npf-htmlman html
+./usr/share/man/html3/npf.html comp-npf-htmlman html,npf
./usr/share/man/html3/nrand48.html comp-c-htmlman html
./usr/share/man/html3/nsdispatch.html comp-c-htmlman html
./usr/share/man/html3/ntoa.html comp-c-htmlman html
@@ -19480,7 +19480,7 @@
./usr/share/man/man3/noqiflush.3 comp-c-man .man
./usr/share/man/man3/noraw.3 comp-c-man .man
./usr/share/man/man3/notimeout.3 comp-c-man .man
-./usr/share/man/man3/npf.3 comp-npf-man .man
+./usr/share/man/man3/npf.3 comp-npf-man .man,npf
./usr/share/man/man3/nrand48.3 comp-c-man .man
./usr/share/man/man3/ns.3 comp-obsolete obsolete
./usr/share/man/man3/ns_addr.3 comp-obsolete obsolete
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1286 src/distrib/sets/lists/man/mi:1.1287
--- src/distrib/sets/lists/man/mi:1.1286 Wed Feb 9 15:12:40 2011
+++ src/distrib/sets/lists/man/mi Thu Feb 10 14:04:30 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1286 2011/02/09 15:12:40 tsutsui Exp $
+# $NetBSD: mi,v 1.1287 2011/02/10 14:04:30 rmind Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1918,7 +1918,7 @@
./usr/share/man/cat5/nicknames.0 man-nis-catman yp,.cat
./usr/share/man/cat5/nisplus_table.0 man-postfix-catman postfix,.cat
./usr/share/man/cat5/nologin.0 man-sysutil-catman .cat
-./usr/share/man/cat5/npf.conf.0 man-npf-catman .cat
+./usr/share/man/cat5/npf.conf.0 man-npf-catman .cat,npf
./usr/share/man/cat5/nsswitch.conf.0 man-net-catman .cat
./usr/share/man/cat5/openssl.cnf.0 man-crypto-catman crypto,.cat
./usr/share/man/cat5/pam.conf.0 man-sys-catman .cat
@@ -2496,7 +2496,7 @@
./usr/share/man/cat8/nis.0 man-nis-catman .cat
./usr/share/man/cat8/nologin.0 man-sysutil-catman .cat
./usr/share/man/cat8/npf.conf.0 man-obsolete obsolete
-./usr/share/man/cat8/npfctl.0 man-npf-catman .cat
+./usr/share/man/cat8/npfctl.0 man-npf-catman .cat,npf
./usr/share/man/cat8/nqmgr.0 man-obsolete obsolete
./usr/share/man/cat8/nslookup.0 man-netutil-catman .cat
./usr/share/man/cat8/nsupdate.0 man-obsolete obsolete
@@ -4590,7 +4590,7 @@
./usr/share/man/html5/nicknames.html man-nis-htmlman yp,html
./usr/share/man/html5/nisplus_table.html man-postfix-htmlman postfix,html
./usr/share/man/html5/nologin.html man-sysutil-htmlman html
-./usr/share/man/html5/npf.conf.html man-npf-htmlman html
+./usr/share/man/html5/npf.conf.html man-npf-htmlman html,npf
./usr/share/man/html5/nsswitch.conf.html man-net-htmlman html
./usr/share/man/html5/openssl.cnf.html man-crypto-htmlman crypto,html
./usr/share/man/html5/pam.conf.html man-sys-htmlman html
@@ -5031,7 +5031,7 @@
./usr/share/man/html8/nis.html man-nis-htmlman html
./usr/share/man/html8/nologin.html man-sysutil-htmlman html
./usr/share/man/html8/npf.conf.html man-obsolete obsolete
-./usr/share/man/html8/npfctl.html man-npf-htmlman html
+./usr/share/man/html8/npfctl.html man-npf-htmlman html,npf
./usr/share/man/html8/nslookup.html man-netutil-htmlman html
./usr/share/man/html8/nsupdate.html man-obsolete obsolete
./usr/share/man/html8/ntalkd.html man-netutil-htmlman html
@@ -7213,7 +7213,7 @@
./usr/share/man/man5/nicknames.5 man-nis-man yp,.man
./usr/share/man/man5/nisplus_table.5 man-postfix-man postfix,.man
./usr/share/man/man5/nologin.5 man-sysutil-man .man
-./usr/share/man/man5/npf.conf.5 man-npf-man .man
+./usr/share/man/man5/npf.conf.5 man-npf-man .man,npf
./usr/share/man/man5/nsswitch.conf.5 man-net-man .man
./usr/share/man/man5/openssl.cnf.5 man-crypto-man crypto,.man
./usr/share/man/man5/pam.conf.5 man-sys-man .man
@@ -7791,7 +7791,7 @@
./usr/share/man/man8/nis.8 man-nis-man .man
./usr/share/man/man8/nologin.8 man-sysutil-man .man
./usr/share/man/man8/npf.conf.8 man-obsolete obsolete
-./usr/share/man/man8/npfctl.8 man-npf-man .man
+./usr/share/man/man8/npfctl.8 man-npf-man .man,npf
./usr/share/man/man8/nqmgr.8 man-obsolete obsolete
./usr/share/man/man8/nslookup.8 man-netutil-man .man
./usr/share/man/man8/nsupdate.8 man-obsolete obsolete
