CVS commit: [pkgsrc-2023Q2] pkgsrc/sysutils

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: [pkgsrc-2023Q2] pkgsrc/sysutils
From: "Benny Siegert" <bsiegert%netbsd.org@localhost>
Date: Sat, 23 Sep 2023 17:55:51 +0000

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Sep 23 17:55:51 UTC 2023

Modified Files:
        pkgsrc/sysutils/xenkernel415 [pkgsrc-2023Q2]: Makefile distinfo
        pkgsrc/sysutils/xentools415 [pkgsrc-2023Q2]: Makefile distinfo
            version.mk
        pkgsrc/sysutils/xentools415/patches [pkgsrc-2023Q2]:
            patch-tools_firmware_Makefile
Added Files:
        pkgsrc/sysutils/xentools415/patches [pkgsrc-2023Q2]:
            patch-.._seabios-rel-1.16.0_src_string.c
Removed Files:
        pkgsrc/sysutils/xentools415/patches [pkgsrc-2023Q2]:
            patch-.._seabios-rel-1.14.0_src_string.c

Log Message:
Pullup ticket #6795 - requested by bouyer
sysutils/xenkernel415: security fix
sysutils/xenstoretools: security fix
sysutils/xentools415: security fix

Revisions pulled up:
- sysutils/xenkernel415/Makefile                                1.10
- sysutils/xenkernel415/distinfo                                1.9
- sysutils/xenstoretools/Makefile                               1.28
- sysutils/xentools415/Makefile                                 1.26
- sysutils/xentools415/distinfo                                 1.13
- sysutils/xentools415/patches/patch-.._seabios-rel-1.14.0_src_string.c deleted
- sysutils/xentools415/patches/patch-.._seabios-rel-1.16.0_src_string.c 1.1
- sysutils/xentools415/patches/patch-tools_firmware_Makefile    1.2
- sysutils/xentools415/version.mk                               1.4

---
   Module Name: pkgsrc
   Committed By:        bouyer
   Date:                Thu Aug 24 10:27:09 UTC 2023

   Modified Files:
        pkgsrc/sysutils/xenkernel415: Makefile distinfo
        pkgsrc/sysutils/xenstoretools: Makefile
        pkgsrc/sysutils/xentools415: Makefile distinfo version.mk
        pkgsrc/sysutils/xentools415/patches: patch-tools_firmware_Makefile
   Added Files:
        pkgsrc/sysutils/xentools415/patches:
            patch-.._seabios-rel-1.16.0_src_string.c
   Removed Files:
        pkgsrc/sysutils/xentools415/patches:
            patch-.._seabios-rel-1.14.0_src_string.c

   Log Message:
   Update xenkernel415, xentools415 and xenstoretools to Xen 4.15.5
   Chnages since 4.15.4:
   - includes patches for Xen Security Advisory up to XSA-436 (inclued)
   - update seabios to 1.16.0
   - better support on some hardware

   Complete changes here:
   https://xenproject.org/downloads/xen-project-archives/xen-project-4-15-series/xen-project-4-15-5/


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.6.1 pkgsrc/sysutils/xenkernel415/Makefile \
    pkgsrc/sysutils/xenkernel415/distinfo
cvs rdiff -u -r1.24 -r1.24.2.1 pkgsrc/sysutils/xentools415/Makefile
cvs rdiff -u -r1.12 -r1.12.6.1 pkgsrc/sysutils/xentools415/distinfo
cvs rdiff -u -r1.3 -r1.3.6.1 pkgsrc/sysutils/xentools415/version.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/sysutils/xentools415/patches/patch-.._seabios-rel-1.14.0_src_string.c
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/sysutils/xentools415/patches/patch-.._seabios-rel-1.16.0_src_string.c
cvs rdiff -u -r1.1 -r1.1.18.1 \
    pkgsrc/sysutils/xentools415/patches/patch-tools_firmware_Makefile

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

Modified files:

Index: pkgsrc/sysutils/xenkernel415/Makefile
diff -u pkgsrc/sysutils/xenkernel415/Makefile:1.8 pkgsrc/sysutils/xenkernel415/Makefile:1.8.6.1
--- pkgsrc/sysutils/xenkernel415/Makefile:1.8   Thu Dec 15 13:24:43 2022
+++ pkgsrc/sysutils/xenkernel415/Makefile       Sat Sep 23 17:55:51 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2022/12/15 13:24:43 bouyer Exp $
+# $NetBSD: Makefile,v 1.8.6.1 2023/09/23 17:55:51 bsiegert Exp $
 
