CVS commit: pkgsrc/sysutils

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

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Sat Dec 21 16:01:48 UTC 2024

Modified Files:
        pkgsrc/sysutils/xenkernel418: Makefile distinfo
        pkgsrc/sysutils/xentools418: distinfo version.mk
        pkgsrc/sysutils/xentools418/patches: patch-tools_ocaml_common.make
Removed Files:
        pkgsrc/sysutils/xenkernel418/patches: patch-xen_arch_x86_hvm_lvapic.c

Log Message:
Update xenkernel418, xentools418 and xenstoretools to 20241221, pointing
to the Xen 4.18.4 release. It includes all security patches up to XSA 464
(XSA 465 is a linux kernel issue and XSA 466 is documentation update).
Changes are:
- Prefer ACPI reboot over UEFI ResetSystem() run time service call.
- various bug fixes, including security fixes up to XSA464 (included)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/xenkernel418/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/xenkernel418/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/sysutils/xenkernel418/patches/patch-xen_arch_x86_hvm_lvapic.c
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/xentools418/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/xentools418/version.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/xentools418/patches/patch-tools_ocaml_common.make

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/Makefile
diff -u pkgsrc/sysutils/xenkernel418/Makefile:1.2 pkgsrc/sysutils/xenkernel418/Makefile:1.3
--- pkgsrc/sysutils/xenkernel418/Makefile:1.2   Fri Sep 27 12:45:49 2024
+++ pkgsrc/sysutils/xenkernel418/Makefile       Sat Dec 21 16:01:47 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2024/09/27 12:45:49 manu Exp $
+# $NetBSD: Makefile,v 1.3 2024/12/21 16:01:47 bouyer Exp $
 # VERSION is set in version.mk as it is shared with other packages
-PKGREVISION=        1
+#PKGREVISION=        1
 
 XENKERNEL:=
 .include        "../../sysutils/xentools418/version.mk"

Index: pkgsrc/sysutils/xenkernel418/distinfo
diff -u pkgsrc/sysutils/xenkernel418/distinfo:1.4 pkgsrc/sysutils/xenkernel418/distinfo:1.5
--- pkgsrc/sysutils/xenkernel418/distinfo:1.4   Fri Sep 27 12:47:09 2024
+++ pkgsrc/sysutils/xenkernel418/distinfo       Sat Dec 21 16:01:47 2024
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.4 2024/09/27 12:47:09 manu Exp $
+$NetBSD: distinfo,v 1.5 2024/12/21 16:01:47 bouyer Exp $
 
-BLAKE2s (xen418/xen-bd51e57.tar.gz) = cc12f497140f71ae2726a575d365a1c19c24315b20d80beff5b0ebbf0a8b2c89
-SHA512 (xen418/xen-bd51e57.tar.gz) = 752fb65b69c43410b04ad5ca34eba320f7afb8de7edac26b807fb7258b2571dc1fff71c271a3f834283ddbe0429b6d6c190fda9e33d9e048cdb97d6dc7ae71dc
-Size (xen418/xen-bd51e57.tar.gz) = 6839432 bytes
+BLAKE2s (xen418/xen-e77ff547385861c72108aa380ab279e35d0f4735.tar.gz) = e64d4db0928bf8feb2114bf05d0dcf79861c723544f40384e4dc3c626e014ae0
+SHA512 (xen418/xen-e77ff547385861c72108aa380ab279e35d0f4735.tar.gz) = 6e16924f00ae082271d3428db9265ba0f6458546f96862c52c9a8a0a8b8c4edc12521baabdded143746f55b65e725dfa699e7c91689fb264ea1595cd7c049c5a
+Size (xen418/xen-e77ff547385861c72108aa380ab279e35d0f4735.tar.gz) = 6847288 bytes
 SHA1 (patch-Config.mk) = 9372a09efd05c9fbdbc06f8121e411fcb7c7ba65
 SHA1 (patch-xen_Makefile) = 0c400e8054e907ce44faf2be955e0c2d63b768ed
 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
