Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch enable IPFILTER_COMPAT in all kernels that have ipf...



details:   https://anonhg.NetBSD.org/src/rev/da459b97d178
branches:  trunk
changeset: 754699:da459b97d178
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat May 08 22:16:25 2010 +0000

description:
enable IPFILTER_COMPAT in all kernels that have ipfilter already.
canonicalise several of the ipf option segments in various files
(this mostly means adding commented out IPFILTER_DEFAULT_BLOCK,
or adding commented or uncommented IPFILTER_LOG or IPFILTER_LOOKUP
option statements.)

i built about 20 of these kernels to check, but not all of them.

diffstat:

 sys/arch/alpha/conf/GENERIC        |  5 +++--
 sys/arch/alpha/conf/RAWHIDE        |  7 ++++++-
 sys/arch/amd64/conf/GENERIC        |  5 +++--
 sys/arch/amd64/conf/XEN3_DOMU      |  3 ++-
 sys/arch/amiga/conf/GENERIC.in     |  5 +++--
 sys/arch/amigappc/conf/GENERIC     |  5 +++--
 sys/arch/arc/conf/ARCTIC           |  4 +++-
 sys/arch/arc/conf/GENERIC          |  5 +++--
 sys/arch/arc/conf/MIMORI           |  4 +++-
 sys/arch/arc/conf/PICA             |  4 +++-
 sys/arch/atari/conf/GENERIC.in     |  3 ++-
 sys/arch/bebox/conf/GENERIC        |  5 +++--
 sys/arch/cats/conf/GENERIC         |  3 ++-
 sys/arch/cobalt/conf/GENERIC       |  5 +++--
 sys/arch/evbarm/conf/GUMSTIX       |  3 ++-
 sys/arch/evbarm/conf/HDL_G         |  7 ++++++-
 sys/arch/evbarm/conf/MPCSA_GENERIC |  5 +++--
 sys/arch/evbarm/conf/TWINTAIL      |  7 ++++++-
 sys/arch/evbmips/conf/ALCHEMY      |  6 ++++--
 sys/arch/evbmips/conf/GDIUM        |  9 +++++++--
 sys/arch/evbmips/conf/MALTA        |  6 ++++--
 sys/arch/evbmips/conf/XLS6ATX_7A   |  6 ++++--
 sys/arch/evbppc/conf/PMPPC         |  4 +++-
 sys/arch/evbppc/conf/VIRTEX_DFC    |  5 ++++-
 sys/arch/evbppc/conf/WALNUT        |  4 +++-
 sys/arch/evbsh3/conf/T_SH7706LAN   |  7 ++++++-
 sys/arch/evbsh3/conf/T_SH7706LSR   |  7 ++++++-
 sys/arch/ews4800mips/conf/GENERIC  |  5 +++--
 sys/arch/hp300/conf/GENERIC        |  5 +++--
 sys/arch/hp700/conf/GENERIC        |  5 +++--
 sys/arch/hpcmips/conf/GENERIC      |  9 +++++++--
 sys/arch/hpcmips/conf/LROUTER      |  7 ++++++-
 sys/arch/hpcmips/conf/VR41XX       |  9 +++++++--
 sys/arch/i386/conf/ALL             |  5 +++--
 sys/arch/i386/conf/GENERIC         |  5 +++--
 sys/arch/i386/conf/GENERIC_TINY    |  3 ++-
 sys/arch/i386/conf/XEN3_DOMU       |  3 ++-
 sys/arch/landisk/conf/GENERIC      |  5 +++--
 sys/arch/mac68k/conf/GENERIC       |  5 +++--
 sys/arch/macppc/conf/GENERIC       |  5 +++--
 sys/arch/macppc/conf/POWERMAC      |  4 +++-
 sys/arch/mmeye/conf/GENERIC        |  5 +++--
 sys/arch/news68k/conf/GENERIC      |  5 +++--
 sys/arch/newsmips/conf/DEJIKO      |  4 +++-
 sys/arch/newsmips/conf/WAPIKO      |  4 +++-
 sys/arch/next68k/conf/GENERIC      |  8 ++++++--
 sys/arch/next68k/conf/SLAB         |  6 +++++-
 sys/arch/ofppc/conf/GENERIC        |  5 +++--
 sys/arch/ofppc/conf/GENERIC.MP     |  5 +++--
 sys/arch/pmax/conf/GENERIC         |  5 +++--
 sys/arch/prep/conf/GENERIC         |  5 +++--
 sys/arch/rs6000/conf/GENERIC       |  5 +++--
 sys/arch/sbmips/conf/GENERIC       |  5 +++--
 sys/arch/sparc/conf/GENERIC        |  5 +++--
 sys/arch/sparc/conf/TADPOLE3GX     |  4 +++-
 sys/arch/sparc64/conf/GENERIC      |  5 +++--
 sys/arch/vax/conf/GENERIC          |  5 +++--
 sys/arch/x68k/conf/INSTALL         |  6 ++++--
 58 files changed, 208 insertions(+), 93 deletions(-)

