Module Name: src
Committed By: christos
Date: Wed Jun 5 23:12:38 UTC 2013
Modified Files:
src/sys/arch/evbarm/conf: OPENBLOCKS_A6
src/sys/arch/evbppc/conf: OPENBLOCKS266
src/sys/arch/macppc/conf: GENERIC
src/sys/arch/sun2/conf: DISKLESS
Log Message:
catch the escapees of the IPSEC_NAT_T purge.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/OPENBLOCKS_A6
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/evbppc/conf/OPENBLOCKS266
cvs rdiff -u -r1.309 -r1.310 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/sun2/conf/DISKLESS
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/OPENBLOCKS_A6
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.13 src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.14
--- src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.13 Sat Apr 27 18:21:14 2013
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_A6 Wed Jun 5 19:12:37 2013
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS_A6,v 1.13 2013/04/27 22:21:14 christos Exp $
+# $NetBSD: OPENBLOCKS_A6,v 1.14 2013/06/05 23:12:37 christos Exp $
#
# OPENBLOCKS_A6 -- Plat'Home. OpenBlockS A6 kernel
#
@@ -74,7 +74,6 @@ options FFS_NO_SNAPSHOT # No FFS snapsh
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
options IPSEC # IP security
-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
Index: src/sys/arch/evbppc/conf/OPENBLOCKS266
diff -u src/sys/arch/evbppc/conf/OPENBLOCKS266:1.64 src/sys/arch/evbppc/conf/OPENBLOCKS266:1.65
--- src/sys/arch/evbppc/conf/OPENBLOCKS266:1.64 Sat Apr 27 17:43:24 2013
+++ src/sys/arch/evbppc/conf/OPENBLOCKS266 Wed Jun 5 19:12:37 2013
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS266,v 1.64 2013/04/27 21:43:24 christos Exp $
+# $NetBSD: OPENBLOCKS266,v 1.65 2013/06/05 23:12:37 christos Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.obs266"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "OPENBLOCKS266-$Revision: 1.64 $"
+#ident "OPENBLOCKS266-$Revision: 1.65 $"
maxusers 32
@@ -116,7 +116,6 @@ options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
#options IPSEC # IP security
-#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
Index: src/sys/arch/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.309 src/sys/arch/macppc/conf/GENERIC:1.310
--- src/sys/arch/macppc/conf/GENERIC:1.309 Sat Apr 27 17:43:32 2013
+++ src/sys/arch/macppc/conf/GENERIC Wed Jun 5 19:12:38 2013
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.309 2013/04/27 21:43:32 christos Exp $
+# $NetBSD: GENERIC,v 1.310 2013/06/05 23:12:38 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.309 $"
+#ident "GENERIC-$Revision: 1.310 $"
maxusers 32
@@ -130,7 +130,6 @@ options NFS_BOOT_DHCP # Support DHCP NF
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
Index: src/sys/arch/sun2/conf/DISKLESS
diff -u src/sys/arch/sun2/conf/DISKLESS:1.49 src/sys/arch/sun2/conf/DISKLESS:1.50
--- src/sys/arch/sun2/conf/DISKLESS:1.49 Sat Apr 27 17:43:41 2013
+++ src/sys/arch/sun2/conf/DISKLESS Wed Jun 5 19:12:38 2013
@@ -1,4 +1,4 @@
-# $NetBSD: DISKLESS,v 1.49 2013/04/27 21:43:41 christos Exp $
+# $NetBSD: DISKLESS,v 1.50 2013/06/05 23:12:38 christos Exp $
# DISKLESS Sun2 (2/120, 2/170, 2/50, ...)
# Supports root on: ie0, ec0
@@ -7,7 +7,7 @@ include "arch/sun2/conf/std.sun2"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "DISKLESS-$Revision: 1.49 $"
+#ident "DISKLESS-$Revision: 1.50 $"
makeoptions COPTS="-Os" # optimize for size
@@ -78,7 +78,6 @@ file-system PTYFS # /dev/pts/N support
options INET # IP protocol stack support
#options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
options PFIL_HOOKS # pfil(9) packet filter hooks.
