CVS commit: pkgsrc/sysutils

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

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Thu May 22 14:14:38 UTC 2025

Modified Files:
        pkgsrc/sysutils/xenkernel418: distinfo
        pkgsrc/sysutils/xentools418: distinfo version.mk
Added Files:
        pkgsrc/sysutils/xenkernel418/patches: patch-xen_arch_x86_Makefile

Log Message:
Update xenkernel418 and xentools418 to 20250521. This brings in the Xen
4.18.5 release.

CHANGES since 20241221: mostly bug fixes, including security fixes
up to XSA-469; some newer hardware support.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/xenkernel418/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/xenkernel418/patches/patch-xen_arch_x86_Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/xentools418/distinfo
cvs rdiff -u -r1.4 -r1.5 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/distinfo
diff -u pkgsrc/sysutils/xenkernel418/distinfo:1.5 pkgsrc/sysutils/xenkernel418/distinfo:1.6
--- pkgsrc/sysutils/xenkernel418/distinfo:1.5   Sat Dec 21 16:01:47 2024
+++ pkgsrc/sysutils/xenkernel418/distinfo       Thu May 22 14:14:37 2025
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.5 2024/12/21 16:01:47 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2025/05/22 14:14:37 bouyer Exp $
 
-BLAKE2s (xen418/xen-e77ff547385861c72108aa380ab279e35d0f4735.tar.gz) = e64d4db0928bf8feb2114bf05d0dcf79861c723544f40384e4dc3c626e014ae0
-SHA512 (xen418/xen-e77ff547385861c72108aa380ab279e35d0f4735.tar.gz) = 6e16924f00ae082271d3428db9265ba0f6458546f96862c52c9a8a0a8b8c4edc12521baabdded143746f55b65e725dfa699e7c91689fb264ea1595cd7c049c5a
-Size (xen418/xen-e77ff547385861c72108aa380ab279e35d0f4735.tar.gz) = 6847288 bytes
+BLAKE2s (xen418/xen-0b8f769d00bcfcda65d9f6d0729cfdc6cb336d12.tar.gz) = 8d81589710484a72bf576abf9328ec50b490f4bf8254efa19531809ad8fc8a8c
+SHA512 (xen418/xen-0b8f769d00bcfcda65d9f6d0729cfdc6cb336d12.tar.gz) = e22c205b553f57da08f1916edb8f334c0b11984be0fe270f1a19bfabe60b9ff95e918eebaaf4ca2fa62c97b73b37568e6a7a455c7077da5a8475c4c5170ab113
+Size (xen418/xen-0b8f769d00bcfcda65d9f6d0729cfdc6cb336d12.tar.gz) = 6861107 bytes
 SHA1 (patch-Config.mk) = 9372a09efd05c9fbdbc06f8121e411fcb7c7ba65
 SHA1 (patch-xen_Makefile) = 0c400e8054e907ce44faf2be955e0c2d63b768ed
+SHA1 (patch-xen_arch_x86_Makefile) = f05a5879518005417a9cdb69488d136f207a7ab1
 SHA1 (patch-xen_arch_x86_Rules.mk) = b0bc391f2ca3e96ce2bcaec5e1fcd66139ff16f9
 SHA1 (patch-xen_arch_x86_boot_build32.lds) = 9157f22876085254844f720853761a2cd0f4876e
 SHA1 (patch-xen_arch_x86_extable.c) = f64b956be1167901a60bf9be1abd98dbfaffb100