-VERSION=       4.15.4
+VERSION=       4.15.5
 DISTNAME=      xen-${VERSION}
 PKGNAME=       xenkernel415-${VERSION}
 CATEGORIES=    sysutils
Index: pkgsrc/sysutils/xenkernel415/distinfo
diff -u pkgsrc/sysutils/xenkernel415/distinfo:1.8 pkgsrc/sysutils/xenkernel415/distinfo:1.8.6.1
--- pkgsrc/sysutils/xenkernel415/distinfo:1.8   Thu Dec 15 13:24:43 2022
+++ pkgsrc/sysutils/xenkernel415/distinfo       Sat Sep 23 17:55:51 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2022/12/15 13:24:43 bouyer Exp $
+$NetBSD: distinfo,v 1.8.6.1 2023/09/23 17:55:51 bsiegert Exp $
 
-BLAKE2s (xen415/xen-4.15.4.tar.gz) = ff0fc8e2cd666a1361fe24d53be06dc24e50b88a2e200104d769573720e198e4
-SHA512 (xen415/xen-4.15.4.tar.gz) = fa6a4991c0699025af163ed117f8d0523c0a482102464615025eb3575d755ffacec5df394e3fe01871cde6028678f654d99f8e3c2533b138765971a2a7994cb8
-Size (xen415/xen-4.15.4.tar.gz) = 40820669 bytes
+BLAKE2s (xen415/xen-4.15.5.tar.gz) = 85bef27c99fd9fd3037ec6df5e514289b650f2f073bcc543d13d5997c03332d4
+SHA512 (xen415/xen-4.15.5.tar.gz) = 790f3d75df78f63f5b2ce3b99c1f2287f75ef5571d1b7a9bb9bac470bd28ccbd4816d07a1af8320eee4107626c75be029bd6dad1d99d58f3816906ed98d206d9
+Size (xen415/xen-4.15.5.tar.gz) = 40835793 bytes
 SHA1 (patch-Config.mk) = 9372a09efd05c9fbdbc06f8121e411fcb7c7ba65
 SHA1 (patch-xen_Makefile) = 465388d80de414ca3bb84faefa0f52d817e423a6
 SHA1 (patch-xen_Rules.mk) = c743dc63f51fc280d529a7d9e08650292c171dac

Index: pkgsrc/sysutils/xentools415/Makefile
diff -u pkgsrc/sysutils/xentools415/Makefile:1.24 pkgsrc/sysutils/xentools415/Makefile:1.24.2.1
--- pkgsrc/sysutils/xentools415/Makefile:1.24   Tue Jun  6 12:42:24 2023
+++ pkgsrc/sysutils/xentools415/Makefile        Sat Sep 23 17:55:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2023/06/06 12:42:24 riastradh Exp $
+# $NetBSD: Makefile,v 1.24.2.1 2023/09/23 17:55:51 bsiegert Exp $
 #
 # VERSION is set in version.mk as it is shared with other packages
 .include        "version.mk"

