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

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

details:   https://anonhg.NetBSD.org/src/rev/49ef91b5ed7d
branches:  netbsd-3
changeset: 576674:49ef91b5ed7d
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Jul 18 21:14:02 2005 +0000

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

diffstat:

 sys/arch/atari/conf/GENERIC.in |  3 ++-
 sys/arch/cats/conf/INSTALL     |  3 ++-
 sys/arch/pc532/conf/GENERIC    |  5 +++--
 sys/arch/sparc64/conf/NONPLUS  |  3 ++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diffs (78 lines):

diff -r fac7d21a28f6 -r 49ef91b5ed7d sys/arch/atari/conf/GENERIC.in
--- a/sys/arch/atari/conf/GENERIC.in    Mon Jul 18 21:14:00 2005 +0000
+++ b/sys/arch/atari/conf/GENERIC.in    Mon Jul 18 21:14:02 2005 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: GENERIC.in,v 1.47 2005/02/25 13:46:48 simonb Exp $
+#      $NetBSD: GENERIC.in,v 1.47.2.1 2005/07/18 21:14:02 riz Exp $
 #
 # Generic atari
 #
@@ -56,6 +56,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
 #options       MROUTING        # IP multicast routing
diff -r fac7d21a28f6 -r 49ef91b5ed7d sys/arch/cats/conf/INSTALL
--- a/sys/arch/cats/conf/INSTALL        Mon Jul 18 21:14:00 2005 +0000
+++ b/sys/arch/cats/conf/INSTALL        Mon Jul 18 21:14:02 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL,v 1.46.2.1 2005/06/01 17:19:28 riz Exp $
+#      $NetBSD: INSTALL,v 1.46.2.2 2005/07/18 21:14:02 riz Exp $
 #
 #      CATSINST -- CHALTECH CATS Install kernel
 #
@@ -63,6 +63,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 fac7d21a28f6 -r 49ef91b5ed7d sys/arch/pc532/conf/GENERIC
--- a/sys/arch/pc532/conf/GENERIC       Mon Jul 18 21:14:00 2005 +0000
+++ b/sys/arch/pc532/conf/GENERIC       Mon Jul 18 21:14:02 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.48 2005/02/25 13:46:51 simonb Exp $
+# $NetBSD: GENERIC,v 1.48.2.1 2005/07/18 21:14:02 riz Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.48 $"
+#ident                 "GENERIC-$Revision: 1.48.2.1 $"
 
 maxusers       8                       # estimated number of users
 
@@ -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        PPP_BSDCOMP,PPP_DEFLATE # compression for PPP
 #options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
diff -r fac7d21a28f6 -r 49ef91b5ed7d sys/arch/sparc64/conf/NONPLUS
--- a/sys/arch/sparc64/conf/NONPLUS     Mon Jul 18 21:14:00 2005 +0000
+++ b/sys/arch/sparc64/conf/NONPLUS     Mon Jul 18 21:14:02 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NONPLUS,v 1.48.2.1 2005/06/18 05:59:14 riz Exp $
+#      $NetBSD: NONPLUS,v 1.48.2.2 2005/07/18 21:14:02 riz Exp $
 
 include "arch/sparc64/conf/std.sparc64"
 
@@ -156,6 +156,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       TCP_SIGNATURE   # TCP MD5 Signatures, for BGP routing sessions
 options        GATEWAY         # packet forwarding ("router switch")