From 02b19bbdef1636bb12f4ed6975b8df9ce433ce38 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Sun, 6 Mar 2022 09:15:00 +0700 Subject: libraries/libvirt: Updated for version 8.1.0. Signed-off-by: Willy Sudiarto Raharjo --- libraries/libvirt/823a62ec.patch | 48 ++++++++++++++++++++++++++++++++++++ libraries/libvirt/README | 9 ++++--- libraries/libvirt/libvirt.SlackBuild | 6 ++++- libraries/libvirt/libvirt.info | 6 ++--- 4 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 libraries/libvirt/823a62ec.patch (limited to 'libraries/libvirt') diff --git a/libraries/libvirt/823a62ec.patch b/libraries/libvirt/823a62ec.patch new file mode 100644 index 0000000000..5fcc644d3e --- /dev/null +++ b/libraries/libvirt/823a62ec.patch @@ -0,0 +1,48 @@ +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/README b/libraries/libvirt/README index 85c13caec7..5904ef1449 100644 --- a/libraries/libvirt/README +++ b/libraries/libvirt/README @@ -6,10 +6,11 @@ capabilities of recent versions of Linux (and other OSes). Most optional dependencies are autodetected and having the required libs in place will build the respective features automatically. -The group can be specified at build time like this: -VIRTGROUP=somegroup ./libvirt.SlackBuild (default: users) -You'll want to keep this in sync with what qemu uses (it also -defaults to the "users" group). +The user and group can be specified at build time like this: +VIRTUSER=someuser VIRTGROUP=someuser ./libvirt.SlackBuild +(default is VIRTUSER=root VIRTGROUP=users) +You'll want to keep this in sync with what qemu uses +(it also defaults to these) If you want to start the libvirt daemon at boot, add this to /etc/rc.d/rc.local diff --git a/libraries/libvirt/libvirt.SlackBuild b/libraries/libvirt/libvirt.SlackBuild index fbc0e960c3..cedba26d74 100644 --- a/libraries/libvirt/libvirt.SlackBuild +++ b/libraries/libvirt/libvirt.SlackBuild @@ -7,7 +7,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libvirt -VERSION=${VERSION:-8.0.0} +VERSION=${VERSION:-8.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -43,6 +43,7 @@ else LIBDIRSUFFIX="" fi +VIRTUSER=${VIRTUSER:-root} VIRTGROUP=${VIRTGROUP:-users} # Some optional dependencies checks @@ -73,6 +74,8 @@ 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 @@ -87,6 +90,7 @@ cd build --prefix=/usr \ --sysconfdir=/etc \ -Dqemu_group=$VIRTGROUP \ + -Dqemu_user=$VIRTUSER \ $bash_completion \ -Daudit=${audit}abled \ -Dlibiscsi=${libiscsi}abled \ diff --git a/libraries/libvirt/libvirt.info b/libraries/libvirt/libvirt.info index 1d3a8c756e..8c4818291e 100644 --- a/libraries/libvirt/libvirt.info +++ b/libraries/libvirt/libvirt.info @@ -1,8 +1,8 @@ PRGNAM="libvirt" -VERSION="8.0.0" +VERSION="8.1.0" HOMEPAGE="http://libvirt.org" -DOWNLOAD="https://libvirt.org/sources/libvirt-8.0.0.tar.xz" -MD5SUM="77b9a8fb57ee8000ea9c4d7c4a5fb2ac" +DOWNLOAD="https://libvirt.org/sources/libvirt-8.1.0.tar.xz" +MD5SUM="db2ab9f064a611dbeea3156cf26a2ed1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="yajl" -- cgit v1.2.3-65-gdbad