CVS commit: pkgsrc/sysutils

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

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Wed Jun 10 18:07:45 UTC 2026

Modified Files:
        pkgsrc/sysutils/xenkernel420: distinfo
        pkgsrc/sysutils/xenkernel420/patches: patch-xen_arch_x86_Makefile
        pkgsrc/sysutils/xentools420: distinfo version.mk

Log Message:
Update xenkernel420, xentools420 and xenstoretools to 20260610.
Changes since 20260515: bug fixes, including fixes for XSA-491,
XSA-492, XSA-493 and XSA-494


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/xenkernel420/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/xenkernel420/patches/patch-xen_arch_x86_Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/xentools420/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/xentools420/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/xenkernel420/distinfo
diff -u pkgsrc/sysutils/xenkernel420/distinfo:1.5 pkgsrc/sysutils/xenkernel420/distinfo:1.6
--- pkgsrc/sysutils/xenkernel420/distinfo:1.5   Sat May 16 09:38:15 2026
+++ pkgsrc/sysutils/xenkernel420/distinfo       Wed Jun 10 18:07:44 2026
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.5 2026/05/16 09:38:15 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2026/06/10 18:07:44 bouyer Exp $
 
-BLAKE2s (xen420/xen-3ed365e3f9ee281a8b34d65b6f5a4bf04bc871e4.tar.gz) = 298bb51d8381e95dd36e07f9e19197e80f4860991d48bf1986fd21e1085dd6bb
-SHA512 (xen420/xen-3ed365e3f9ee281a8b34d65b6f5a4bf04bc871e4.tar.gz) = 358103be041efa051bf8ef8846a6b58233c9678f91fe091f8c59314f453f418bdc19081bf50b56ee2e82d401738eb4862eb4bc0ee51ea4f6245a6d46b45997d6
-Size (xen420/xen-3ed365e3f9ee281a8b34d65b6f5a4bf04bc871e4.tar.gz) = 7041021 bytes
+BLAKE2s (xen420/xen-0953c1890794c849771b4bd6e061a30a181d5c23.tar.gz) = 20bdbfec75c0afb3a9dff88222d9c2f12450017b5d5f8da218537019f5531536
+SHA512 (xen420/xen-0953c1890794c849771b4bd6e061a30a181d5c23.tar.gz) = 47669d1cfffae8547ee14333ef5d5b001542a611ac6f85b42eb6e1629479239334dc6110e2b70daaf97a0f6347334b5477de55ed30fe566a38ba7d274c0da324
+Size (xen420/xen-0953c1890794c849771b4bd6e061a30a181d5c23.tar.gz) = 7045407 bytes
 SHA1 (patch-Config.mk) = 9372a09efd05c9fbdbc06f8121e411fcb7c7ba65
 SHA1 (patch-xen_Makefile) = 0c400e8054e907ce44faf2be955e0c2d63b768ed
-SHA1 (patch-xen_arch_x86_Makefile) = f05a5879518005417a9cdb69488d136f207a7ab1
+SHA1 (patch-xen_arch_x86_Makefile) = 55358c4427ab1d4469ce2480e7b1abc38f4af9d2
 SHA1 (patch-xen_arch_x86_Rules.mk) = b0bc391f2ca3e96ce2bcaec5e1fcd66139ff16f9
 SHA1 (patch-xen_arch_x86_boot_build32.lds.S) = 0386a08a9e17b3ac9793df2542e8772329ebabd4
 SHA1 (patch-xen_arch_x86_extable.c) = f64b956be1167901a60bf9be1abd98dbfaffb100