Index: pkgsrc/sysutils/xentools418/distinfo
diff -u pkgsrc/sysutils/xentools418/distinfo:1.6 pkgsrc/sysutils/xentools418/distinfo:1.7
--- pkgsrc/sysutils/xentools418/distinfo:1.6    Sat Dec 21 16:01:48 2024
+++ pkgsrc/sysutils/xentools418/distinfo        Thu May 22 14:14:37 2025
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.6 2024/12/21 16:01:48 bouyer Exp $
+$NetBSD: distinfo,v 1.7 2025/05/22 14:14:37 bouyer Exp $
 
 BLAKE2s (xen418/ipxe-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz) = 82256e7e5d45980590a6493e17a4e133ff63fa28f00aff1963db96371e702448
 SHA512 (xen418/ipxe-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz) = e1c11e37f53aab0cc6a3ceaace0b8417f07009b1f20ff8572320895fef24f1a796ade041094a024eb24c988b9bed404c556a1fdde809bba89fb49f0e0ff45a57
 Size (xen418/ipxe-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz) = 4079541 bytes
-BLAKE2s (xen418/qemu-xen-20241221.tar.gz) = 6c99c1a74e61e63ab39378b1a077ed4be024cf0cf1a1e8e780139ce9bd2465be
-SHA512 (xen418/qemu-xen-20241221.tar.gz) = 7fa561a089c9be24ae2b429952e4d287dd9f7b7fe9c998dcf183d959564fe3a7d1c060328b33cc93ea235af832c1f95f0aa50e61dfd9746c22f56412896e38ac
-Size (xen418/qemu-xen-20241221.tar.gz) = 40722452 bytes
+BLAKE2s (xen418/qemu-xen-20250521.tar.gz) = 17e48bb7405d10ebb2fa608871578764d020edc987a17b8753cd3328a9d40ac7
+SHA512 (xen418/qemu-xen-20250521.tar.gz) = bfc77ec9a3ba695a7a9d9ecb5408edc627cd5e9cba47ccff1f24a46f7779a765b6dbb5fbff5d4ab4694476e67a63b1efa777faebc2a47a89fde4c9be2cc1fd75
+Size (xen418/qemu-xen-20250521.tar.gz) = 40722433 bytes
 BLAKE2s (xen418/qemu-xen-traditional-3d273dd.tar.gz) = 451316ac6d33cd349aa4eb06e56b5c05685b533867b9729a2749e18d7049060d
 SHA512 (xen418/qemu-xen-traditional-3d273dd.tar.gz) = 46a3d7054f8ccd211a9c984385bf33ed763247b94626eb09f962086307dbc7e2d058942c16622e09ae782a7e7ea357524b29ea410ac53a70b9fa26b60e8a37ef
 Size (xen418/qemu-xen-traditional-3d273dd.tar.gz) = 3733225 bytes
 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-e77ff547385861c72108aa380ab279e35d0f4735.tar.gz) = e64d4db0928bf8feb2114bf05d0dcf79861c723544f40384e4dc3c626e014ae0
-SHA512 (xen418/xen-e77ff547385861c72108aa380ab279e35d0f4735.tar.gz) = 6e16924f00ae082271d3428db9265ba0f6458546f96862c52c9a8a0a8b8c4edc12521baabdded143746f55b65e725dfa699e7c91689fb264ea1595cd7c049c5a
-Size (xen418/xen-e77ff547385861c72108aa380ab279e35d0f4735.tar.gz) = 6847288 bytes
+BLAKE2s (xen418/xen-0b8f769d00bcfcda65d9f6d0729cfdc6cb336d12.tar.gz) = 8d81589710484a72bf576abf9328ec50b490f4bf8254efa19531809ad8fc8a8c
+SHA512 (xen418/xen-0b8f769d00bcfcda65d9f6d0729cfdc6cb336d12.tar.gz) = e22c205b553f57da08f1916edb8f334c0b11984be0fe270f1a19bfabe60b9ff95e918eebaaf4ca2fa62c97b73b37568e6a7a455c7077da5a8475c4c5170ab113
+Size (xen418/xen-0b8f769d00bcfcda65d9f6d0729cfdc6cb336d12.tar.gz) = 6861107 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.4 pkgsrc/sysutils/xentools418/version.mk:1.5
--- pkgsrc/sysutils/xentools418/version.mk:1.4  Sat Dec 21 16:01:48 2024
+++ pkgsrc/sysutils/xentools418/version.mk      Thu May 22 14:14:37 2025
@@ -1,10 +1,10 @@
-# $NetBSD: version.mk,v 1.4 2024/12/21 16:01:48 bouyer Exp $
+# $NetBSD: version.mk,v 1.5 2025/05/22 14:14:37 bouyer Exp $
 #
 # Version number is used by xenkernel418, xentools418 and xenstoretools
 
