[PR PATCH] qemu: update to 8.1.3; libvirt: update to 9.9.0

[PR PATCH] qemu: update to 8.1.3; libvirt: update to 9.9.0

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 413 bytes --]

There is a new pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages virtualization
https://github.com/void-linux/void-packages/pull/47433

qemu: update to 8.1.3; libvirt: update to 9.9.0
#### Testing the changes
- I tested the changes in this PR: **pending**

A patch file from https://github.com/void-linux/void-packages/pull/47433.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-virtualization-47433.patch --]
[-- Type: text/x-diff, Size: 9249 bytes --]

From 3a589833112f58b46207940eb5afaa6fd56f7799 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Nov 2023 10:13:10 -0500
Subject: [PATCH 1/4] qemu: update to 8.1.3.

---
 srcpkgs/qemu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 5671310f8ced4..92df1dcb9de25 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,8 +1,8 @@
 # Template file for 'qemu'
 # This package should be updated together with qemu-user-static
 pkgname=qemu
-version=8.1.0
-revision=2
+version=8.1.3
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
  --disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
@@ -28,7 +28,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=53a2388f4f67d03e94ed7fe192d8828e64c535fadf7bf9dd0bc1d2091eedf624
+checksum=0e448fb68f3a3bf43a3206e72a91e69136283b430b5996156dd7dfc64e55c998
 ignore_elf_dirs="/usr/share/qemu"
 nostrip_files="hppa-firmware.img openbios-ppc openbios-sparc32 openbios-sparc64
  palcode-clipper s390-ccw.img s390-netboot.img u-boot.e500 opensbi-riscv32-generic-fw_dynamic.elf

From 37770ae91e29c267adce98a3dffbac9c0ddbdb16 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Nov 2023 13:59:28 -0500
Subject: [PATCH 2/4] qemu-user-static: update to 8.1.3.

---
 srcpkgs/qemu-user-static/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 504ec5417c94e..0674a92878a80 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -1,7 +1,7 @@
 # Template file for 'qemu-user-static'
 # This package should be updated together with qemu
 pkgname=qemu-user-static
-version=8.1.0
+version=8.1.3
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=53a2388f4f67d03e94ed7fe192d8828e64c535fadf7bf9dd0bc1d2091eedf624
+checksum=0e448fb68f3a3bf43a3206e72a91e69136283b430b5996156dd7dfc64e55c998
 
 _fmts="aarch64 aarch64_be alpha arm armeb cris hppa i386 m68k microblaze
  microblazeel mips mipsel mips64 mips64el mipsn32 mipsn32el or1k

From 439be508aebf65120d1472d107344ba246839fe5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 27 Nov 2023 10:49:09 -0500
Subject: [PATCH 3/4] libvirt: update to 9.9.0.

---
 .../improve-generic-mass-close-of-fds.patch   | 127 ------------------
 srcpkgs/libvirt/template                      |   6 +-
 2 files changed, 3 insertions(+), 130 deletions(-)
 delete mode 100644 srcpkgs/libvirt/patches/improve-generic-mass-close-of-fds.patch