-SHA1 (patch-xen_arch_x86_hvm_lvapic.c) = fa68243926fe4ed3ba83cd2f5fa04df529af00c7
 SHA1 (patch-xen_arch_x86_mm_p2m.c) = 6e9b84dc8448eca9677f184e720bbfcb3c6d314e
 SHA1 (patch-xen_tools_check-endbr.sh) = a7268ee5ff11f21fdc5b0bc213498a1923b693be

Index: pkgsrc/sysutils/xentools418/distinfo
diff -u pkgsrc/sysutils/xentools418/distinfo:1.5 pkgsrc/sysutils/xentools418/distinfo:1.6
--- pkgsrc/sysutils/xentools418/distinfo:1.5    Sat Nov 23 18:51:19 2024
+++ pkgsrc/sysutils/xentools418/distinfo        Sat Dec 21 16:01:48 2024
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.5 2024/11/23 18:51:19 gdt Exp $
+$NetBSD: distinfo,v 1.6 2024/12/21 16:01:48 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-20240909.tar.gz) = 7023a7245b966272fb00dc4444da651ac31aad4874ef85057bea9babf718e55c
-SHA512 (xen418/qemu-xen-20240909.tar.gz) = 4e12b4c6d3c3bb3f1f7398d7ce419a527c0a95713e14b32b8d5a54c5f87a588550d02ef9226e2abaa71ac87df203cd8f4d1548f4d5021e4554277b803b39b031
-Size (xen418/qemu-xen-20240909.tar.gz) = 101725263 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-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-bd51e57.tar.gz) = cc12f497140f71ae2726a575d365a1c19c24315b20d80beff5b0ebbf0a8b2c89
-SHA512 (xen418/xen-bd51e57.tar.gz) = 752fb65b69c43410b04ad5ca34eba320f7afb8de7edac26b807fb7258b2571dc1fff71c271a3f834283ddbe0429b6d6c190fda9e33d9e048cdb97d6dc7ae71dc
-Size (xen418/xen-bd51e57.tar.gz) = 6839432 bytes
+BLAKE2s (xen418/xen-e77ff547385861c72108aa380ab279e35d0f4735.tar.gz) = e64d4db0928bf8feb2114bf05d0dcf79861c723544f40384e4dc3c626e014ae0
+SHA512 (xen418/xen-e77ff547385861c72108aa380ab279e35d0f4735.tar.gz) = 6e16924f00ae082271d3428db9265ba0f6458546f96862c52c9a8a0a8b8c4edc12521baabdded143746f55b65e725dfa699e7c91689fb264ea1595cd7c049c5a
+Size (xen418/xen-e77ff547385861c72108aa380ab279e35d0f4735.tar.gz) = 6847288 bytes
 SHA1 (patch-.._seabios-rel-1.16.2_src_string.c) = a8861860e63fb38dee3ebca1fce7f470ec7ff000
 SHA1 (patch-Config.mk) = f2c5d83d4738db706e980fbbd0ae889477d87c7d
 SHA1 (patch-configure) = d52bd51ae234ffd0796b0d3c2453e5e5931c9b63