Index: pkgsrc/sysutils/xenkernel420/patches/patch-xen_arch_x86_Makefile
diff -u pkgsrc/sysutils/xenkernel420/patches/patch-xen_arch_x86_Makefile:1.1 pkgsrc/sysutils/xenkernel420/patches/patch-xen_arch_x86_Makefile:1.2
--- pkgsrc/sysutils/xenkernel420/patches/patch-xen_arch_x86_Makefile:1.1        Fri Aug 22 09:00:11 2025
+++ pkgsrc/sysutils/xenkernel420/patches/patch-xen_arch_x86_Makefile    Wed Jun 10 18:07:45 2026
@@ -1,12 +1,12 @@
-$NetBSD: patch-xen_arch_x86_Makefile,v 1.1 2025/08/22 09:00:11 bouyer Exp $
+$NetBSD: patch-xen_arch_x86_Makefile,v 1.2 2026/06/10 18:07:45 bouyer Exp $
 
 revert commit a9754615cb1e615d92efc40d2f725553236bcf5e, it causes the build
 to fail with:
 ld: prelink.o: relocation R_X86_64_32 against `.init.rodata' can not be used when making a PIE object; recompile with -fPIE
 
---- xen/arch/x86/Makefile.old  2025-05-21 20:16:58.798923201 +0200
-+++ xen/arch/x86/Makefile      2025-05-21 20:16:21.806018309 +0200
-@@ -138,19 +138,19 @@
+--- xen/arch/x86/Makefile.orig 2026-06-09 14:08:15.000000000 +0200
++++ xen/arch/x86/Makefile      2026-06-10 16:29:38.106843955 +0200
+@@ -136,19 +136,19 @@
  CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI
  
  $(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds
@@ -29,7 +29,7 @@ ld: prelink.o: relocation R_X86_64_32 ag
            $(orphan-handling-y) $(dot-target).1.o -o $@
        $(NM) -pa --format=sysv $@ \
                | $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \
-@@ -211,7 +211,7 @@
+@@ -209,7 +209,7 @@
        $(if $(filter --strip-debug,$(EFI_LDFLAGS)),echo,:) "Will strip debug info from $(@F)"
  endif
        $(foreach base, $(VIRT_BASE) $(ALT_BASE), \
@@ -38,7 +38,7 @@ ld: prelink.o: relocation R_X86_64_32 ag
                        $(objtree)/common/symbols-dummy.o $(note_file_option) \
                        -o $(dot-target).$(base).0 &&) :
        $(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(dot-target).$(base).0) \
-@@ -221,7 +221,7 @@
+@@ -220,7 +220,7 @@
                > $(dot-target).0s.S
        $(MAKE) $(build)=$(@D) .$(@F).0r.o .$(@F).0s.o
        $(foreach base, $(VIRT_BASE) $(ALT_BASE), \
@@ -48,7 +48,7 @@ ld: prelink.o: relocation R_X86_64_32 ag
                        -o $(dot-target).$(base).1 &&) :
        $(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(dot-target).$(base).1) \
 @@ -230,7 +230,7 @@
-               | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
+                   --source-name=$(@F).S \
                > $(dot-target).1s.S
        $(MAKE) $(build)=$(@D) .$(@F).1r.o .$(@F).1s.o
 -      $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T $(obj)/efi.lds $< \

Index: pkgsrc/sysutils/xentools420/distinfo
diff -u pkgsrc/sysutils/xentools420/distinfo:1.5 pkgsrc/sysutils/xentools420/distinfo:1.6
--- pkgsrc/sysutils/xentools420/distinfo:1.5    Sat May 16 09:38:16 2026
+++ pkgsrc/sysutils/xentools420/distinfo        Wed Jun 10 18:07:45 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2026/05/16 09:38:16 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2026/06/10 18:07:45 bouyer Exp $
 
 BLAKE2s (xen420/ipxe-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz) = 82256e7e5d45980590a6493e17a4e133ff63fa28f00aff1963db96371e702448
 SHA512 (xen420/ipxe-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz) = e1c11e37f53aab0cc6a3ceaace0b8417f07009b1f20ff8572320895fef24f1a796ade041094a024eb24c988b9bed404c556a1fdde809bba89fb49f0e0ff45a57
@@ -9,9 +9,9 @@ Size (xen420/qemu-xen-20250821.tar.gz) =
 BLAKE2s (xen420/seabios-1.16.3.tar.gz) = 0c8181f637b55ade090a8e2bb5728cbbc9df05cc1976a7de5e080a3c6600f038
 SHA512 (xen420/seabios-1.16.3.tar.gz) = 55ea6c8c1831d2451d1f5af595ecda9edd89af2568b1118d74615f9103e4af4ad3fff7e9e92568e897e525f800537beaa793bc9662dc3b4d3ac928c911d838f3
 Size (xen420/seabios-1.16.3.tar.gz) = 636695 bytes
-BLAKE2s (xen420/xen-3ed365e3f9ee281a8b34d65b6f5a4bf04bc871e4.tar.gz) = 298bb51d8381e95dd36e07f9e19197e80f4860991d48bf1986fd21e1085dd6bb
-SHA512 (xen420/xen-3ed365e3f9ee281a8b34d65b6f5a4bf04bc871e4.tar.gz) = 358103be041efa051bf8ef8846a6b58233c9678f91fe091f8c59314f453f418bdc19081bf50b56ee2e82d401738eb4862eb4bc0ee51ea4f6245a6d46b45997d6
-Size (xen420/xen-3ed365e3f9ee281a8b34d65b6f5a4bf04bc871e4.tar.gz) = 7041021 bytes
+BLAKE2s (xen420/xen-0953c1890794c849771b4bd6e061a30a181d5c23.tar.gz) = 20bdbfec75c0afb3a9dff88222d9c2f12450017b5d5f8da218537019f5531536
+SHA512 (xen420/xen-0953c1890794c849771b4bd6e061a30a181d5c23.tar.gz) = 47669d1cfffae8547ee14333ef5d5b001542a611ac6f85b42eb6e1629479239334dc6110e2b70daaf97a0f6347334b5477de55ed30fe566a38ba7d274c0da324
+Size (xen420/xen-0953c1890794c849771b4bd6e061a30a181d5c23.tar.gz) = 7045407 bytes
 SHA1 (patch-.._seabios-1.16.3_src_string.c) = bbfafcd4c463a5806e88423928b3639e5a6bfa06
 SHA1 (patch-Config.mk) = f2c5d83d4738db706e980fbbd0ae889477d87c7d
 SHA1 (patch-configure) = d52bd51ae234ffd0796b0d3c2453e5e5931c9b63

Index: pkgsrc/sysutils/xentools420/version.mk
diff -u pkgsrc/sysutils/xentools420/version.mk:1.4 pkgsrc/sysutils/xentools420/version.mk:1.5
--- pkgsrc/sysutils/xentools420/version.mk:1.4  Sat May 16 09:38:16 2026
+++ pkgsrc/sysutils/xentools420/version.mk      Wed Jun 10 18:07:45 2026
@@ -1,10 +1,10 @@
-# $NetBSD: version.mk,v 1.4 2026/05/16 09:38:16 bouyer Exp $
+# $NetBSD: version.mk,v 1.5 2026/06/10 18:07:45 bouyer Exp $
 #
 # Version number is used by xenkernel420, xentools420 and xenstoretools
 
-VERSION=               20260515
-XEN_COMMIT=            3ed365e3f9ee281a8b34d65b6f5a4bf04bc871e4
-XEN_SHORTCOMMIT=       3ed365e
+VERSION=               20260610
+XEN_COMMIT=            0953c1890794c849771b4bd6e061a30a181d5c23
+XEN_SHORTCOMMIT=       0953c18
 
 DIST_SUBDIR=           xen420
 DISTNAME=              xen-${XEN_COMMIT}