Index: pkgsrc/sysutils/xentools415/distinfo
diff -u pkgsrc/sysutils/xentools415/distinfo:1.12 pkgsrc/sysutils/xentools415/distinfo:1.12.6.1
--- pkgsrc/sysutils/xentools415/distinfo:1.12   Thu Dec 15 13:24:44 2022
+++ pkgsrc/sysutils/xentools415/distinfo        Sat Sep 23 17:55:51 2023
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.12 2022/12/15 13:24:44 bouyer Exp $
+$NetBSD: distinfo,v 1.12.6.1 2023/09/23 17:55:51 bsiegert Exp $
 
 BLAKE2s (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 67ded947316100f4f66fa61fe156baf1620db575450f4dc0dd8dcb323e57970b
 SHA512 (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = d888e0e653727ee9895fa866d8895e6d23a568b4e9e8439db4c4d790996700c60b0655e3a3129e599736ec2b4f7b987ce79d625ba208f06665fced8bddf94403
 Size (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 3937560 bytes
-BLAKE2s (xen415/seabios-1.14.0.tar.gz) = c34103500436ad4726f15f2ed181205736143fc41af5c4b32a7055cd021edc1d
-SHA512 (xen415/seabios-1.14.0.tar.gz) = f282175484c99488f4349ff4d3af9a74d96df3e8dcbe679fcea5b8b559f95f600756939d99d6e61dabace206d3d9ccefdc8fa2bc7709d34d6a0dc085d6c79238
-Size (xen415/seabios-1.14.0.tar.gz) = 628981 bytes
-BLAKE2s (xen415/xen-4.15.4.tar.gz) = ff0fc8e2cd666a1361fe24d53be06dc24e50b88a2e200104d769573720e198e4
-SHA512 (xen415/xen-4.15.4.tar.gz) = fa6a4991c0699025af163ed117f8d0523c0a482102464615025eb3575d755ffacec5df394e3fe01871cde6028678f654d99f8e3c2533b138765971a2a7994cb8
-Size (xen415/xen-4.15.4.tar.gz) = 40820669 bytes
-SHA1 (patch-.._seabios-rel-1.14.0_src_string.c) = 87e2e28fe47c196e74fea073c7e7f7d03990fbe3
+BLAKE2s (xen415/seabios-1.16.0.tar.gz) = 490e358ef7788a08d928e0f599cbafa2b6a5182003ff3dee8ede8252983a92b6
+SHA512 (xen415/seabios-1.16.0.tar.gz) = bc4a674ff62b84d5643814c46f965c39e417d91610ea95503496cb9d6942075e71f256e5e354cd795cc618714d973203e06f1f32a0b479f1ee045175d9d74c39
+Size (xen415/seabios-1.16.0.tar.gz) = 635418 bytes
+BLAKE2s (xen415/xen-4.15.5.tar.gz) = 85bef27c99fd9fd3037ec6df5e514289b650f2f073bcc543d13d5997c03332d4
+SHA512 (xen415/xen-4.15.5.tar.gz) = 790f3d75df78f63f5b2ce3b99c1f2287f75ef5571d1b7a9bb9bac470bd28ccbd4816d07a1af8320eee4107626c75be029bd6dad1d99d58f3816906ed98d206d9
+Size (xen415/xen-4.15.5.tar.gz) = 40835793 bytes
+SHA1 (patch-.._seabios-rel-1.16.0_src_string.c) = e82f2f16a236a3b878c07b4fb655998591717a73
 SHA1 (patch-Config.mk) = d108a1743b5b5313d3ea957b02a005b49f5b3bf6
 SHA1 (patch-Makefile) = 6c580cbea532d08a38cf5e54228bd0210a98da21
 SHA1 (patch-docs_man_xl.1.pod.in) = 280a3717b9f15578d90f85392249ef97844b6765
@@ -21,7 +21,7 @@ SHA1 (patch-tools_Makefile) = 65dcdf5903
 SHA1 (patch-tools_configure) = 93cb52d3d650aa9b04b4eb0a00f8fa51c46b81ce
 SHA1 (patch-tools_console_daemon_utils.c) = ea0f66a3edbf6cb643580d0fae190064c0cbf0e0
 SHA1 (patch-tools_examples_Makefile) = d43095ab76444fd16a6f63b93fc68606452fb893
-SHA1 (patch-tools_firmware_Makefile) = e3394f66acc09f166cf2ba5e66b9dc3fdedbbabf
+SHA1 (patch-tools_firmware_Makefile) = 146998d40fbf2817e8764e6149df581a69ad5dcc
 SHA1 (patch-tools_firmware_etherboot_Makefile) = 61741d59c72430d53682ea83deed91ee4ff3d220
 SHA1 (patch-tools_hotplug_NetBSD_Makefile) = c032af025b18e888019247c47016dcf649c4f391
 SHA1 (patch-tools_hotplug_NetBSD_block) = 23a18f1ebfa3bc4a689707fd5c8afa07fa232bee

Index: pkgsrc/sysutils/xentools415/version.mk
diff -u pkgsrc/sysutils/xentools415/version.mk:1.3 pkgsrc/sysutils/xentools415/version.mk:1.3.6.1
--- pkgsrc/sysutils/xentools415/version.mk:1.3  Thu Dec 15 13:24:44 2022
+++ pkgsrc/sysutils/xentools415/version.mk      Sat Sep 23 17:55:51 2023
@@ -1,8 +1,8 @@
-# $NetBSD: version.mk,v 1.3 2022/12/15 13:24:44 bouyer Exp $
+# $NetBSD: version.mk,v 1.3.6.1 2023/09/23 17:55:51 bsiegert Exp $
 #
 # Version number is used by xentools415 and xenstoretools
 
-VERSION=       4.15.4
+VERSION=       4.15.5
 
 DIST_SUBDIR=           xen415
 DISTNAME=              xen-${VERSION}
@@ -14,7 +14,7 @@ IPXE_DIST=            ipxe-${IPXE_VERSION}.tar.gz
 DISTFILES+=            ${IPXE_DIST}
 SITES.${IPXE_DIST}=    -https://github.com/ipxe/ipxe/archive/${IPXE_VERSION}.tar.gz
 
-SEABIOS_VERSION=       1.14.0
+SEABIOS_VERSION=       1.16.0
 SEABIOS_DIST=          seabios-${SEABIOS_VERSION}.tar.gz
 DISTFILES+=            ${SEABIOS_DIST}
 SITES.${SEABIOS_DIST}= -http://xenbits.xen.org/gitweb/?p=seabios.git;a=snapshot;h=refs/tags/rel-${SEABIOS_VERSION};sf=tgz

Index: pkgsrc/sysutils/xentools415/patches/patch-tools_firmware_Makefile
diff -u pkgsrc/sysutils/xentools415/patches/patch-tools_firmware_Makefile:1.1 pkgsrc/sysutils/xentools415/patches/patch-tools_firmware_Makefile:1.1.18.1
--- pkgsrc/sysutils/xentools415/patches/patch-tools_firmware_Makefile:1.1       Sun Apr 18 12:31:26 2021
+++ pkgsrc/sysutils/xentools415/patches/patch-tools_firmware_Makefile   Sat Sep 23 17:55:51 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-tools_firmware_Makefile,v 1.1 2021/04/18 12:31:26 bouyer Exp $
+$NetBSD: patch-tools_firmware_Makefile,v 1.1.18.1 2023/09/23 17:55:51 bsiegert Exp $
 
 --- tools/firmware/Makefile.orig       2020-05-14 14:19:32.000000000 +0200
 +++ tools/firmware/Makefile    2020-08-26 19:39:04.950176746 +0200
@@ -7,7 +7,7 @@ $NetBSD: patch-tools_firmware_Makefile,v
  
  seabios-dir:
 -      GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_REVISION) seabios-dir
-+      ln -sf ../../../seabios-rel-1.14.0 ${WRKSRC}/tools/firmware/seabios-dir
++      ln -sf ../../../seabios-rel-1.16.0 ${WRKSRC}/tools/firmware/seabios-dir
        cp seabios-config seabios-dir/.config;
        $(MAKE) -C seabios-dir olddefconfig CC=$(SEABIOSCC) LD=$(SEABIOSLD)
        rm -f seabios-dir/.version

Added files:

Index: pkgsrc/sysutils/xentools415/patches/patch-.._seabios-rel-1.16.0_src_string.c
diff -u /dev/null pkgsrc/sysutils/xentools415/patches/patch-.._seabios-rel-1.16.0_src_string.c:1.1.2.2
--- /dev/null   Sat Sep 23 17:55:51 2023
+++ pkgsrc/sysutils/xentools415/patches/patch-.._seabios-rel-1.16.0_src_string.c        Sat Sep 23 17:55:51 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-.._seabios-rel-1.16.0_src_string.c,v 1.1.2.2 2023/09/23 17:55:51 bsiegert Exp $
+
+when the code is compiled -fwhole-program, memcpy() will be ommitted by gcc
+because nothing in the file references it. Later the link fails with
+undefined references to memcpy().
+Force the inclusion with (externally_visible) attribute
+
+--- ../seabios-rel-1.16.0/src/string.c.orig    2021-04-17 22:32:25.409876075 +0200
++++ ../seabios-rel-1.16.0/src/string.c 2021-04-17 22:32:39.873615679 +0200
+@@ -149,7 +149,7 @@
+         memcpy(d_fl, s_fl, len);
+ }
+ 
+-void *
++__attribute__((externally_visible)) void *
+ #undef memcpy
+ memcpy(void *d1, const void *s1, size_t len)
+ #if MODESEGMENT == 0

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: [pkgsrc-2023Q2] pkgsrc/sysutils/xenkernel415
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: [pkgsrc-2023Q2] pkgsrc/sysutils/xenkernel415
Indexes:

Home | Main Index | Thread Index | Old Index