-VERSION=               20241221
-XEN_COMMIT=            e77ff547385861c72108aa380ab279e35d0f4735
-XEN_SHORTCOMMIT=       e77ff54
+VERSION=               20250521
+XEN_COMMIT=            0b8f769d00bcfcda65d9f6d0729cfdc6cb336d12
+XEN_SHORTCOMMIT=       0b8f769
 
 DIST_SUBDIR=           xen418
 DISTNAME=              xen-${XEN_COMMIT}

Added files:

Index: pkgsrc/sysutils/xenkernel418/patches/patch-xen_arch_x86_Makefile
diff -u /dev/null pkgsrc/sysutils/xenkernel418/patches/patch-xen_arch_x86_Makefile:1.1
--- /dev/null   Thu May 22 14:14:38 2025
+++ pkgsrc/sysutils/xenkernel418/patches/patch-xen_arch_x86_Makefile    Thu May 22 14:14:37 2025
@@ -0,0 +1,58 @@
+$NetBSD: patch-xen_arch_x86_Makefile,v 1.1 2025/05/22 14:14:37 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 @@
+ CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI
+ 
+ $(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds
+-      $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \
++      $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \
+           $(objtree)/common/symbols-dummy.o -o $(dot-target).0
+       $(NM) -pa --format=sysv $(dot-target).0 \
+               | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
+               > $(dot-target).0.S
+       $(MAKE) $(build)=$(@D) $(dot-target).0.o
+-      $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \
++      $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \
+           $(dot-target).0.o -o $(dot-target).1
+       $(NM) -pa --format=sysv $(dot-target).1 \
+               | $(objtree)/tools/symbols $(all_symbols) --sysv --sort $(syms-warn-dup-y) \
+               > $(dot-target).1.S
+       $(MAKE) $(build)=$(@D) $(dot-target).1.o
+-      $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \
++      $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \
+           $(orphan-handling-y) $(dot-target).1.o -o $@
+       $(NM) -pa --format=sysv $@ \
+               | $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \
+@@ -211,7 +211,7 @@
+       $(if $(filter --strip-debug,$(EFI_LDFLAGS)),echo,:) "Will strip debug info from $(@F)"
+ endif
+       $(foreach base, $(VIRT_BASE) $(ALT_BASE), \
+-                $(LD) $(call EFI_LDFLAGS,$(base)) -T $(obj)/efi.lds $< $(relocs-dummy) \
++                $(LD) $(call EFI_LDFLAGS,$(base)) -T $(obj)/efi.lds -N $< $(relocs-dummy) \
+                       $(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 @@
+               > $(dot-target).0s.S
+       $(MAKE) $(build)=$(@D) .$(@F).0r.o .$(@F).0s.o
+       $(foreach base, $(VIRT_BASE) $(ALT_BASE), \
+-                $(LD) $(call EFI_LDFLAGS,$(base)) -T $(obj)/efi.lds $< \
++                $(LD) $(call EFI_LDFLAGS,$(base)) -T $(obj)/efi.lds -N $< \
+                       $(dot-target).0r.o $(dot-target).0s.o $(note_file_option) \
+                       -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 \
+               > $(dot-target).1s.S
+       $(MAKE) $(build)=$(@D) .$(@F).1r.o .$(@F).1s.o
+-      $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T $(obj)/efi.lds $< \
++      $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T $(obj)/efi.lds -N $< \
+             $(dot-target).1r.o $(dot-target).1s.o $(orphan-handling-y) \
+             $(note_file_option) -o $@
+       $(NM) -pa --format=sysv $@ \