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

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

details:   https://anonhg.NetBSD.org/src/rev/2ee4c87c4e74
branches:  netbsd-3
changeset: 576690:2ee4c87c4e74
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Jul 18 21:14:32 2005 +0000

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

diffstat:

 sys/arch/amd64/conf/INSTALL_ACPI |  5 +++--
 sys/arch/evbarm/conf/SMDK2800    |  3 ++-
 sys/arch/hp300/conf/INSTALL      |  3 ++-
 sys/arch/sun2/conf/FOURMEG       |  5 +++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diffs (86 lines):

diff -r 10cd1a86a0d6 -r 2ee4c87c4e74 sys/arch/amd64/conf/INSTALL_ACPI
--- a/sys/arch/amd64/conf/INSTALL_ACPI  Mon Jul 18 21:14:31 2005 +0000
+++ b/sys/arch/amd64/conf/INSTALL_ACPI  Mon Jul 18 21:14:32 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_ACPI,v 1.18.4.3 2005/05/07 14:25:59 riz Exp $
+# $NetBSD: INSTALL_ACPI,v 1.18.4.4 2005/07/18 21:14:32 riz Exp $
 #
 # GENERIC machine description file
 # 
@@ -20,7 +20,7 @@
 
 include        "arch/amd64/conf/std.amd64"
 
-#ident                 "INSTALL-$Revision: 1.18.4.3 $"
+#ident                 "INSTALL-$Revision: 1.18.4.4 $"
 
 maxusers       32              # estimated number of users
 
@@ -101,6 +101,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 10cd1a86a0d6 -r 2ee4c87c4e74 sys/arch/evbarm/conf/SMDK2800
--- a/sys/arch/evbarm/conf/SMDK2800     Mon Jul 18 21:14:31 2005 +0000
+++ b/sys/arch/evbarm/conf/SMDK2800     Mon Jul 18 21:14:32 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: SMDK2800,v 1.23 2005/02/27 02:18:34 bsh Exp $
+#      $NetBSD: SMDK2800,v 1.23.2.1 2005/07/18 21:14:33 riz Exp $
 #
 #      SMDK2800 -- Samsung's S3C2800 evaluation board.
 #
@@ -65,6 +65,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 10cd1a86a0d6 -r 2ee4c87c4e74 sys/arch/hp300/conf/INSTALL
--- a/sys/arch/hp300/conf/INSTALL       Mon Jul 18 21:14:31 2005 +0000
+++ b/sys/arch/hp300/conf/INSTALL       Mon Jul 18 21:14:32 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.23 2005/02/18 21:05:51 dsl Exp $
+# $NetBSD: INSTALL,v 1.23.4.1 2005/07/18 21:14:33 riz Exp $
 #
 # INSTALL machine description file
 #
@@ -90,6 +90,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 forwarding + larger mb_map
 #options       MROUTING        # Multicast routing
diff -r 10cd1a86a0d6 -r 2ee4c87c4e74 sys/arch/sun2/conf/FOURMEG
--- a/sys/arch/sun2/conf/FOURMEG        Mon Jul 18 21:14:31 2005 +0000
+++ b/sys/arch/sun2/conf/FOURMEG        Mon Jul 18 21:14:32 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: FOURMEG,v 1.23 2005/02/25 13:46:51 simonb Exp $
+# $NetBSD: FOURMEG,v 1.23.2.1 2005/07/18 21:14:33 riz Exp $
 
 # FOURMEG Sun2 (2/120, 2/170, 2/50, ...)
 # Supports root on: ie0, sd*, ...
@@ -7,7 +7,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "FOURMEG-$Revision: 1.23 $"
+#ident                 "FOURMEG-$Revision: 1.23.2.1 $"
 
 # Machines to be supported by this kernel
 #options       FPU_EMULATE
@@ -79,6 +79,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