diffs (truncated from 1357 to 300 lines):

diff -r 693b10ee22c5 -r da459b97d178 sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC       Sat May 08 20:41:24 2010 +0000
+++ b/sys/arch/alpha/conf/GENERIC       Sat May 08 22:16:25 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.335 2010/04/29 22:40:49 chs Exp $
+# $NetBSD: GENERIC,v 1.336 2010/05/08 22:16:25 mrg Exp $
 #
 # This machine description file is used to generate the default NetBSD
 # kernel.
@@ -19,7 +19,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-ident          "GENERIC-$Revision: 1.335 $"
+ident          "GENERIC-$Revision: 1.336 $"
 
 maxusers 32
 
@@ -117,6 +117,7 @@
 options        PFIL_HOOKS      # pfil(9) packet filter hooks
 options        IPFILTER_LOG    # ipmon(8) log support
 options        IPFILTER_LOOKUP # ippool(8) support
+options        IPFILTER_COMPAT # Compat for IP-Filter
 #options       IPFILTER_DEFAULT_BLOCK  # block all packets by default
 #options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
 
diff -r 693b10ee22c5 -r da459b97d178 sys/arch/alpha/conf/RAWHIDE
--- a/sys/arch/alpha/conf/RAWHIDE       Sat May 08 20:41:24 2010 +0000
+++ b/sys/arch/alpha/conf/RAWHIDE       Sat May 08 22:16:25 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: RAWHIDE,v 1.33 2010/04/16 13:48:28 pooka Exp $
+# $NetBSD: RAWHIDE,v 1.34 2010/05/08 22:16:25 mrg Exp $
 #
 # Alpha 4100 stripped for action server kernel.
 #
@@ -34,6 +34,11 @@
 
 options        INET
 options        GATEWAY
+options        PFIL_HOOKS      # pfil(9) packet filter hooks
+options        IPFILTER_LOG    # ipmon(8) log support
+options        IPFILTER_LOOKUP # ippool(8) support
+options        IPFILTER_COMPAT # Compat for IP-Filter
+#options       IPFILTER_DEFAULT_BLOCK  # block all packets by default
 options        COMPAT_43
 options        COMPAT_12
 options        COMPAT_13
diff -r 693b10ee22c5 -r da459b97d178 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sat May 08 20:41:24 2010 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sat May 08 22:16:25 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.277 2010/04/16 13:48:28 pooka Exp $
+# $NetBSD: GENERIC,v 1.278 2010/05/08 22:16:25 mrg Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.277 $"
+#ident                 "GENERIC-$Revision: 1.278 $"
 
 maxusers       64              # estimated number of users
 
@@ -186,6 +186,7 @@
 options        PFIL_HOOKS      # pfil(9) packet filter hooks
 options        IPFILTER_LOG    # ipmon(8) log support
 options        IPFILTER_LOOKUP # ippool(8) support
+options        IPFILTER_COMPAT # Compat for IP-Filter
 #options       IPFILTER_DEFAULT_BLOCK  # block all packets by default
 #options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
 
diff -r 693b10ee22c5 -r da459b97d178 sys/arch/amd64/conf/XEN3_DOMU
--- a/sys/arch/amd64/conf/XEN3_DOMU     Sat May 08 20:41:24 2010 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOMU     Sat May 08 22:16:25 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.22 2010/04/16 13:48:28 pooka Exp $
+# $NetBSD: XEN3_DOMU,v 1.23 2010/05/08 22:16:25 mrg Exp $
 
 include        "arch/amd64/conf/std.xen"
 
@@ -119,6 +119,7 @@
 options        PFIL_HOOKS      # pfil(9) packet filter hooks
 options        IPFILTER_LOG    # ipmon(8) log support
 options        IPFILTER_LOOKUP # ippool(8) support
+options        IPFILTER_COMPAT # Compat for IP-Filter
 #options       IPFILTER_DEFAULT_BLOCK  # block all packets by default
 #options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
 
diff -r 693b10ee22c5 -r da459b97d178 sys/arch/amiga/conf/GENERIC.in
--- a/sys/arch/amiga/conf/GENERIC.in    Sat May 08 20:41:24 2010 +0000
+++ b/sys/arch/amiga/conf/GENERIC.in    Sat May 08 22:16:25 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.75 2010/04/29 22:40:49 chs Exp $
+# $NetBSD: GENERIC.in,v 1.76 2010/05/08 22:16:25 mrg Exp $
 #
 # GENERIC machine description file
 #
