[src/netbsd-7]: src/sys/arch Pull up following revision(s) (requested by bouy...

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

details:   https://anonhg.NetBSD.org/src/rev/01893a5c243a
branches:  netbsd-7
changeset: 799494:01893a5c243a
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Jul 22 16:53:34 2015 +0000

description:
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

diffstat:

 sys/arch/amd64/conf/XEN3_DOM0 |  4 ++--
 sys/arch/amd64/conf/XEN3_DOMU |  4 ++--
 sys/arch/i386/conf/XEN3_DOM0  |  4 ++--
 sys/arch/i386/conf/XEN3_DOMU  |  4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r b3219be92210 -r 01893a5c243a sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Wed Jul 22 16:51:59 2015 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Wed Jul 22 16:53:34 2015 +0000
@@ -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       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
diff -r b3219be92210 -r 01893a5c243a sys/arch/amd64/conf/XEN3_DOMU
--- a/sys/arch/amd64/conf/XEN3_DOMU     Wed Jul 22 16:51:59 2015 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOMU     Wed Jul 22 16:53:34 2015 +0000
@@ -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       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
diff -r b3219be92210 -r 01893a5c243a sys/arch/i386/conf/XEN3_DOM0
--- a/sys/arch/i386/conf/XEN3_DOM0      Wed Jul 22 16:51:59 2015 +0000
+++ b/sys/arch/i386/conf/XEN3_DOM0      Wed Jul 22 16:53:34 2015 +0000
@@ -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       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
diff -r b3219be92210 -r 01893a5c243a sys/arch/i386/conf/XEN3_DOMU
--- a/sys/arch/i386/conf/XEN3_DOMU      Wed Jul 22 16:51:59 2015 +0000
+++ b/sys/arch/i386/conf/XEN3_DOMU      Wed Jul 22 16:53:34 2015 +0000
@@ -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       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