[src/netbsd-3]: src/sys/arch Pull up revision 1.27 (requested by tron in tick...

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

details:   https://anonhg.NetBSD.org/src/rev/6030a4ff96f0
branches:  netbsd-3
changeset: 576694:6030a4ff96f0
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Jul 18 21:14:40 2005 +0000

description:
Pull up revision 1.27 (requested by tron in ticket #566):
Add (commented out) IPSEC_NAT_T option.

diffstat:

 sys/arch/evbarm/conf/ADI_BRH         |  3 ++-
 sys/arch/pmppc/conf/PMPPC            |  3 ++-
 sys/arch/sgimips/conf/GENERIC32_IP3x |  5 +++--
 sys/arch/sparc/conf/KRUPS            |  5 +++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diffs (86 lines):

diff -r 7e70e7e418cc -r 6030a4ff96f0 sys/arch/evbarm/conf/ADI_BRH
--- a/sys/arch/evbarm/conf/ADI_BRH      Mon Jul 18 21:14:39 2005 +0000
+++ b/sys/arch/evbarm/conf/ADI_BRH      Mon Jul 18 21:14:40 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: ADI_BRH,v 1.26 2005/02/25 13:46:49 simonb Exp $
+#      $NetBSD: ADI_BRH,v 1.26.2.1 2005/07/18 21:14:40 riz Exp $
 #
 #      ADI_BRH -- ADI Engineering "Big Red Head" i80200 Evaluation Board
 #
@@ -58,6 +58,7 @@
 options        INET6           # IPV6
 #options       IPSEC           # IP security
 #options       IPSEC_ESP       # IP security (encryption part; define w/ IPSEC)
+#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 7e70e7e418cc -r 6030a4ff96f0 sys/arch/pmppc/conf/PMPPC
--- a/sys/arch/pmppc/conf/PMPPC Mon Jul 18 21:14:39 2005 +0000
+++ b/sys/arch/pmppc/conf/PMPPC Mon Jul 18 21:14:40 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: PMPPC,v 1.25.2.1 2005/04/17 11:44:21 tron Exp $
+#      $NetBSD: PMPPC,v 1.25.2.2 2005/07/18 21:14:40 riz Exp $
 #
 #      PMPPC
 #
@@ -91,6 +91,7 @@
 options        INET6           # IPV6
 options        IPSEC           # IP security
 #options       IPSEC_ESP       # IP security (encryption part; define w/IPSEC)
+#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 7e70e7e418cc -r 6030a4ff96f0 sys/arch/sgimips/conf/GENERIC32_IP3x
--- a/sys/arch/sgimips/conf/GENERIC32_IP3x      Mon Jul 18 21:14:39 2005 +0000
+++ b/sys/arch/sgimips/conf/GENERIC32_IP3x      Mon Jul 18 21:14:40 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC32_IP3x,v 1.23.4.1 2005/04/17 11:43:51 tron Exp $
+#      $NetBSD: GENERIC32_IP3x,v 1.23.4.2 2005/07/18 21:14:40 riz Exp $
 #
 # GENERIC32_IP3x machine description file
 # 
@@ -28,7 +28,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC32_IP3x-$Revision: 1.23.4.1 $"
+#ident         "GENERIC32_IP3x-$Revision: 1.23.4.2 $"
 
 maxusers       32
 
@@ -121,6 +121,7 @@
 options        INET6           # IPV6
 #options       IPSEC           # IP security
 #options       IPSEC_ESP       # IP security (encryption part; define w/IPSEC)
+#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 7e70e7e418cc -r 6030a4ff96f0 sys/arch/sparc/conf/KRUPS
--- a/sys/arch/sparc/conf/KRUPS Mon Jul 18 21:14:39 2005 +0000
+++ b/sys/arch/sparc/conf/KRUPS Mon Jul 18 21:14:40 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.26 2005/02/18 21:05:54 dsl Exp $
+# $NetBSD: KRUPS,v 1.26.4.1 2005/07/18 21:14:40 riz Exp $
 # From: NetBSD: GENERIC,v 1.160 2004/07/10 12:05:35 uwe Exp
 #
 # Krups (JavaStation-NC) machine description file
@@ -8,7 +8,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "KRUPS-$Revision: 1.26 $"
+#ident                 "KRUPS-$Revision: 1.26.4.1 $"
 
 maxusers       32
 
@@ -201,6 +201,7 @@
 options        INET6           # IPV6
 #options       IPSEC           # IP security
 #options       IPSEC_ESP       # IP security (encryption part; define w/IPSEC)
+#options       IPSEC_NAT_T     # IPsec NAT traversal (NAT-T)
 #options       IPSEC_DEBUG     # debug for IP security
 #options       GATEWAY         # packet forwarding ("router switch")
 #options       MROUTING        # packet forwarding of multicast packets