@@ -56,7 +56,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.75 $"
+#ident                 "GENERIC-$Revision: 1.76 $"
 
 m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
 makeoptions    COPTS="-Os"
@@ -120,6 +120,7 @@
 options        PFIL_HOOKS      # pfil(9) packet filter hooks
 options        IPFILTER_LOG    # ipmon(8) log support
 options        IPFILTER_LOOKUP # ippool(8) support
+options        IPFILTER_COMPAT # Compat for IP-Filter
 #options       IPFILTER_DEFAULT_BLOCK  # block all packets by default
 
 #options       ALTQ            # Manipulate network interfaces' output queues
diff -r 693b10ee22c5 -r da459b97d178 sys/arch/amigappc/conf/GENERIC
--- a/sys/arch/amigappc/conf/GENERIC    Sat May 08 20:41:24 2010 +0000
+++ b/sys/arch/amigappc/conf/GENERIC    Sat May 08 22:16:25 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.4 2010/04/16 13:48:29 pooka Exp $
+# $NetBSD: GENERIC,v 1.5 2010/05/08 22:16:25 mrg Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident          "GENERIC-$Revision: 1.4 $"
+#ident          "GENERIC-$Revision: 1.5 $"
 
 maxusers       8
 
@@ -152,6 +152,7 @@
 options        PFIL_HOOKS      # pfil(9) packet filter hooks
 options        IPFILTER_LOG    # ipmon(8) log support
 options        IPFILTER_LOOKUP # ippool(8) support
+options        IPFILTER_COMPAT # Compat for IP-Filter
 #options       IPFILTER_DEFAULT_BLOCK  # block all packets by default
 #options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
 
diff -r 693b10ee22c5 -r da459b97d178 sys/arch/arc/conf/ARCTIC
--- a/sys/arch/arc/conf/ARCTIC  Sat May 08 20:41:24 2010 +0000
+++ b/sys/arch/arc/conf/ARCTIC  Sat May 08 22:16:25 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: ARCTIC,v 1.53 2010/04/16 13:48:29 pooka Exp $
+#      $NetBSD: ARCTIC,v 1.54 2010/05/08 22:16:26 mrg Exp $
 #      $OpenBSD: ARCTIC,v 1.12 1999/08/29 12:14:03 niklas Exp $
 #
 #      configuration file for DeskStation
@@ -110,6 +110,8 @@
 options        PFIL_HOOKS      # pfil(9) packet filter hooks
 options        IPFILTER_LOG    # ipmon(8) log support
 options        IPFILTER_LOOKUP # ippool(8) support
+options        IPFILTER_COMPAT # Compat for IP-Filter
+#options       IPFILTER_DEFAULT_BLOCK  # block all packets by default
 #options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
 
 # These options enable verbose messages for several subsystems.
diff -r 693b10ee22c5 -r da459b97d178 sys/arch/arc/conf/GENERIC
--- a/sys/arch/arc/conf/GENERIC Sat May 08 20:41:24 2010 +0000
+++ b/sys/arch/arc/conf/GENERIC Sat May 08 22:16:25 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.163 2010/04/16 13:48:29 pooka Exp $
+# $NetBSD: GENERIC,v 1.164 2010/05/08 22:16:26 mrg Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.163 $"
+#ident         "GENERIC-$Revision: 1.164 $"
 
 maxusers       32              # estimated number of users
 
@@ -147,6 +147,7 @@
 options        PFIL_HOOKS      # pfil(9) packet filter hooks
 options        IPFILTER_LOG    # ipmon(8) log support
 options        IPFILTER_LOOKUP # ippool(8) support
+options        IPFILTER_COMPAT # Compat for IP-Filter
 #options       IPFILTER_DEFAULT_BLOCK  # block all packets by default
 #options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
 
diff -r 693b10ee22c5 -r da459b97d178 sys/arch/arc/conf/MIMORI
--- a/sys/arch/arc/conf/MIMORI  Sat May 08 20:41:24 2010 +0000
+++ b/sys/arch/arc/conf/MIMORI  Sat May 08 22:16:25 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: MIMORI,v 1.54 2010/04/16 13:48:29 pooka Exp $
+#      $NetBSD: MIMORI,v 1.55 2010/05/08 22:16:26 mrg Exp $
 #      NetBSD: GENERIC,v 1.31 2000/06/09 05:33:02 soda Exp
 #
 #      MIMORI -- My NEC RISCstation 2250 (ur)
@@ -105,6 +105,8 @@
 options        PFIL_HOOKS      # pfil(9) packet filter hooks
 options        IPFILTER_LOG    # ipmon(8) log support
 options        IPFILTER_LOOKUP # ippool(8) support
