Module Name: src
Committed By: snj
Date: Wed Jul 22 16:53:34 UTC 2015
Modified Files:
src/sys/arch/amd64/conf [netbsd-7]: XEN3_DOM0 XEN3_DOMU
src/sys/arch/i386/conf [netbsd-7]: XEN3_DOM0 XEN3_DOMU
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #884):
sys/arch/amd64/conf/XEN3_DOM0: revision 1.114
sys/arch/amd64/conf/XEN3_DOMU: revision 1.62
sys/arch/i386/conf/XEN3_DOM0: revision 1.96
sys/arch/i386/conf/XEN3_DOMU: revision 1.68
Uncoment options IPSEC, as requested by Gary Duzan in PR port-amd64/50052
To generate a diff of this commit:
cvs rdiff -u -r1.103.2.3 -r1.103.2.4 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.54.2.3 -r1.54.2.4 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.85.2.4 -r1.85.2.5 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.59.2.4 -r1.59.2.5 src/sys/arch/i386/conf/XEN3_DOMU
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/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.3 src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.4
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.3 Tue Nov 18 19:05:28 2014
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Wed Jul 22 16:53:34 2015
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.103.2.3 2014/11/18 19:05:28 snj Exp $
+# $NetBSD: XEN3_DOM0,v 1.103.2.4 2015/07/22 16:53:34 snj Exp $
include "arch/amd64/conf/std.xen"
@@ -122,7 +122,7 @@ options UFS_EXTATTR # Extended attribut
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
-#options IPSEC # IP security
+options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.54.2.3 src/sys/arch/amd64/conf/XEN3_DOMU:1.54.2.4
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.54.2.3 Tue Nov 18 19:05:28 2014
+++ src/sys/arch/amd64/conf/XEN3_DOMU Wed Jul 22 16:53:34 2015
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.54.2.3 2014/11/18 19:05:28 snj Exp $
+# $NetBSD: XEN3_DOMU,v 1.54.2.4 2015/07/22 16:53:34 snj Exp $
include "arch/amd64/conf/std.xen"
@@ -116,7 +116,7 @@ options UFS_EXTATTR # Extended attribut
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
-#options IPSEC # IP security
+options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.85.2.4 src/sys/arch/i386/conf/XEN3_DOM0:1.85.2.5
--- src/sys/arch/i386/conf/XEN3_DOM0:1.85.2.4 Fri Jun 5 16:52:39 2015
+++ src/sys/arch/i386/conf/XEN3_DOM0 Wed Jul 22 16:53:34 2015
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.85.2.4 2015/06/05 16:52:39 snj Exp $
+# $NetBSD: XEN3_DOM0,v 1.85.2.5 2015/07/22 16:53:34 snj Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -145,7 +145,7 @@ options UFS_EXTATTR # Extended attribut
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
-#options IPSEC # IP security
+options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.59.2.4 src/sys/arch/i386/conf/XEN3_DOMU:1.59.2.5
--- src/sys/arch/i386/conf/XEN3_DOMU:1.59.2.4 Fri Jun 5 16:52:39 2015
+++ src/sys/arch/i386/conf/XEN3_DOMU Wed Jul 22 16:53:34 2015
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.59.2.4 2015/06/05 16:52:39 snj Exp $
+# $NetBSD: XEN3_DOMU,v 1.59.2.5 2015/07/22 16:53:34 snj Exp $
include "arch/xen/conf/std.xen"
@@ -134,7 +134,7 @@ options UFS_EXTATTR # Extended attribut
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
-#options IPSEC # IP security
+options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
