[src/trunk]: src/sys/arch catch the escapees of the IPSEC_NAT_T purge.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/698d26437459
branches:  trunk
changeset: 787195:698d26437459
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jun 05 23:12:37 2013 +0000

description:
catch the escapees of the IPSEC_NAT_T purge.

diffstat:

 sys/arch/evbarm/conf/OPENBLOCKS_A6 |  3 +--
 sys/arch/evbppc/conf/OPENBLOCKS266 |  5 ++---
 sys/arch/macppc/conf/GENERIC       |  5 ++---
 sys/arch/sun2/conf/DISKLESS        |  5 ++---
 4 files changed, 7 insertions(+), 11 deletions(-)

diffs (95 lines):

diff -r b23c5c11e948 -r 698d26437459 sys/arch/evbarm/conf/OPENBLOCKS_A6
--- a/sys/arch/evbarm/conf/OPENBLOCKS_A6        Wed Jun 05 23:08:09 2013 +0000
+++ b/sys/arch/evbarm/conf/OPENBLOCKS_A6        Wed Jun 05 23:12:37 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: OPENBLOCKS_A6,v 1.13 2013/04/27 22:21:14 christos Exp $
+#      $NetBSD: OPENBLOCKS_A6,v 1.14 2013/06/05 23:12:37 christos Exp $
 #
 #  OPENBLOCKS_A6 -- Plat'Home. OpenBlockS A6 kernel
 #
@@ -74,7 +74,6 @@
 options        INET            # IP + ICMP + TCP + UDP
 options        INET6           # IPv6
 options        IPSEC           # IP security
-options        IPSEC_NAT_T     # IPsec NAT traversal (NAT-T)
 #options       IPSEC_DEBUG     # debug for IP security
 #options       MROUTING        # IP multicast routing
 #options       PIM             # Protocol Independent Multicast
diff -r b23c5c11e948 -r 698d26437459 sys/arch/evbppc/conf/OPENBLOCKS266
--- a/sys/arch/evbppc/conf/OPENBLOCKS266        Wed Jun 05 23:08:09 2013 +0000
+++ b/sys/arch/evbppc/conf/OPENBLOCKS266        Wed Jun 05 23:12:37 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: OPENBLOCKS266,v 1.64 2013/04/27 21:43:24 christos Exp $
+#      $NetBSD: OPENBLOCKS266,v 1.65 2013/06/05 23:12:37 christos Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
@@ -7,7 +7,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "OPENBLOCKS266-$Revision: 1.64 $"
+#ident                 "OPENBLOCKS266-$Revision: 1.65 $"
 
 maxusers       32
 
@@ -116,7 +116,6 @@
 options        INET            # IP + ICMP + TCP + UDP
 options        INET6           # IPv6
 #options       IPSEC           # IP security
-#options       IPSEC_NAT_T     # IPsec NAT traversal (NAT-T)
 #options       IPSEC_DEBUG     # debug for IP security
 #options       MROUTING        # IP multicast routing
 #options       PIM             # Protocol Independent Multicast
diff -r b23c5c11e948 -r 698d26437459 sys/arch/macppc/conf/GENERIC
--- a/sys/arch/macppc/conf/GENERIC      Wed Jun 05 23:08:09 2013 +0000
+++ b/sys/arch/macppc/conf/GENERIC      Wed Jun 05 23:12:37 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.309 2013/04/27 21:43:32 christos Exp $
+# $NetBSD: GENERIC,v 1.310 2013/06/05 23:12:38 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.309 $"
+#ident                 "GENERIC-$Revision: 1.310 $"
 
 maxusers       32
 
@@ -130,7 +130,6 @@
 options        INET            # IP + ICMP + TCP + UDP
 options        INET6           # IPV6
 #options       IPSEC           # IP security
-#options       IPSEC_NAT_T     # IPsec NAT traversal (NAT-T)
 #options       IPSEC_DEBUG     # debug for IP security
 #options       MROUTING        # IP multicast routing
 #options       PIM             # Protocol Independent Multicast
diff -r b23c5c11e948 -r 698d26437459 sys/arch/sun2/conf/DISKLESS
--- a/sys/arch/sun2/conf/DISKLESS       Wed Jun 05 23:08:09 2013 +0000
+++ b/sys/arch/sun2/conf/DISKLESS       Wed Jun 05 23:12:37 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DISKLESS,v 1.49 2013/04/27 21:43:41 christos Exp $
+# $NetBSD: DISKLESS,v 1.50 2013/06/05 23:12:38 christos Exp $
 
 # DISKLESS Sun2 (2/120, 2/170, 2/50, ...)
 # Supports root on: ie0, ec0
@@ -7,7 +7,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "DISKLESS-$Revision: 1.49 $"
+#ident                 "DISKLESS-$Revision: 1.50 $"
 
 makeoptions    COPTS="-Os"     # optimize for size
 
@@ -78,7 +78,6 @@
 options        INET            # IP protocol stack support
 #options       INET6           # IPV6
 #options       IPSEC           # IP security
-#options       IPSEC_NAT_T     # IPsec NAT traversal (NAT-T)
 #options       IPSEC_DEBUG     # debug for IP security
 #options       GATEWAY         # IP packet forwarding
 options        PFIL_HOOKS      # pfil(9) packet filter hooks.