From 9017d899aa638cff4d379fb84c28a733f0bc8289 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sat, 22 Jul 2023 14:19:01 +0200 Subject: [PATCH] - updated to 9.5.0, added zfs bcond --- libvirt-qemu-acl.patch | 28 +++---- libvirt-sasl.patch | 156 +++++++++++++++++------------------ libvirt-udevadm-settle.patch | 8 +- libvirt.spec | 20 +++-- shebang.patch | 18 ++++ 5 files changed, 123 insertions(+), 107 deletions(-) create mode 100644 shebang.patch diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch index a2c255c..779f6dd 100644 --- a/libvirt-qemu-acl.patch +++ b/libvirt-qemu-acl.patch @@ -1,7 +1,7 @@ -diff -ur libvirt-9.0.0.orig/src/qemu/qemu_command.c libvirt-9.0.0/src/qemu/qemu_command.c ---- libvirt-9.0.0.orig/src/qemu/qemu_command.c 2023-02-08 18:27:57.203025166 +0100 -+++ libvirt-9.0.0/src/qemu/qemu_command.c 2023-02-08 18:28:12.916022463 +0100 -@@ -7880,6 +7880,10 @@ +diff -ur libvirt-9.5.0.orig/src/qemu/qemu_command.c libvirt-9.5.0/src/qemu/qemu_command.c +--- libvirt-9.5.0.orig/src/qemu/qemu_command.c 2023-07-20 17:19:16.014948742 +0200 ++++ libvirt-9.5.0/src/qemu/qemu_command.c 2023-07-20 17:19:30.957162714 +0200 +@@ -8057,6 +8057,10 @@ virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir); /* TODO: Support ACLs later */ @@ -12,10 +12,10 @@ diff -ur libvirt-9.0.0.orig/src/qemu/qemu_command.c libvirt-9.0.0/src/qemu/qemu_ } if (graphics->data.vnc.powerControl != VIR_TRISTATE_BOOL_ABSENT) { -diff -ur libvirt-9.0.0.orig/src/qemu/qemu_conf.c libvirt-9.0.0/src/qemu/qemu_conf.c ---- libvirt-9.0.0.orig/src/qemu/qemu_conf.c 2023-02-08 18:27:57.204025166 +0100 -+++ libvirt-9.0.0/src/qemu/qemu_conf.c 2023-02-08 18:28:12.917022463 +0100 -@@ -444,6 +444,8 @@ +diff -ur libvirt-9.5.0.orig/src/qemu/qemu_conf.c libvirt-9.5.0/src/qemu/qemu_conf.c +--- libvirt-9.5.0.orig/src/qemu/qemu_conf.c 2023-07-20 17:19:16.014948742 +0200 ++++ libvirt-9.5.0/src/qemu/qemu_conf.c 2023-07-20 17:19:30.958162728 +0200 +@@ -443,6 +443,8 @@ return -1; if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0) return -1; @@ -24,9 +24,9 @@ diff -ur libvirt-9.0.0.orig/src/qemu/qemu_conf.c libvirt-9.0.0/src/qemu/qemu_con if (cfg->vncPassword && strlen(cfg->vncPassword) > 8) { -diff -ur libvirt-9.0.0.orig/src/qemu/qemu_conf.h libvirt-9.0.0/src/qemu/qemu_conf.h ---- libvirt-9.0.0.orig/src/qemu/qemu_conf.h 2023-02-08 18:27:57.204025166 +0100 -+++ libvirt-9.0.0/src/qemu/qemu_conf.h 2023-02-08 18:28:12.917022463 +0100 +diff -ur libvirt-9.5.0.orig/src/qemu/qemu_conf.h libvirt-9.5.0/src/qemu/qemu_conf.h +--- libvirt-9.5.0.orig/src/qemu/qemu_conf.h 2023-07-20 17:19:16.014948742 +0200 ++++ libvirt-9.5.0/src/qemu/qemu_conf.h 2023-07-20 17:19:30.958162728 +0200 @@ -119,6 +119,7 @@ bool vncTLSx509verify; bool vncTLSx509verifyPresent; @@ -35,9 +35,9 @@ diff -ur libvirt-9.0.0.orig/src/qemu/qemu_conf.h libvirt-9.0.0/src/qemu/qemu_con char *vncTLSx509certdir; char *vncTLSx509secretUUID; char *vncListen; -diff -ur libvirt-9.0.0.orig/src/qemu/qemu.conf.in libvirt-9.0.0/src/qemu/qemu.conf.in ---- libvirt-9.0.0.orig/src/qemu/qemu.conf.in 2023-02-08 18:27:57.202025167 +0100 -+++ libvirt-9.0.0/src/qemu/qemu.conf.in 2023-02-08 18:28:12.917022463 +0100 +diff -ur libvirt-9.5.0.orig/src/qemu/qemu.conf.in libvirt-9.5.0/src/qemu/qemu.conf.in +--- libvirt-9.5.0.orig/src/qemu/qemu.conf.in 2023-07-20 17:19:16.013948728 +0200 ++++ libvirt-9.5.0/src/qemu/qemu.conf.in 2023-07-20 17:19:30.958162728 +0200 @@ -147,6 +147,15 @@ #vnc_sasl = 1 diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch index 7f34899..178b7ee 100644 --- a/libvirt-sasl.patch +++ b/libvirt-sasl.patch @@ -1,6 +1,6 @@ -diff -ur libvirt-9.0.0.orig/docs/auth.rst libvirt-9.0.0/docs/auth.rst ---- libvirt-9.0.0.orig/docs/auth.rst 2023-02-08 18:26:20.114029939 +0100 -+++ libvirt-9.0.0/docs/auth.rst 2023-02-08 18:26:39.061029574 +0100 +diff -ur libvirt-9.5.0.orig/docs/auth.rst libvirt-9.5.0/docs/auth.rst +--- libvirt-9.5.0.orig/docs/auth.rst 2023-07-20 17:12:02.016734095 +0200 ++++ libvirt-9.5.0/docs/auth.rst 2023-07-20 17:12:35.936219809 +0200 @@ -225,7 +225,7 @@ Since the libvirt SASL config file defaults to using ``GSSAPI`` (Kerberos), a @@ -10,9 +10,9 @@ diff -ur libvirt-9.0.0.orig/docs/auth.rst libvirt-9.0.0/docs/auth.rst parameter to ``scram-sha-256``. **Note:** previous versions of libvirt suggested ``DIGEST-MD5`` and -diff -ur libvirt-9.0.0.orig/src/qemu/qemu.conf.in libvirt-9.0.0/src/qemu/qemu.conf.in ---- libvirt-9.0.0.orig/src/qemu/qemu.conf.in 2023-02-08 18:26:20.202029937 +0100 -+++ libvirt-9.0.0/src/qemu/qemu.conf.in 2023-02-08 18:26:39.062029574 +0100 +diff -ur libvirt-9.5.0.orig/src/qemu/qemu.conf.in libvirt-9.5.0/src/qemu/qemu.conf.in +--- libvirt-9.5.0.orig/src/qemu/qemu.conf.in 2023-07-20 17:12:02.114735498 +0200 ++++ libvirt-9.5.0/src/qemu/qemu.conf.in 2023-07-20 17:12:35.937219824 +0200 @@ -141,18 +141,18 @@ # Examples include vinagre, virt-viewer and virt-manager # itself. UltraVNC, RealVNC, TightVNC do not support this @@ -56,9 +56,9 @@ diff -ur libvirt-9.0.0.orig/src/qemu/qemu.conf.in libvirt-9.0.0/src/qemu/qemu.co # Enable use of TLS encryption on the chardev TCP transports. # -diff -ur libvirt-9.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-9.0.0/src/qemu/test_libvirtd_qemu.aug.in ---- libvirt-9.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2023-02-08 18:26:20.209029937 +0100 -+++ libvirt-9.0.0/src/qemu/test_libvirtd_qemu.aug.in 2023-02-08 18:26:39.062029574 +0100 +diff -ur libvirt-9.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-9.5.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-9.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2023-07-20 17:12:02.121735598 +0200 ++++ libvirt-9.5.0/src/qemu/test_libvirtd_qemu.aug.in 2023-07-20 17:12:35.937219824 +0200 @@ -13,7 +13,7 @@ { "vnc_tls_x509_verify" = "1" } { "vnc_password" = "XYZ12345" } @@ -77,9 +77,9 @@ diff -ur libvirt-9.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-9.0.0/src { "chardev_tls" = "1" } { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" } { "chardev_tls_x509_verify" = "1" } -diff -ur libvirt-9.0.0.orig/src/remote/libvirtd.conf.in libvirt-9.0.0/src/remote/libvirtd.conf.in ---- libvirt-9.0.0.orig/src/remote/libvirtd.conf.in 2023-02-08 18:26:20.209029937 +0100 -+++ libvirt-9.0.0/src/remote/libvirtd.conf.in 2023-02-08 18:26:39.062029574 +0100 +diff -ur libvirt-9.5.0.orig/src/remote/libvirtd.conf.in libvirt-9.5.0/src/remote/libvirtd.conf.in +--- libvirt-9.5.0.orig/src/remote/libvirtd.conf.in 2023-07-20 17:12:02.121735598 +0200 ++++ libvirt-9.5.0/src/remote/libvirtd.conf.in 2023-07-20 17:12:35.937219824 +0200 @@ -140,7 +140,7 @@ # the network providing auth (eg, TLS/x509 certificates) # @@ -98,9 +98,9 @@ diff -ur libvirt-9.0.0.orig/src/remote/libvirtd.conf.in libvirt-9.0.0/src/remote #auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -ur libvirt-9.0.0.orig/src/remote/meson.build libvirt-9.0.0/src/remote/meson.build ---- libvirt-9.0.0.orig/src/remote/meson.build 2023-02-08 18:26:20.209029937 +0100 -+++ libvirt-9.0.0/src/remote/meson.build 2023-02-08 18:26:39.062029574 +0100 +diff -ur libvirt-9.5.0.orig/src/remote/meson.build libvirt-9.5.0/src/remote/meson.build +--- libvirt-9.5.0.orig/src/remote/meson.build 2023-07-20 17:12:02.122735613 +0200 ++++ libvirt-9.5.0/src/remote/meson.build 2023-07-20 17:12:35.937219824 +0200 @@ -302,7 +302,7 @@ if conf.has('WITH_SASL') install_data( @@ -110,90 +110,84 @@ diff -ur libvirt-9.0.0.orig/src/remote/meson.build libvirt-9.0.0/src/remote/meso rename: [ 'libvirt.conf' ], ) endif -diff -ur libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args libvirt-9.0.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args ---- libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args 2023-02-08 18:26:20.343029934 +0100 -+++ libvirt-9.0.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args 2023-02-08 18:26:39.062029574 +0100 +diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args libvirt-9.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args +--- libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args 2023-07-20 17:12:02.331738606 +0200 ++++ libvirt-9.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args 2023-07-20 17:14:44.862065962 +0200 @@ -6,7 +6,7 @@ - XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ - XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ - XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ --SASL_CONF_PATH=/root/.sasl2 \ -+SASL_CONF_PATH=/root/.sasl \ + XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ + XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ + XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +-SASL_CONF_PATH=/etc/sasl2 \ ++SASL_CONF_PATH=/etc/sasl \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -diff -ur libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args libvirt-9.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args ---- libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args 2023-02-08 18:26:20.344029934 +0100 -+++ libvirt-9.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args 2023-02-08 18:26:39.063029574 +0100 +diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args +--- libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args 2023-07-20 17:12:02.332738620 +0200 ++++ libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args 2023-07-20 17:14:33.814907772 +0200 @@ -6,7 +6,7 @@ - XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ - XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ - XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ --SASL_CONF_PATH=/root/.sasl2 \ -+SASL_CONF_PATH=/root/.sasl \ + XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ + XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ + XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +-SASL_CONF_PATH=/etc/sasl2 \ ++SASL_CONF_PATH=/etc/sasl \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -diff -ur libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-9.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args ---- libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2023-02-08 18:26:20.344029934 +0100 -+++ libvirt-9.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2023-02-08 18:26:39.063029574 +0100 +diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args +--- libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2023-07-20 17:12:02.333738634 +0200 ++++ libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2023-07-20 17:14:05.149497298 +0200 @@ -6,7 +6,7 @@ - XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ - XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ - XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ --SASL_CONF_PATH=/root/.sasl2 \ -+SASL_CONF_PATH=/root/.sasl \ + XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ + XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ + XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +-SASL_CONF_PATH=/etc/sasl2 \ ++SASL_CONF_PATH=/etc/sasl \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -diff -ur libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-9.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args ---- libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2023-02-08 18:26:20.344029934 +0100 -+++ libvirt-9.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2023-02-08 18:26:39.063029574 +0100 +diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args +--- libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2023-07-20 17:12:02.333738634 +0200 ++++ libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2023-07-20 17:14:21.221727445 +0200 @@ -6,7 +6,7 @@ - XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ - XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ - XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ --SASL_CONF_PATH=/root/.sasl2 \ -+SASL_CONF_PATH=/root/.sasl \ + XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ + XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ + XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +-SASL_CONF_PATH=/etc/sasl2 \ ++SASL_CONF_PATH=/etc/sasl \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -diff -ur libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-9.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args ---- libvirt-9.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2023-02-08 18:26:20.344029934 +0100 -+++ libvirt-9.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2023-02-08 18:26:39.063029574 +0100 +diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args +--- libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2023-07-20 17:12:02.333738634 +0200 ++++ libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2023-07-20 17:14:26.220799030 +0200 @@ -6,7 +6,7 @@ - XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ - XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ - XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ --SASL_CONF_PATH=/root/.sasl2 \ -+SASL_CONF_PATH=/root/.sasl \ + XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ + XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ + XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +-SASL_CONF_PATH=/etc/sasl2 \ ++SASL_CONF_PATH=/etc/sasl \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -diff -ur libvirt-9.0.0.orig/tests/qemuxml2argvtest.c libvirt-9.0.0/tests/qemuxml2argvtest.c ---- libvirt-9.0.0.orig/tests/qemuxml2argvtest.c 2023-02-08 18:26:20.386029934 +0100 -+++ libvirt-9.0.0/tests/qemuxml2argvtest.c 2023-02-08 18:26:39.064029574 +0100 -@@ -1394,7 +1394,7 @@ +diff -ur libvirt-9.5.0.orig/tests/testutilsqemu.c libvirt-9.5.0/tests/testutilsqemu.c +--- libvirt-9.5.0.orig/tests/testutilsqemu.c 2023-07-20 17:12:02.426739966 +0200 ++++ libvirt-9.5.0/tests/testutilsqemu.c 2023-07-20 17:15:07.460389561 +0200 +@@ -528,9 +528,9 @@ + cfg->backupTLSx509certdir = g_strdup("/etc/pki/libvirt-backup"); - driver.config->vncSASL = 1; - VIR_FREE(driver.config->vncSASLdir); -- driver.config->vncSASLdir = g_strdup("/root/.sasl2"); -+ driver.config->vncSASLdir = g_strdup("/root/.sasl"); - DO_TEST_CAPS_LATEST("graphics-vnc-sasl"); - driver.config->vncTLS = 1; - driver.config->vncTLSx509verify = 1; -@@ -1416,7 +1416,7 @@ - DO_TEST_CAPS_LATEST("graphics-spice"); - DO_TEST_CAPS_LATEST("graphics-spice-no-args"); - driver.config->spiceSASL = 1; -- driver.config->spiceSASLdir = g_strdup("/root/.sasl2"); -+ driver.config->spiceSASLdir = g_strdup("/root/.sasl"); - DO_TEST_CAPS_LATEST("graphics-spice-sasl"); - VIR_FREE(driver.config->spiceSASLdir); - driver.config->spiceSASL = 0; -diff -ur libvirt-9.0.0.orig/tests/virconfdata/libvirtd.conf libvirt-9.0.0/tests/virconfdata/libvirtd.conf ---- libvirt-9.0.0.orig/tests/virconfdata/libvirtd.conf 2023-02-08 18:26:20.464029932 +0100 -+++ libvirt-9.0.0/tests/virconfdata/libvirtd.conf 2023-02-08 18:26:39.064029574 +0100 + VIR_FREE(cfg->vncSASLdir); +- cfg->vncSASLdir = g_strdup("/etc/sasl2"); ++ cfg->vncSASLdir = g_strdup("/etc/sasl"); + VIR_FREE(cfg->spiceSASLdir); +- cfg->spiceSASLdir = g_strdup("/etc/sasl2"); ++ cfg->spiceSASLdir = g_strdup("/etc/sasl"); + + VIR_FREE(cfg->spicePassword); + cfg->spicePassword = g_strdup("123456"); +diff -ur libvirt-9.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-9.5.0/tests/virconfdata/libvirtd.conf +--- libvirt-9.5.0.orig/tests/virconfdata/libvirtd.conf 2023-07-20 17:12:02.518741283 +0200 ++++ libvirt-9.5.0/tests/virconfdata/libvirtd.conf 2023-07-20 17:12:35.944219924 +0200 @@ -91,7 +91,7 @@ # the network providing auth (eg, TLS/x509 certificates) # @@ -212,9 +206,9 @@ diff -ur libvirt-9.0.0.orig/tests/virconfdata/libvirtd.conf libvirt-9.0.0/tests/ auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -ur libvirt-9.0.0.orig/tests/virconfdata/libvirtd.out libvirt-9.0.0/tests/virconfdata/libvirtd.out ---- libvirt-9.0.0.orig/tests/virconfdata/libvirtd.out 2023-02-08 18:26:20.464029932 +0100 -+++ libvirt-9.0.0/tests/virconfdata/libvirtd.out 2023-02-08 18:26:39.075029574 +0100 +diff -ur libvirt-9.5.0.orig/tests/virconfdata/libvirtd.out libvirt-9.5.0/tests/virconfdata/libvirtd.out +--- libvirt-9.5.0.orig/tests/virconfdata/libvirtd.out 2023-07-20 17:12:02.518741283 +0200 ++++ libvirt-9.5.0/tests/virconfdata/libvirtd.out 2023-07-20 17:12:35.945219938 +0200 @@ -73,7 +73,7 @@ # the network providing auth (eg, TLS/x509 certificates) # diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch index 7ae3088..a9c2a12 100644 --- a/libvirt-udevadm-settle.patch +++ b/libvirt-udevadm-settle.patch @@ -1,7 +1,7 @@ -diff -ur libvirt-9.0.0.orig/src/util/virutil.c libvirt-9.0.0/src/util/virutil.c ---- libvirt-9.0.0.orig/src/util/virutil.c 2023-02-08 18:29:14.753010482 +0100 -+++ libvirt-9.0.0/src/util/virutil.c 2023-02-08 18:29:31.336006864 +0100 -@@ -1247,7 +1247,7 @@ +diff -ur libvirt-9.5.0.orig/src/util/virutil.c libvirt-9.5.0/src/util/virutil.c +--- libvirt-9.5.0.orig/src/util/virutil.c 2023-07-20 17:20:08.053693913 +0200 ++++ libvirt-9.5.0/src/util/virutil.c 2023-07-20 17:20:22.422899676 +0200 +@@ -1246,7 +1246,7 @@ if (!(udev = virFindFileInPath(UDEVADM))) return; diff --git a/libvirt.spec b/libvirt.spec index 7d4058c..0524a38 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -25,6 +25,7 @@ %bcond_without polkit # PolicyKit support %bcond_without systemtap # systemtap/dtrace probes %bcond_with wireshark # wireshark dissector module +%bcond_without zfs # ZFS storage support # qemu available only on x86 and ppc %ifnarch %{ix86} %{x8664} ppc @@ -49,12 +50,12 @@ Summary: Toolkit to interact with virtualization capabilities Summary(pl.UTF-8): Narzędzia współpracujące z funkcjami wirtualizacji Name: libvirt -Version: 9.0.0 -Release: 2 +Version: 9.5.0 +Release: 1 License: LGPL v2.1+ Group: Libraries Source0: http://libvirt.org/sources/libvirt-%{version}.tar.xz -# Source0-md5: f0c41217d6dd89ce558465bb3caf6e5c +# Source0-md5: 7b153b9b3f659e951dc183a606e571b5 Source1: libvirtd.init Source2: virtlockd.init Source3: virtlogd.init @@ -68,6 +69,7 @@ Patch1: %{name}-qemu-acl.patch Patch2: %{name}-udevadm-settle.patch Patch3: bashisms.patch Patch4: %{name}-sysctl-dir.patch +Patch5: shebang.patch URL: http://www.libvirt.org/ BuildRequires: acl-devel BuildRequires: attr-devel @@ -123,8 +125,8 @@ BuildRequires: udev-devel >= 1:219 # For disk driver BuildRequires: xorg-lib-libpciaccess-devel >= 0.10.0 BuildRequires: yajl-devel >= 2.0.3 -BuildRequires: zfs -BuildRequires: zfs-devel +%{?with_zfs:BuildRequires: zfs} +%{?with_zfs:BuildRequires: zfs-devel} Requires: curl-libs >= 7.18.0 Requires: device-mapper >= 1.0.0 Requires: libcap-ng >= 0.4.0 @@ -458,6 +460,7 @@ Moduł sekcji Wiresharka do pakietów libvirt. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %meson build \ @@ -509,7 +512,7 @@ Moduł sekcji Wiresharka do pakietów libvirt. -Dstorage_rbd=%{__enabled_disabled ceph} \ -Dstorage_scsi=enabled \ -Dstorage_vstorage=disabled \ - -Dstorage_zfs=enabled \ + -Dstorage_zfs=%{__enabled_disabled zfs} \ -Ddriver_bhyve=disabled \ -Ddriver_ch=%{__enabled_disabled ch} \ -Ddriver_esx=%{__enabled_disabled esx} \ @@ -764,7 +767,7 @@ fi # mpath requires libdevmapper, but libvirt itself requires it too %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_mpath.so %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_scsi.so -%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_zfs.so +%{?with_zfs:%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_zfs.so} %dir %{_libdir}/libvirt/storage-file %attr(755,root,root) %{_libdir}/libvirt/storage-file/libvirt_storage_file_fs.so @@ -889,7 +892,7 @@ fi %endif %attr(755,root,root) %{_bindir}/virt-ssh-helper %attr(754,root,root) %{_libexecdir}/libvirt-guests.sh -%{_libdir}/virt-login-shell-helper +%{_libexecdir}/virt-login-shell-helper %{_mandir}/man1/virsh.1* %{_mandir}/man1/virt-admin.1* %{_mandir}/man1/virt-host-validate.1* @@ -902,6 +905,7 @@ fi %{_mandir}/man1/virt-qemu-run.1* %{_mandir}/man1/virt-qemu-sev-validate.1* %endif +%{_mandir}/man8/libvirt-guests.8* %{_mandir}/man8/virt-ssh-helper.8* %dir %{_datadir}/libvirt/schemas %{_datadir}/libvirt/schemas/basictypes.rng diff --git a/shebang.patch b/shebang.patch new file mode 100644 index 0000000..705e57f --- /dev/null +++ b/shebang.patch @@ -0,0 +1,18 @@ +diff -ur libvirt-9.5.0.orig/tools/virt-qemu-qmp-proxy libvirt-9.5.0/tools/virt-qemu-qmp-proxy +--- libvirt-9.5.0.orig/tools/virt-qemu-qmp-proxy 2023-07-03 12:08:36.000000000 +0200 ++++ libvirt-9.5.0/tools/virt-qemu-qmp-proxy 2023-07-22 13:56:57.493786784 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python3 + + import argparse + import array +diff -ur libvirt-9.5.0.orig/tools/virt-qemu-sev-validate libvirt-9.5.0/tools/virt-qemu-sev-validate +--- libvirt-9.5.0.orig/tools/virt-qemu-sev-validate 2023-07-03 12:08:36.000000000 +0200 ++++ libvirt-9.5.0/tools/virt-qemu-sev-validate 2023-07-22 13:56:53.205725963 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python3 + # + # SPDX-License-Identifier: LGPL-2.1-or-later + # -- 2.46.0