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

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

details:   https://anonhg.NetBSD.org/src/rev/10cd1a86a0d6
branches:  netbsd-3
changeset: 576689:10cd1a86a0d6
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Jul 18 21:14:31 2005 +0000

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

diffstat:

 sys/arch/evbppc/conf/EV64260 |  3 ++-
 sys/arch/i386/conf/VIRTUALPC |  5 +++--
 sys/arch/mipsco/conf/RC3230  |  3 ++-
 sys/arch/sun2/conf/RAMDISK   |  3 ++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diffs (78 lines):

diff -r 384d22e24d2e -r 10cd1a86a0d6 sys/arch/evbppc/conf/EV64260
--- a/sys/arch/evbppc/conf/EV64260      Mon Jul 18 21:14:29 2005 +0000
+++ b/sys/arch/evbppc/conf/EV64260      Mon Jul 18 21:14:31 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: EV64260,v 1.21.2.1 2005/06/01 17:19:53 riz Exp $
+#      $NetBSD: EV64260,v 1.21.2.2 2005/07/18 21:14:31 riz Exp $
 #
 #      MVP -- Motorola's Multiprocessing Verification Platform
 #
@@ -111,6 +111,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 384d22e24d2e -r 10cd1a86a0d6 sys/arch/i386/conf/VIRTUALPC
--- a/sys/arch/i386/conf/VIRTUALPC      Mon Jul 18 21:14:29 2005 +0000
+++ b/sys/arch/i386/conf/VIRTUALPC      Mon Jul 18 21:14:31 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: VIRTUALPC,v 1.18.4.1 2005/04/17 11:43:32 tron Exp $
+# $NetBSD: VIRTUALPC,v 1.18.4.2 2005/07/18 21:14:31 riz Exp $
 #
 # VIRTUALPC machine description file --
 #
@@ -11,7 +11,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "VIRTUALPC-$Revision: 1.18.4.1 $"
+#ident                 "VIRTUALPC-$Revision: 1.18.4.2 $"
 
 maxusers       32              # estimated number of users
 
@@ -161,6 +161,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 384d22e24d2e -r 10cd1a86a0d6 sys/arch/mipsco/conf/RC3230
--- a/sys/arch/mipsco/conf/RC3230       Mon Jul 18 21:14:29 2005 +0000
+++ b/sys/arch/mipsco/conf/RC3230       Mon Jul 18 21:14:31 2005 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: RC3230,v 1.22 2005/02/25 13:46:50 simonb Exp $
+#      $NetBSD: RC3230,v 1.22.2.1 2005/07/18 21:14:31 riz Exp $
 #
 include                "arch/mipsco/conf/std.mipsco"
 
@@ -73,6 +73,7 @@
 options        INET6           # Internet protocols
 options        IPSEC           # Internet protocols
 options        IPSEC_ESP       # Internet protocols
+options        IPSEC_NAT_T     # IPsec NAT traversal (NAT-T)
 #options       GATEWAY         # IP packet forwarding
 #options       MROUTING        # packet forwarding of multicast packets
 #options       PIM             # Protocol Independent Multicast
diff -r 384d22e24d2e -r 10cd1a86a0d6 sys/arch/sun2/conf/RAMDISK
--- a/sys/arch/sun2/conf/RAMDISK        Mon Jul 18 21:14:29 2005 +0000
+++ b/sys/arch/sun2/conf/RAMDISK        Mon Jul 18 21:14:31 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: RAMDISK,v 1.22 2005/02/18 21:05:54 dsl Exp $
+# $NetBSD: RAMDISK,v 1.22.4.1 2005/07/18 21:14:31 riz Exp $
 
 # RAMDISK: Root/swap on ramdisk
 # This kernel is used to:
@@ -80,6 +80,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         # IP packet forwarding
 #options       ISO,TPIP        # OSI networking