diff --git a/srcpkgs/libvirt/patches/improve-generic-mass-close-of-fds.patch b/srcpkgs/libvirt/patches/improve-generic-mass-close-of-fds.patch
deleted file mode 100644
index 026b6fe51e646..0000000000000
--- a/srcpkgs/libvirt/patches/improve-generic-mass-close-of-fds.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-XXX: DO NOT REMOVE UNLESS VERIFIED THAT libvirt virCommandMassClose does not use malloc
-
-https://www.redhat.com/archives/libvir-list/2020-August/msg00598.html
-
-Add a portable generic implementation of virMassClose as fallback on
-non-FreeBSD and non-glibc.
-
-This implementation uses poll(2) to look for open files to keep
-performance reasonable while not using any mallocs.
-
-This solves a deadlock with musl libc.
-
-Signed-off-by: Natanael Copa <ncopa alpinelinux org>
----
- src/util/vircommand.c | 66 +++++++++++++++++++++++++++++++++++++------
- 1 file changed, 58 insertions(+), 8 deletions(-)
-
-diff --git a/src/util/vircommand.c b/src/util/vircommand.c
-index 8e372c3152..5319b9c9b3 100644
---- a/src/util/vircommand.c
-+++ b/src/util/vircommand.c
-@@ -455,7 +455,7 @@ virExecCommon(virCommand *cmd, gid_t *groups, int ngroups)
-     return 0;
- }
- 
--# ifdef __linux__
-+# if defined(__linux__) && defined(__GLIBC__)
- /* On Linux, we can utilize procfs and read the table of opened
-  * FDs and selectively close only those FDs we don't want to pass
-  * onto child process (well, the one we will exec soon since this
-@@ -500,7 +500,7 @@ virCommandMassCloseGetFDsGeneric(virCommand *cmd G_GNUC_UNUSED,
-     virBitmapSetAll(fds);
-     return 0;
- }
--# endif /* !__linux__ */
-+# endif /* __linux__ && __GLIBC__ */
- 
- # ifdef __FreeBSD__
- 
-@@ -554,7 +554,7 @@ virCommandMassClose(virCommand *cmd,
-     return 0;
- }
- 
--# else /* ! __FreeBSD__ */
-+# elif defined(__GLIBC__)  /* ! __FreeBSD__ */
- 
- static int
- virCommandMassClose(virCommand *cmd,
-@@ -581,13 +581,8 @@ virCommandMassClose(virCommand *cmd,
- 
-     fds = virBitmapNew(openmax);
- 
--#  ifdef __linux__
-     if (virCommandMassCloseGetFDsLinux(cmd, fds) < 0)
-         return -1;
--#  else
--    if (virCommandMassCloseGetFDsGeneric(cmd, fds) < 0)
--        return -1;
--#  endif
- 
-     fd = virBitmapNextSetBit(fds, 2);
-     for (; fd >= 0; fd = virBitmapNextSetBit(fds, fd)) {
-@@ -605,6 +600,61 @@ virCommandMassClose(virCommand *cmd,
-     return 0;
- }
- 
-+#else /* ! __FreeBSD__ && ! __GLIBC__ */
-+static int
-+virCommandMassClose(virCommand* cmd,
-+                    int childin,
-+                    int childout,
-+                    int childerr)
-+{
-+    static struct pollfd pfds[1024];
-+    int fd = 0;
-+    int i, total;
-+    int max_fd = sysconf(_SC_OPEN_MAX);
-+
-+    if (max_fd < 0) {
-+        virReportSystemError(errno, "%s", _("sysconf(_SC_OPEN_MAX) failed"));
-+        return -1;
-+    }
-+
-+    total = max_fd - fd;
-+    for (i = 0; i < (total < 1024 ? total : 1024); i++)
-+        pfds[i].events = 0;
-+
-+    while (fd < max_fd) {
-+        int nfds, r = 0;
-+
-+        total = max_fd - fd;
-+        nfds =  total < 1024 ? total : 1024;
-+
-+        for (i = 0; i < nfds; i++)
-+            pfds[i].fd = fd + i;
-+
-+        do {
-+            r = poll(pfds, nfds, 0);
-+        } while (r == -1 && errno == EINTR);
-+
-+        if (r < 0) {
-+            virReportSystemError(errno, "%s", _("poll() failed"));
-+            return -1;
-+        }
-+
-+        for (i = 0; i < nfds; i++)
-+            if (pfds[i].revents != POLLNVAL) {
-+                if (pfds[i].fd == childin || pfds[i].fd == childout || pfds[i].fd == childerr)
-+                    continue;
-+                if (!virCommandFDIsSet(cmd, pfds[i].fd)) {
-+                    VIR_MASS_CLOSE(pfds[i].fd);
-+                } else if (virSetInherit(pfds[i].fd, true) < 0) {
-+                    virReportSystemError(errno, _("failed to preserve fd %d"), pfds[i].fd);
-+                    return -1;
-+                }
-+            }
-+        fd += nfds;
-+    }
-+    return 0;
-+}
-+
- # endif /* ! __FreeBSD__ */
- 
- /*
--- 
-2.33.0
-
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index ca45cc2c7bc54..d8eae7eb9f56c 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=9.6.0
-revision=2
+version=9.9.0
+revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run
  -Dpolkit=enabled"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=10f2e52dbb5df90410594a8e36d0e0587d38f11efb64ff32cbec422b93b70c52
+checksum=cb83be795548161af6718a6db75ee40719a87bcd6f9207a3565db2fc0e53a52e
 # At least one test times out on CI but works locally
 make_check=ci-skip
 

From adb4e6cef4620bfbdca02178f0b01fcd186b2ca5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 27 Nov 2023 10:49:47 -0500
Subject: [PATCH 4/4] libvirt-python3: update to 9.9.0.

---
 srcpkgs/libvirt-python3/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 67e61aaca3839..cdef6be70303a 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=9.6.0
-revision=2
+version=9.9.0
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3-devel python3-setuptools libvirt-devel
  libapparmor-devel"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=53422d8e3110139655c3d9c2ff2602b238f8a39b7bf61a92a620119b45550a99
+checksum=a97327417851b72aa24e24cdfe10765df0037b9775564cd19bcee25e22b341ea
 
 do_check() {
 	PYTHONPATH="$(cd build/lib.* && pwd)" pytest

Re: [PR PATCH] [Merged]: qemu: update to 8.1.3; libvirt: update to 9.9.0

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 253 bytes --]

There's a merged pull request on the void-packages repository

qemu: update to 8.1.3; libvirt: update to 9.9.0
https://github.com/void-linux/void-packages/pull/47433

Description:
#### Testing the changes
- I tested the changes in this PR: **pending**