[src/netbsd-3]: src/sys/arch/acorn32/conf Pull up revision 1.37 (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/79a8e44a2a7e
branches:  netbsd-3
changeset: 576669:79a8e44a2a7e
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Jul 18 21:13:54 2005 +0000

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

diffstat:

 sys/arch/acorn32/conf/NC_WSCONS  |  3 ++-
 sys/arch/acorn32/conf/RPC_WSCONS |  5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r a2d88a2c46c5 -r 79a8e44a2a7e sys/arch/acorn32/conf/NC_WSCONS
--- a/sys/arch/acorn32/conf/NC_WSCONS   Mon Jul 18 21:13:52 2005 +0000
+++ b/sys/arch/acorn32/conf/NC_WSCONS   Mon Jul 18 21:13:54 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NC_WSCONS,v 1.36 2005/01/31 16:54:32 hannken Exp $
+#      $NetBSD: NC_WSCONS,v 1.36.4.1 2005/07/18 21:13:54 riz Exp $
 #
 #      NC - with wscons
 #
@@ -61,6 +61,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        INET            # IP + ICMP + TCP + UDP
 #options       MROUTING        # IP multicast routing
diff -r a2d88a2c46c5 -r 79a8e44a2a7e sys/arch/acorn32/conf/RPC_WSCONS
--- a/sys/arch/acorn32/conf/RPC_WSCONS  Mon Jul 18 21:13:52 2005 +0000
+++ b/sys/arch/acorn32/conf/RPC_WSCONS  Mon Jul 18 21:13:54 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: RPC_WSCONS,v 1.36 2005/02/18 21:05:50 dsl Exp $
+#      $NetBSD: RPC_WSCONS,v 1.36.4.1 2005/07/18 21:13:55 riz Exp $
 #
 #      RPC_WSCONS -- Full RiscPC config with wscons
 #
@@ -22,7 +22,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.36 $"
+#ident         "GENERIC-$Revision: 1.36.4.1 $"
 
 # estimated number of users
 maxusers       32
@@ -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       MROUTING        # IP multicast routing
 #options       PIM             # Protocol Independent Multicast