Update xenkernel415 and xentools415 to 4.15.1.

32bits PV guests are now unsupported security-wise, and upstream disables
them by default. This packages keep the support enabled for transition, but
this will change for the next quarter branch. It is recommended to switch to
pvh+pvshim for PV guests (or pvh if you run netbsd-current).
Other changes are bugfixes, including fixes for XSA up to XSA-384

7 files changed, 38 insertions, 18 deletions

diff --git a/sysutils/xenkernel415/MESSAGE b/sysutils/xenkernel415/MESSAGE
index c9c9a8afd71..e86c8c1a4f0 100644
--- a/sysutils/xenkernel415/MESSAGE
+++ b/sysutils/xenkernel415/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2021/04/18 12:31:26 bouyer Exp $
+$NetBSD: MESSAGE,v 1.2 2021/09/21 12:23:49 bouyer Exp $
 
 The Xen hypervisor is installed under the following locations:
 	${XENKERNELDIR}/xen.gz		(standard hypervisor)
@@ -8,4 +8,9 @@ The Xen hypervisor is installed under the following locations:
 Note that unlike upstream Xen, pv-linear-pt defaults to true.
 You can disable it using pv-linear-pt=false on the Xen command line,
 but then you can't boot NetBSD in PV mode.
+
+Unlike upstream Xen, 32bits PV guests support is eanbled by default, but
+this is not security-supported any more, and will be disabled in the
+next pkgsrc release. Switch to pvshim (for netbsd-9 or older) or pvh
+(for netbsd-current).
 ===========================================================================
diff --git a/sysutils/xenkernel415/Makefile b/sysutils/xenkernel415/Makefile
index 86947a8f389..f2b9db970ca 100644
--- a/sysutils/xenkernel415/Makefile
+++ b/sysutils/xenkernel415/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2021/08/12 07:36:39 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2021/09/21 12:23:49 bouyer Exp $
 
-VERSION=	4.15.0
+VERSION=	4.15.1
 DISTNAME=	xen-${VERSION}
 PKGNAME=	xenkernel415-${VERSION}
 CATEGORIES=	sysutils
diff --git a/sysutils/xenkernel415/distinfo b/sysutils/xenkernel415/distinfo
index 5422f41ae32..e9d1bc105b0 100644
--- a/sysutils/xenkernel415/distinfo
+++ b/sysutils/xenkernel415/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.1 2021/04/18 12:31:26 bouyer Exp $
+$NetBSD: distinfo,v 1.2 2021/09/21 12:23:49 bouyer Exp $
 
-SHA1 (xen415/xen-4.15.0.tar.gz) = 4ea99cf3063db822dfbaf971bf8e9d50828d485a
-RMD160 (xen415/xen-4.15.0.tar.gz) = e314791e29244da385e482166776641929babad3
-SHA512 (xen415/xen-4.15.0.tar.gz) = 93683b8a97387ca5f003c635a11d163e61c87dbdc9a03081f9155fe87b49f1dfa74ce243fcd5e04dc009353a36e2375b786f1ebde828b5951a094cd64197b4c7
-Size (xen415/xen-4.15.0.tar.gz) = 40785399 bytes
+SHA1 (xen415/xen-4.15.1.tar.gz) = 6e62a727557a1dc99dab868b22c28bed640c0e15
+RMD160 (xen415/xen-4.15.1.tar.gz) = ca7cdb17346cf95f29741bb271a107cfc2c7441d
+SHA512 (xen415/xen-4.15.1.tar.gz) = 8d3cbdf708f46477e32ee7cbd16a490c82efa855cecd84ee712b8680df4d69c987ba9ab00ff3851f627b98a8ebbc5dab71f92f142ed958ee2bc538bc792cd4b9
+Size (xen415/xen-4.15.1.tar.gz) = 40800852 bytes
 SHA1 (patch-Config.mk) = 9372a09efd05c9fbdbc06f8121e411fcb7c7ba65
 SHA1 (patch-xen_Makefile) = 465388d80de414ca3bb84faefa0f52d817e423a6
 SHA1 (patch-xen_Rules.mk) = c743dc63f51fc280d529a7d9e08650292c171dac
+SHA1 (patch-xen_arch_x86_Kconfig) = df14bfa09b9a0008ca59d53c938d43a644822dd9
 SHA1 (patch-xen_arch_x86_Rules.mk) = 54392a7d719a21bc625a96b673056f88b96df97d
 SHA1 (patch-xen_arch_x86_boot_build32.mk) = b82c20de9b86ddaa9d05bbc1ff28f970eb78473c
 SHA1 (patch-xen_arch_x86_extable.c) = e439e6f3fe704d9b2894fc6b9e8f23f321a00f05