+options        IPFILTER_COMPAT # Compat for IP-Filter
+#options       IPFILTER_DEFAULT_BLOCK  # block all packets by default
 #options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
 
 # These options enable verbose messages for several subsystems.
diff -r 693b10ee22c5 -r da459b97d178 sys/arch/arc/conf/PICA
--- a/sys/arch/arc/conf/PICA    Sat May 08 20:41:24 2010 +0000
+++ b/sys/arch/arc/conf/PICA    Sat May 08 22:16:25 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: PICA,v 1.66 2010/04/16 13:48:29 pooka Exp $
+#      $NetBSD: PICA,v 1.67 2010/05/08 22:16:26 mrg Exp $
 #
 #      configuration file for ACER PICA system
 #
@@ -104,6 +104,8 @@
 options        PFIL_HOOKS      # pfil(9) packet filter hooks
 options        IPFILTER_LOG    # ipmon(8) log support
 options        IPFILTER_LOOKUP # ippool(8) support
+options        IPFILTER_COMPAT # Compat for IP-Filter
+#options       IPFILTER_DEFAULT_BLOCK  # block all packets by default
 #options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
 
 # These options enable verbose messages for several subsystems.
diff -r 693b10ee22c5 -r da459b97d178 sys/arch/atari/conf/GENERIC.in
--- a/sys/arch/atari/conf/GENERIC.in    Sat May 08 20:41:24 2010 +0000
+++ b/sys/arch/atari/conf/GENERIC.in    Sat May 08 22:16:25 2010 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: GENERIC.in,v 1.89 2010/05/08 20:39:55 tsutsui Exp $
+#      $NetBSD: GENERIC.in,v 1.90 2010/05/08 22:16:26 mrg Exp $
 #
 # Generic atari
 #
@@ -89,6 +89,7 @@
 options        PFIL_HOOKS      # pfil(9) packet filter hooks
 options        IPFILTER_LOG    # ipmon(8) log support
 options        IPFILTER_LOOKUP # ippool(8) support
+options        IPFILTER_COMPAT # Compat for IP-Filter
 #options       IPFILTER_DEFAULT_BLOCK  # block packages by default
 
 #options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
diff -r 693b10ee22c5 -r da459b97d178 sys/arch/bebox/conf/GENERIC
--- a/sys/arch/bebox/conf/GENERIC       Sat May 08 20:41:24 2010 +0000
+++ b/sys/arch/bebox/conf/GENERIC       Sat May 08 22:16:25 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.118 2010/04/29 22:40:50 chs Exp $
+# $NetBSD: GENERIC,v 1.119 2010/05/08 22:16:26 mrg Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.118 $"
+#ident                 "GENERIC-$Revision: 1.119 $"
 
 maxusers       32
 
@@ -129,6 +129,7 @@
 #options       PFIL_HOOKS      # pfil(9) packet filter hooks
 #options       IPFILTER_LOG    # ipmon(8) log support
 #options       IPFILTER_LOOKUP # ippool(8) support
+options        IPFILTER_COMPAT # Compat for IP-Filter
 #options       IPFILTER_DEFAULT_BLOCK  # block all packets by default
 #options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
 
diff -r 693b10ee22c5 -r da459b97d178 sys/arch/cats/conf/GENERIC
--- a/sys/arch/cats/conf/GENERIC        Sat May 08 20:41:24 2010 +0000
+++ b/sys/arch/cats/conf/GENERIC        Sat May 08 22:16:25 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.131 2010/04/29 22:40:50 chs Exp $
+# $NetBSD: GENERIC,v 1.132 2010/05/08 22:16:26 mrg Exp $
 #
 # GENERIC machine description file
 # 
@@ -103,6 +103,7 @@
 options        PPP_FILTER      # Active filter support for PPP (requires bpf)
 options        IPFILTER_LOG    # ipmon(8) log support
 options        IPFILTER_LOOKUP # ippool(8) support
+options        IPFILTER_COMPAT # Compat for IP-Filter
 #options       IPFILTER_DEFAULT_BLOCK  # block all packets by default
 #options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
 
diff -r 693b10ee22c5 -r da459b97d178 sys/arch/cobalt/conf/GENERIC
--- a/sys/arch/cobalt/conf/GENERIC      Sat May 08 20:41:24 2010 +0000
+++ b/sys/arch/cobalt/conf/GENERIC      Sat May 08 22:16:25 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.125 2010/04/29 22:40:50 chs Exp $
+# $NetBSD: GENERIC,v 1.126 2010/05/08 22:16:26 mrg Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.125 $"
+#ident                 "GENERIC-$Revision: 1.126 $"
 
 maxusers       32



Home | Main Index | Thread Index | Old Index