@@ -41,7 +41,7 @@ SHA1 (patch-tools_libs_foreignmemory_net
 SHA1 (patch-tools_libxl_libxl_dom.c) = 4aa62de9adbc1eb659ba22d03e3fed42619e5a21
 SHA1 (patch-tools_libxl_libxl_event.c) = 9446c88d01b419cc7531b6f6d959816410e74024
 SHA1 (patch-tools_libxl_libxl_internal.h) = abcfaec70521b3ada6b4eae743119c24f141ea8f
-SHA1 (patch-tools_ocaml_common.make) = 305994b93fe29fb42e4aa57e19a039abef4e76fe
+SHA1 (patch-tools_ocaml_common.make) = 87172fa5b9805f89b4ecdeceafc31539bb7f8b6f
 SHA1 (patch-tools_ocaml_xenstored_Makefile) = b267702cf4090c7b45bba530e60327fced24e3e5
 SHA1 (patch-tools_ocaml_xenstored_utils.ml) = 4933684e759609e728c1764ca14766128b2a7730
 SHA1 (patch-tools_pygrub_Makefile) = ed9e471c70047bb1b8bfe0265b8cfecbc293937b

Index: pkgsrc/sysutils/xentools418/version.mk
diff -u pkgsrc/sysutils/xentools418/version.mk:1.3 pkgsrc/sysutils/xentools418/version.mk:1.4
--- pkgsrc/sysutils/xentools418/version.mk:1.3  Tue Sep 10 12:40:14 2024
+++ pkgsrc/sysutils/xentools418/version.mk      Sat Dec 21 16:01:48 2024
@@ -1,14 +1,14 @@
-# $NetBSD: version.mk,v 1.3 2024/09/10 12:40:14 bouyer Exp $
+# $NetBSD: version.mk,v 1.4 2024/12/21 16:01:48 bouyer Exp $
 #
 # Version number is used by xenkernel418, xentools418 and xenstoretools
 
-VERSION=               20240909
-XEN_COMMIT=            bd51e573a730efc569646379cd59ccba967cde97
-XEN_SHORTCOMMIT=       bd51e57
+VERSION=               20241221
+XEN_COMMIT=            e77ff547385861c72108aa380ab279e35d0f4735
+XEN_SHORTCOMMIT=       e77ff54
 
 DIST_SUBDIR=           xen418
-DISTNAME=              xen-${XEN_SHORTCOMMIT}
-MASTER_SITES=          -https://xenbits.xen.org/gitweb/?p=xen.git;a=snapshot;h=${XEN_COMMIT};sf=tgz
+DISTNAME=              xen-${XEN_COMMIT}
+MASTER_SITES=          -${MASTER_SITE_GITHUB:=xen-project/}xen/archive/${XEN_COMMIT}.tar.gz
 DISTFILES=             ${DISTNAME}.tar.gz
 
 .if !defined(XENKERNEL)

Index: pkgsrc/sysutils/xentools418/patches/patch-tools_ocaml_common.make
diff -u pkgsrc/sysutils/xentools418/patches/patch-tools_ocaml_common.make:1.1 pkgsrc/sysutils/xentools418/patches/patch-tools_ocaml_common.make:1.2
--- pkgsrc/sysutils/xentools418/patches/patch-tools_ocaml_common.make:1.1       Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_ocaml_common.make   Sat Dec 21 16:01:48 2024
@@ -1,9 +1,9 @@
-$NetBSD: patch-tools_ocaml_common.make,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+$NetBSD: patch-tools_ocaml_common.make,v 1.2 2024/12/21 16:01:48 bouyer Exp $
 
 Handle ocaml-findlib 1.7.3 already appending destdir
 
---- tools/ocaml/common.make.orig       2020-12-08 15:28:31.000000000 +0100
-+++ tools/ocaml/common.make    2021-01-09 19:27:02.447285099 +0100
+--- tools/ocaml/common.make.orig       2024-12-19 09:04:30.000000000 +0100
++++ tools/ocaml/common.make    2024-12-21 13:28:30.660273010 +0100
 @@ -3,7 +3,7 @@
  CC ?= gcc
  OCAMLOPT ?= ocamlopt
@@ -13,9 +13,9 @@ Handle ocaml-findlib 1.7.3 already appen
  OCAMLDEP ?= ocamldep
  OCAMLLEX ?= ocamllex
  OCAMLYACC ?= ocamlyacc
-@@ -17,6 +17,6 @@
+@@ -16,6 +16,6 @@
  
- VERSION := 4.1
+ VERSION := $(shell $(XEN_ROOT)/version.sh $(XEN_ROOT)/xen/Makefile)
  
 -OCAMLDESTDIR ?= $(DESTDIR)$(shell $(OCAMLFIND) printconf destdir)
 +OCAMLDESTDIR ?= $(shell $(OCAMLFIND) printconf destdir)