From 2515b30029af6e2d5f6acee3d48137fbd567e946 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Wed, 22 Mar 2023 11:43:37 +0100 Subject: libraries/libvirt: Updated for version 9.1.0. Signed-off-by: Matteo Bernardini Signed-off-by: Willy Sudiarto Raharjo --- libraries/libvirt/823a62ec.patch | 48 ------------------------------------ libraries/libvirt/libvirt.SlackBuild | 9 +++---- libraries/libvirt/libvirt.info | 6 ++--- 3 files changed, 6 insertions(+), 57 deletions(-) delete mode 100644 libraries/libvirt/823a62ec.patch diff --git a/libraries/libvirt/823a62ec.patch b/libraries/libvirt/823a62ec.patch deleted file mode 100644 index 5fcc644d3e5a..000000000000 --- a/libraries/libvirt/823a62ec.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 823a62ec8aac4fb75e6e281164f3eb56ae47597c Mon Sep 17 00:00:00 2001 -From: Boris Fiuczynski -Date: Tue, 1 Mar 2022 18:47:59 +0100 -Subject: [PATCH] qemu: segmentation fault in virtqemud executing - qemuDomainUndefineFlags - -Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault. - -Stack trace of thread 664419: - #0 0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=) at ../src/qemu/qemu_driver.c:6618 - #1 0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=) at ../src/libvirt-domain.c:6519 - #2 0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=, rerr=0x3ff8287b950, client=) - at src/remote/remote_daemon_dispatch_stubs.h:13080 - #3 remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=, ret=0x0) - at src/remote/remote_daemon_dispatch_stubs.h:13059 - #4 0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010) - at ../src/rpc/virnetserverprogram.c:428 - #5 virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302 - #6 0x000003ff8758c260 in virNetServerProcessMsg (msg=, prog=, client=, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140 - #7 virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160 - #8 0x000003ff874c49aa in virThreadPoolWorker (opaque=) at ../src/util/virthreadpool.c:164 - #9 0x000003ff874c3f62 in virThreadHelper (data=) at ../src/util/virthread.c:256 - #10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6 - #11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6 - -Signed-off-by: Boris Fiuczynski -Reviewed-by: Jim Fehlig -Reviewed-by: Michal Privoznik ---- - src/qemu/qemu_driver.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c -index bcd9bdb436..8337eed510 100644 ---- a/src/qemu/qemu_driver.c -+++ b/src/qemu/qemu_driver.c -@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, - } - } - -- if (vm->def->os.loader->nvram) { -+ if (vm->def->os.loader && vm->def->os.loader->nvram) { - nvram_path = g_strdup(vm->def->os.loader->nvram); - } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) { - qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path); --- -GitLab - diff --git a/libraries/libvirt/libvirt.SlackBuild b/libraries/libvirt/libvirt.SlackBuild index 032b2fe58ae5..1da38ef8316a 100644 --- a/libraries/libvirt/libvirt.SlackBuild +++ b/libraries/libvirt/libvirt.SlackBuild @@ -10,8 +10,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libvirt -VERSION=${VERSION:-8.1.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-9.1.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -74,14 +74,12 @@ sed -i "s|prefix / 'lib' / 'sysctl.d'|sysconfdir / 'sysctl.d'|" src/remote/meson patch -p1 < $CWD/use-virtgroup-in-polkit-rules.diff sed -i -e "s,@VIRTGROUP@,$VIRTGROUP,g" src/remote/libvirtd.rules -patch -p1 < $CWD/823a62ec.patch - # Since 5.10: "configure: error: Build directory must be different from source directory" mkdir -p build cd build CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ - meson .. \ + meson setup .. \ --buildtype=release \ --infodir=/usr/info \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -104,7 +102,6 @@ cd build -Ddriver_vz=disabled \ -Dsecdriver_apparmor=disabled \ -Dsecdriver_selinux=disabled \ - -Dstorage_sheepdog=disabled \ -Dstorage_vstorage=disabled \ -Ddtrace=disabled \ -Dstrip=true \ diff --git a/libraries/libvirt/libvirt.info b/libraries/libvirt/libvirt.info index 8c4818291ef1..8a7276895c98 100644 --- a/libraries/libvirt/libvirt.info +++ b/libraries/libvirt/libvirt.info @@ -1,8 +1,8 @@ PRGNAM="libvirt" -VERSION="8.1.0" +VERSION="9.1.0" HOMEPAGE="http://libvirt.org" -DOWNLOAD="https://libvirt.org/sources/libvirt-8.1.0.tar.xz" -MD5SUM="db2ab9f064a611dbeea3156cf26a2ed1" +DOWNLOAD="https://libvirt.org/sources/libvirt-9.1.0.tar.xz" +MD5SUM="fbfab9819030ec363f0b1e88ca5b83de" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="yajl" -- cgit v1.2.3