CVS commit: pkgsrc/sysutils

["Manuel Bouyer" <bouyer%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Wed Aug 26 11:00:31 UTC 2026

Modified Files:
        pkgsrc/sysutils/xenkernel418: DESCR MESSAGE Makefile distinfo
        pkgsrc/sysutils/xentools418: Makefile distinfo version.mk

Log Message:
update xenkernel418 and xentools418 to 20260825 (bringing in Xen 4.18.6).
pkgsrc CHANGES:
- set SHADOW_PAGING to yes because NetBSD PV guests relies on it (at last
  on my hardware).  Note that this is not security-supported upstream.
- update xenkernel418 DESCR and MESSAGE to reflect current state.

upstream CHANGES: fix XSA-497, XSA-499, XSA-500, XSA-501, XSA-502, XSA-503,
  XSA-504, XSA-505, XSA-506, XSA-507, XSA-508

Note that as SHADOW_PAGING is enabled, XSA-495 is not fixed.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/xenkernel418/DESCR \
    pkgsrc/sysutils/xenkernel418/MESSAGE
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/xenkernel418/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/xenkernel418/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/xentools418/Makefile \
    pkgsrc/sysutils/xentools418/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/xentools418/version.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/xenkernel418/DESCR
diff -u pkgsrc/sysutils/xenkernel418/DESCR:1.1 pkgsrc/sysutils/xenkernel418/DESCR:1.2
--- pkgsrc/sysutils/xenkernel418/DESCR:1.1      Tue Nov 21 11:38:26 2023
+++ pkgsrc/sysutils/xenkernel418/DESCR  Wed Aug 26 11:00:30 2026
@@ -11,4 +11,14 @@ domains and provide virtual devices (dis
 domains.
 
 This package contains the 4.18 Xen kernel itself.  PCI passthrough is
-not supported.  PAE is mandatory; on i386 one must use XEN3PAE_DOM[0U].
+not supported.  PAE is mandatory; on i386 one must use XEN3PAE_DOMU.
+
+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.
+
+32bits PV guests are not officially supported any more.
+Switch to pvshim (for netbsd-9 or older) or pvh (for netbsd-10 or newer).
+
+Unline upstream, SHADOW_PAGING is enabled by default as NetBSD PV guests
+relies on it. Note that this is not security-supported upstream any more.
Index: pkgsrc/sysutils/xenkernel418/MESSAGE
diff -u pkgsrc/sysutils/xenkernel418/MESSAGE:1.1 pkgsrc/sysutils/xenkernel418/MESSAGE:1.2
--- pkgsrc/sysutils/xenkernel418/MESSAGE:1.1    Tue Nov 21 11:38:26 2023
+++ pkgsrc/sysutils/xenkernel418/MESSAGE        Wed Aug 26 11:00:30 2026
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2023/11/21 11:38:26 bouyer Exp $
+$NetBSD: MESSAGE,v 1.2 2026/08/26 11:00:30 bouyer Exp $
 
 The Xen hypervisor is installed under the following locations:
        ${XENKERNELDIR}/xen.gz          (standard hypervisor)
@@ -11,4 +11,7 @@ but then you can't boot NetBSD in PV mod
 
 32bits PV guests are not officially supported any more.
 Switch to pvshim (for netbsd-9 or older) or pvh (for netbsd-10 or newer).
+
+Unline upstream, SHADOW_PAGING is enabled by default as NetBSD PV guests
+relies on it. Note that this is not security-supported upstream any more.
 ===========================================================================

Index: pkgsrc/sysutils/xenkernel418/Makefile
diff -u pkgsrc/sysutils/xenkernel418/Makefile:1.7 pkgsrc/sysutils/xenkernel418/Makefile:1.8
--- pkgsrc/sysutils/xenkernel418/Makefile:1.7   Tue Mar 17 20:43:01 2026
+++ pkgsrc/sysutils/xenkernel418/Makefile       Wed Aug 26 11:00:30 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2026/03/17 20:43:01 bouyer Exp $
+# $NetBSD: Makefile,v 1.8 2026/08/26 11:00:30 bouyer Exp $
 # VERSION is set in version.mk as it is shared with other packages
 
 #PKGREVISION=        1
@@ -54,6 +54,8 @@ EXTRA_CFLAGS+=         -falign-functions=16
 MAKE_ENV+=     EXTRA_CFLAGS=${EXTRA_CFLAGS:Q}
 
 do-build:
+       cd ${WRKSRC} && ${BUILD_MAKE_CMD} -C xen defconfig
+       echo "CONFIG_SHADOW_PAGING=y" >> ${WRKSRC}/xen/.config
        cd ${WRKSRC} && ${BUILD_MAKE_CMD} build-xen
        ${CP} ${WRKSRC}/xen/xen.gz ${WRKDIR}/xen.gz
        cd ${WRKSRC} && ${MAKE_PROGRAM} clean

Index: pkgsrc/sysutils/xenkernel418/distinfo
diff -u pkgsrc/sysutils/xenkernel418/distinfo:1.12 pkgsrc/sysutils/xenkernel418/distinfo:1.13
--- pkgsrc/sysutils/xenkernel418/distinfo:1.12  Wed Jun 10 18:09:55 2026
+++ pkgsrc/sysutils/xenkernel418/distinfo       Wed Aug 26 11:00:30 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2026/06/10 18:09:55 bouyer Exp $
+$NetBSD: distinfo,v 1.13 2026/08/26 11:00:30 bouyer Exp $
 
-BLAKE2s (xen418/xen-f8cc168c4cdfe73da4e7bcb4b575ffc376523bcc.tar.gz) = e619bc048fbb75fdac054480470df90eb485ae782f2f9399a3974178a7615012
-SHA512 (xen418/xen-f8cc168c4cdfe73da4e7bcb4b575ffc376523bcc.tar.gz) = 7b2ed9e468da9e59c21bb1b68796338fa3e4ec4650f87c513399719c52dd788eb699d5cded1426548df18a7318128af507a80c9c663e4ecaae80a72ca2d42ba0
-Size (xen418/xen-f8cc168c4cdfe73da4e7bcb4b575ffc376523bcc.tar.gz) = 6868523 bytes
+BLAKE2s (xen418/xen-c9355898f3b8e10ca49e87d50e335d682827c33b.tar.gz) = 701432c36547714a342a9af42f58c0c3f868b574d91eaff816e241bfedf0b087
+SHA512 (xen418/xen-c9355898f3b8e10ca49e87d50e335d682827c33b.tar.gz) = 39d6e853860b08946c3ace175bfe4893dd60c80ada2f008cd19d8324d7f11823e712448824e03e4e052e25b8d6fbc613413a55f81ae477d00ada538c1174cea0
+Size (xen418/xen-c9355898f3b8e10ca49e87d50e335d682827c33b.tar.gz) = 6870031 bytes
 SHA1 (patch-Config.mk) = 9372a09efd05c9fbdbc06f8121e411fcb7c7ba65
 SHA1 (patch-xen_Makefile) = 0c400e8054e907ce44faf2be955e0c2d63b768ed
 SHA1 (patch-xen_arch_x86_Makefile) = f05a5879518005417a9cdb69488d136f207a7ab1

Index: pkgsrc/sysutils/xentools418/Makefile
diff -u pkgsrc/sysutils/xentools418/Makefile:1.12 pkgsrc/sysutils/xentools418/Makefile:1.13
--- pkgsrc/sysutils/xentools418/Makefile:1.12   Tue Jun 23 09:52:56 2026
+++ pkgsrc/sysutils/xentools418/Makefile        Wed Aug 26 11:00:31 2026
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2026/06/23 09:52:56 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2026/08/26 11:00:31 bouyer Exp $
 #
 # VERSION is set in version.mk as it is shared with other packages
 #PKGREVISION=        1
-PKGREVISION=        1
 .include        "version.mk"
 PKGNAME=               xentools418-${VERSION:S/-//g}
 
Index: pkgsrc/sysutils/xentools418/distinfo
diff -u pkgsrc/sysutils/xentools418/distinfo:1.12 pkgsrc/sysutils/xentools418/distinfo:1.13
--- pkgsrc/sysutils/xentools418/distinfo:1.12   Wed Jun 10 18:09:55 2026
+++ pkgsrc/sysutils/xentools418/distinfo        Wed Aug 26 11:00:31 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2026/06/10 18:09:55 bouyer Exp $
+$NetBSD: distinfo,v 1.13 2026/08/26 11:00:31 bouyer Exp $
 
 BLAKE2s (xen418/ipxe-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz) = 82256e7e5d45980590a6493e17a4e133ff63fa28f00aff1963db96371e702448
 SHA512 (xen418/ipxe-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz) = e1c11e37f53aab0cc6a3ceaace0b8417f07009b1f20ff8572320895fef24f1a796ade041094a024eb24c988b9bed404c556a1fdde809bba89fb49f0e0ff45a57
@@ -12,9 +12,9 @@ Size (xen418/qemu-xen-traditional-3d273d
 BLAKE2s (xen418/seabios-1.16.2.tar.gz) = 5c61373b373fe039436fb73e6459ce48c1b18a11cd48df157ebffa3e91001cef
 SHA512 (xen418/seabios-1.16.2.tar.gz) = 4e6ede3cc614617e57f1a288e105e09d84aeaa47e53b03a20ba75124a4fac18f68ba0665c5661f7bfb75b57623866e2d0faf6da8270890b4da2cf7e0e8d1f534
 Size (xen418/seabios-1.16.2.tar.gz) = 635922 bytes
-BLAKE2s (xen418/xen-f8cc168c4cdfe73da4e7bcb4b575ffc376523bcc.tar.gz) = e619bc048fbb75fdac054480470df90eb485ae782f2f9399a3974178a7615012
-SHA512 (xen418/xen-f8cc168c4cdfe73da4e7bcb4b575ffc376523bcc.tar.gz) = 7b2ed9e468da9e59c21bb1b68796338fa3e4ec4650f87c513399719c52dd788eb699d5cded1426548df18a7318128af507a80c9c663e4ecaae80a72ca2d42ba0
-Size (xen418/xen-f8cc168c4cdfe73da4e7bcb4b575ffc376523bcc.tar.gz) = 6868523 bytes
+BLAKE2s (xen418/xen-c9355898f3b8e10ca49e87d50e335d682827c33b.tar.gz) = 701432c36547714a342a9af42f58c0c3f868b574d91eaff816e241bfedf0b087
+SHA512 (xen418/xen-c9355898f3b8e10ca49e87d50e335d682827c33b.tar.gz) = 39d6e853860b08946c3ace175bfe4893dd60c80ada2f008cd19d8324d7f11823e712448824e03e4e052e25b8d6fbc613413a55f81ae477d00ada538c1174cea0
+Size (xen418/xen-c9355898f3b8e10ca49e87d50e335d682827c33b.tar.gz) = 6870031 bytes
 SHA1 (patch-.._seabios-rel-1.16.2_src_string.c) = a8861860e63fb38dee3ebca1fce7f470ec7ff000
 SHA1 (patch-Config.mk) = f2c5d83d4738db706e980fbbd0ae889477d87c7d
 SHA1 (patch-configure) = d52bd51ae234ffd0796b0d3c2453e5e5931c9b63

Index: pkgsrc/sysutils/xentools418/version.mk
diff -u pkgsrc/sysutils/xentools418/version.mk:1.9 pkgsrc/sysutils/xentools418/version.mk:1.10
--- pkgsrc/sysutils/xentools418/version.mk:1.9  Wed Jun 10 18:09:55 2026
+++ pkgsrc/sysutils/xentools418/version.mk      Wed Aug 26 11:00:31 2026
@@ -1,10 +1,10 @@
-# $NetBSD: version.mk,v 1.9 2026/06/10 18:09:55 bouyer Exp $
+# $NetBSD: version.mk,v 1.10 2026/08/26 11:00:31 bouyer Exp $
 #
 # Version number is used by xenkernel418, xentools418 
 
-VERSION=               20260610
-XEN_COMMIT=            f8cc168c4cdfe73da4e7bcb4b575ffc376523bcc
-XEN_SHORTCOMMIT=       f8cc168
+VERSION=               20260825
+XEN_COMMIT=            c9355898f3b8e10ca49e87d50e335d682827c33b
+XEN_SHORTCOMMIT=       c935589
 
 DIST_SUBDIR=           xen418
 DISTNAME=              xen-${XEN_COMMIT}