diff --git a/sysutils/xenkernel415/patches/patch-xen_arch_x86_Kconfig b/sysutils/xenkernel415/patches/patch-xen_arch_x86_Kconfig
new file mode 100644
index 00000000000..caf03556871
--- /dev/null
+++ b/sysutils/xenkernel415/patches/patch-xen_arch_x86_Kconfig
@@ -0,0 +1,15 @@
+$NetBSD: patch-xen_arch_x86_Kconfig,v 1.1 2021/09/21 12:23:49 bouyer Exp $
+Restore 32bits PV guests support by default, for backward compatibility.
+This will be restricted to PV_SHIM for the next stable pkgsrc branch
+
+--- xen/arch/x86/Kconfig.orig	2021-09-21 13:25:36.605335522 +0200
++++ xen/arch/x86/Kconfig	2021-09-21 13:25:45.125518654 +0200
+@@ -56,7 +56,7 @@
+ config PV32
+ 	bool "Support for 32bit PV guests"
+ 	depends on PV
+-	default PV_SHIM
++	default y
+ 	---help---
+ 	  The 32bit PV ABI uses Ring1, an area of the x86 architecture which
+ 	  was deprecated and mostly removed in the AMD64 spec.  As a result,
diff --git a/sysutils/xentools415/Makefile b/sysutils/xentools415/Makefile
index 7b83ee8ca3e..82713b85f18 100644
--- a/sysutils/xentools415/Makefile
+++ b/sysutils/xentools415/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2021/05/24 19:54:21 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2021/09/21 12:23:49 bouyer Exp $
 #
-VERSION=	4.15.0
+VERSION=	4.15.1
 
 DIST_SUBDIR=		xen415
 DISTNAME=		xen-${VERSION}
 PKGNAME=		xentools415-${VERSION}
-PKGREVISION=		2
 CATEGORIES=		sysutils
 MASTER_SITES=		https://downloads.xenproject.org/release/xen/${VERSION}/
 
diff --git a/sysutils/xentools415/PLIST b/sysutils/xentools415/PLIST
index 3aef19a8bb4..48aed82dc91 100644
--- a/sysutils/xentools415/PLIST
+++ b/sysutils/xentools415/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/04/18 12:31:26 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/09/21 12:23:49 bouyer Exp $
 ${PYSITELIB}/grub/ExtLinuxConf.py
 ${PYSITELIB}/grub/ExtLinuxConf.pyc
 ${PYSITELIB}/grub/GrubConf.py
@@ -167,7 +167,7 @@ lib/debug${LOCALBASE}/libexec/xen/boot/xen-shim-syms
 lib/libxencall.a
 lib/libxencall.so
 lib/libxencall.so.1
-lib/libxencall.so.1.2
+lib/libxencall.so.1.3
 lib/libxenctrl.a
 lib/libxenctrl.so
 lib/libxenctrl.so.4.15
diff --git a/sysutils/xentools415/distinfo b/sysutils/xentools415/distinfo
index 2cc0dab0b80..24b44975e0c 100644
--- a/sysutils/xentools415/distinfo
+++ b/sysutils/xentools415/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2021/04/18 19:42:19 bouyer Exp $
+$NetBSD: distinfo,v 1.3 2021/09/21 12:23:49 bouyer Exp $
 
 SHA1 (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 062f21086b853150eddb8cbae31f3f65b9df5520
 RMD160 (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = accba07024249a41f62731e4ff9f0dd9b45a7345
@@ -8,10 +8,10 @@ SHA1 (xen415/seabios-1.14.0.tar.gz) = 254e4de7194932fc55afea9237cfa7822895bfb6
 RMD160 (xen415/seabios-1.14.0.tar.gz) = deb7b18529820fa03fb892c0d338a5293a17e32b
 SHA512 (xen415/seabios-1.14.0.tar.gz) = f282175484c99488f4349ff4d3af9a74d96df3e8dcbe679fcea5b8b559f95f600756939d99d6e61dabace206d3d9ccefdc8fa2bc7709d34d6a0dc085d6c79238
 Size (xen415/seabios-1.14.0.tar.gz) = 628981 bytes
-SHA1 (xen415/xen-4.15.0.tar.gz) = 4ea99cf3063db822dfbaf971bf8e9d50828d485a
-RMD160 (xen415/xen-4.15.0.tar.gz) = e314791e29244da385e482166776641929babad3
-SHA512 (xen415/xen-4.15.0.tar.gz) = 93683b8a97387ca5f003c635a11d163e61c87dbdc9a03081f9155fe87b49f1dfa74ce243fcd5e04dc009353a36e2375b786f1ebde828b5951a094cd64197b4c7
-Size (xen415/xen-4.15.0.tar.gz) = 40785399 bytes
+SHA1 (xen415/xen-4.15.1.tar.gz) = 6e62a727557a1dc99dab868b22c28bed640c0e15
+RMD160 (xen415/xen-4.15.1.tar.gz) = ca7cdb17346cf95f29741bb271a107cfc2c7441d
+SHA512 (xen415/xen-4.15.1.tar.gz) = 8d3cbdf708f46477e32ee7cbd16a490c82efa855cecd84ee712b8680df4d69c987ba9ab00ff3851f627b98a8ebbc5dab71f92f142ed958ee2bc538bc792cd4b9
+Size (xen415/xen-4.15.1.tar.gz) = 40800852 bytes
 SHA1 (patch-.._seabios-rel-1.14.0_src_string.c) = 87e2e28fe47c196e74fea073c7e7f7d03990fbe3
 SHA1 (patch-Config.mk) = d108a1743b5b5313d3ea957b02a005b49f5b3bf6
 SHA1 (patch-Makefile) = 6c580cbea532d08a38cf5e54228bd0210a98da21