From f461e2e2383f61d90134fc3c2bca84429086a9e3 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 17 Apr 2025 20:31:07 +0200 Subject: [PATCH] - updated to 11.2.0 --- libvirt-qemu-acl.patch | 30 +++++------ libvirt-sasl.patch | 98 ++++++++++++++++-------------------- libvirt-sysctl-dir.patch | 14 +++--- libvirt-udevadm-settle.patch | 8 +-- libvirt.spec | 28 +++++------ 5 files changed, 83 insertions(+), 95 deletions(-) diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch index 67a3abc..f5cc360 100644 --- a/libvirt-qemu-acl.patch +++ b/libvirt-qemu-acl.patch @@ -1,7 +1,7 @@ -diff -ur libvirt-10.2.0.orig/src/qemu/qemu_command.c libvirt-10.2.0/src/qemu/qemu_command.c ---- libvirt-10.2.0.orig/src/qemu/qemu_command.c 2024-04-03 17:49:34.976744165 +0200 -+++ libvirt-10.2.0/src/qemu/qemu_command.c 2024-04-03 17:49:53.468991419 +0200 -@@ -8201,6 +8201,10 @@ +diff -ur libvirt-11.2.0.orig/src/qemu/qemu_command.c libvirt-11.2.0/src/qemu/qemu_command.c +--- libvirt-11.2.0.orig/src/qemu/qemu_command.c 2025-04-17 13:04:43.582189665 +0200 ++++ libvirt-11.2.0/src/qemu/qemu_command.c 2025-04-17 13:05:03.554238004 +0200 +@@ -8207,6 +8207,10 @@ virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir); /* TODO: Support ACLs later */ @@ -12,10 +12,10 @@ diff -ur libvirt-10.2.0.orig/src/qemu/qemu_command.c libvirt-10.2.0/src/qemu/qem } if (graphics->data.vnc.powerControl != VIR_TRISTATE_BOOL_ABSENT) { -diff -ur libvirt-10.2.0.orig/src/qemu/qemu_conf.c libvirt-10.2.0/src/qemu/qemu_conf.c ---- libvirt-10.2.0.orig/src/qemu/qemu_conf.c 2024-04-03 17:49:34.976744165 +0200 -+++ libvirt-10.2.0/src/qemu/qemu_conf.c 2024-04-03 17:49:53.472991473 +0200 -@@ -441,6 +441,8 @@ +diff -ur libvirt-11.2.0.orig/src/qemu/qemu_conf.c libvirt-11.2.0/src/qemu/qemu_conf.c +--- libvirt-11.2.0.orig/src/qemu/qemu_conf.c 2025-04-17 13:04:43.582189665 +0200 ++++ libvirt-11.2.0/src/qemu/qemu_conf.c 2025-04-17 13:05:03.554238004 +0200 +@@ -490,6 +490,8 @@ return -1; if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0) return -1; @@ -24,10 +24,10 @@ diff -ur libvirt-10.2.0.orig/src/qemu/qemu_conf.c libvirt-10.2.0/src/qemu/qemu_c if (cfg->vncPassword && strlen(cfg->vncPassword) > 8) { -diff -ur libvirt-10.2.0.orig/src/qemu/qemu_conf.h libvirt-10.2.0/src/qemu/qemu_conf.h ---- libvirt-10.2.0.orig/src/qemu/qemu_conf.h 2024-04-03 17:49:34.980744218 +0200 -+++ libvirt-10.2.0/src/qemu/qemu_conf.h 2024-04-03 17:49:53.472991473 +0200 -@@ -120,6 +120,7 @@ +diff -ur libvirt-11.2.0.orig/src/qemu/qemu_conf.h libvirt-11.2.0/src/qemu/qemu_conf.h +--- libvirt-11.2.0.orig/src/qemu/qemu_conf.h 2025-04-17 13:04:43.582189665 +0200 ++++ libvirt-11.2.0/src/qemu/qemu_conf.h 2025-04-17 13:05:03.554238004 +0200 +@@ -123,6 +123,7 @@ bool vncTLSx509verify; bool vncTLSx509verifyPresent; bool vncSASL; @@ -35,9 +35,9 @@ diff -ur libvirt-10.2.0.orig/src/qemu/qemu_conf.h libvirt-10.2.0/src/qemu/qemu_c char *vncTLSx509certdir; char *vncTLSx509secretUUID; char *vncListen; -diff -ur libvirt-10.2.0.orig/src/qemu/qemu.conf.in libvirt-10.2.0/src/qemu/qemu.conf.in ---- libvirt-10.2.0.orig/src/qemu/qemu.conf.in 2024-04-03 17:49:34.976744165 +0200 -+++ libvirt-10.2.0/src/qemu/qemu.conf.in 2024-04-03 17:49:53.472991473 +0200 +diff -ur libvirt-11.2.0.orig/src/qemu/qemu.conf.in libvirt-11.2.0/src/qemu/qemu.conf.in +--- libvirt-11.2.0.orig/src/qemu/qemu.conf.in 2025-04-17 13:04:43.578189656 +0200 ++++ libvirt-11.2.0/src/qemu/qemu.conf.in 2025-04-17 13:05:03.554238004 +0200 @@ -147,6 +147,15 @@ #vnc_sasl = 1 diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch index 2f23a6b..3c2b282 100644 --- a/libvirt-sasl.patch +++ b/libvirt-sasl.patch @@ -1,6 +1,6 @@ -diff -ur libvirt-10.2.0.orig/docs/auth.rst libvirt-10.2.0/docs/auth.rst ---- libvirt-10.2.0.orig/docs/auth.rst 2024-04-03 17:45:03.261111129 +0200 -+++ libvirt-10.2.0/docs/auth.rst 2024-04-03 17:45:24.393393683 +0200 +diff -ur libvirt-11.2.0.orig/docs/auth.rst libvirt-11.2.0/docs/auth.rst +--- libvirt-11.2.0.orig/docs/auth.rst 2025-04-17 13:00:43.793609374 +0200 ++++ libvirt-11.2.0/docs/auth.rst 2025-04-17 13:01:33.233728984 +0200 @@ -225,7 +225,7 @@ Since the libvirt SASL config file defaults to using ``GSSAPI`` (Kerberos), a @@ -10,9 +10,9 @@ diff -ur libvirt-10.2.0.orig/docs/auth.rst libvirt-10.2.0/docs/auth.rst parameter to ``scram-sha-256``. **Note:** previous versions of libvirt suggested ``DIGEST-MD5`` and -diff -ur libvirt-10.2.0.orig/src/qemu/qemu.conf.in libvirt-10.2.0/src/qemu/qemu.conf.in ---- libvirt-10.2.0.orig/src/qemu/qemu.conf.in 2024-04-03 17:45:03.365112520 +0200 -+++ libvirt-10.2.0/src/qemu/qemu.conf.in 2024-04-03 17:45:24.457394538 +0200 +diff -ur libvirt-11.2.0.orig/src/qemu/qemu.conf.in libvirt-11.2.0/src/qemu/qemu.conf.in +--- libvirt-11.2.0.orig/src/qemu/qemu.conf.in 2025-04-17 13:00:43.849609509 +0200 ++++ libvirt-11.2.0/src/qemu/qemu.conf.in 2025-04-17 13:01:33.233728984 +0200 @@ -141,18 +141,18 @@ # Examples include vinagre, virt-viewer and virt-manager # itself. UltraVNC, RealVNC, TightVNC do not support this @@ -54,11 +54,11 @@ diff -ur libvirt-10.2.0.orig/src/qemu/qemu.conf.in libvirt-10.2.0/src/qemu/qemu. -#spice_sasl_dir = "/some/directory/sasl2" +#spice_sasl_dir = "/some/directory/sasl" - # Enable use of TLS encryption on the chardev TCP transports. - # -diff -ur libvirt-10.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-10.2.0/src/qemu/test_libvirtd_qemu.aug.in ---- libvirt-10.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2024-04-03 17:45:03.369112573 +0200 -+++ libvirt-10.2.0/src/qemu/test_libvirtd_qemu.aug.in 2024-04-03 17:45:24.457394538 +0200 + # RDP is configured to listen on 127.0.0.1 by default. + # To make it listen on all public interfaces, uncomment +diff -ur libvirt-11.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-11.2.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-11.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2025-04-17 13:00:43.853609519 +0200 ++++ libvirt-11.2.0/src/qemu/test_libvirtd_qemu.aug.in 2025-04-17 13:02:36.781882769 +0200 @@ -13,7 +13,7 @@ { "vnc_tls_x509_verify" = "1" } { "vnc_password" = "XYZ12345" } @@ -74,12 +74,12 @@ diff -ur libvirt-10.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-10.2.0/s { "spice_sasl" = "1" } -{ "spice_sasl_dir" = "/some/directory/sasl2" } +{ "spice_sasl_dir" = "/some/directory/sasl" } - { "chardev_tls" = "1" } - { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" } - { "chardev_tls_x509_verify" = "1" } -diff -ur libvirt-10.2.0.orig/src/remote/libvirtd.conf.in libvirt-10.2.0/src/remote/libvirtd.conf.in ---- libvirt-10.2.0.orig/src/remote/libvirtd.conf.in 2024-04-03 17:45:03.369112573 +0200 -+++ libvirt-10.2.0/src/remote/libvirtd.conf.in 2024-04-03 17:45:24.457394538 +0200 + { "rdp_listen" = "0.0.0.0" } + { "rdp_tls_x509_cert_dir" = "/etc/pki/libvirt-rdp" } + { "rdp_username" = "user" } +diff -ur libvirt-11.2.0.orig/src/remote/libvirtd.conf.in libvirt-11.2.0/src/remote/libvirtd.conf.in +--- libvirt-11.2.0.orig/src/remote/libvirtd.conf.in 2025-04-17 13:00:43.853609519 +0200 ++++ libvirt-11.2.0/src/remote/libvirtd.conf.in 2025-04-17 13:01:33.233728984 +0200 @@ -140,7 +140,7 @@ # the network providing auth (eg, TLS/x509 certificates) # @@ -98,10 +98,10 @@ diff -ur libvirt-10.2.0.orig/src/remote/libvirtd.conf.in libvirt-10.2.0/src/remo #auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -ur libvirt-10.2.0.orig/src/remote/meson.build libvirt-10.2.0/src/remote/meson.build ---- libvirt-10.2.0.orig/src/remote/meson.build 2024-04-03 17:45:03.369112573 +0200 -+++ libvirt-10.2.0/src/remote/meson.build 2024-04-03 17:45:24.457394538 +0200 -@@ -328,7 +328,7 @@ +diff -ur libvirt-11.2.0.orig/src/remote/meson.build libvirt-11.2.0/src/remote/meson.build +--- libvirt-11.2.0.orig/src/remote/meson.build 2025-04-17 13:00:43.853609519 +0200 ++++ libvirt-11.2.0/src/remote/meson.build 2025-04-17 13:01:33.233728984 +0200 +@@ -338,7 +338,7 @@ if conf.has('WITH_SASL') install_data( 'libvirtd.sasl', @@ -110,21 +110,9 @@ diff -ur libvirt-10.2.0.orig/src/remote/meson.build libvirt-10.2.0/src/remote/me rename: [ 'libvirt.conf' ], ) endif -diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args ---- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args 2024-04-03 17:45:03.593115568 +0200 -+++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args 2024-04-03 17:47:10.346810356 +0200 -@@ -6,7 +6,7 @@ - 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-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args ---- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args 2024-04-03 17:45:03.597115621 +0200 -+++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args 2024-04-03 17:47:02.230701838 +0200 +diff -ur libvirt-11.2.0.orig/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args libvirt-11.2.0/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args +--- libvirt-11.2.0.orig/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args 2025-04-17 13:00:43.985609838 +0200 ++++ libvirt-11.2.0/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args 2025-04-17 13:01:33.233728984 +0200 @@ -6,7 +6,7 @@ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ @@ -134,9 +122,9 @@ diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-late /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args ---- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2024-04-03 17:45:03.597115621 +0200 -+++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2024-04-03 17:47:06.658761044 +0200 +diff -ur libvirt-11.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args libvirt-11.2.0/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args +--- libvirt-11.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args 2025-04-17 13:00:43.989609848 +0200 ++++ libvirt-11.2.0/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args 2025-04-17 13:01:33.233728984 +0200 @@ -6,7 +6,7 @@ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ @@ -146,9 +134,9 @@ diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_6 /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args ---- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args 2024-04-03 17:45:03.597115621 +0200 -+++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args 2024-04-03 17:47:16.594893897 +0200 +diff -ur libvirt-11.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-11.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args +--- libvirt-11.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args 2025-04-17 13:00:43.989609848 +0200 ++++ libvirt-11.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args 2025-04-17 13:01:35.525734530 +0200 @@ -6,7 +6,7 @@ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ @@ -158,9 +146,9 @@ diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_6 /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args ---- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args 2024-04-03 17:45:03.597115621 +0200 -+++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args 2024-04-03 17:47:13.522852821 +0200 +diff -ur libvirt-11.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args libvirt-11.2.0/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args +--- libvirt-11.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args 2025-04-17 13:00:43.989609848 +0200 ++++ libvirt-11.2.0/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args 2025-04-17 13:01:35.525734530 +0200 @@ -6,7 +6,7 @@ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ @@ -170,10 +158,10 @@ diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-lates /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -diff -ur libvirt-10.2.0.orig/tests/testutilsqemu.c libvirt-10.2.0/tests/testutilsqemu.c ---- libvirt-10.2.0.orig/tests/testutilsqemu.c 2024-04-03 17:45:03.705117066 +0200 -+++ libvirt-10.2.0/tests/testutilsqemu.c 2024-04-03 17:45:28.901453959 +0200 -@@ -387,9 +387,9 @@ +diff -ur libvirt-11.2.0.orig/tests/testutilsqemu.c libvirt-11.2.0/tests/testutilsqemu.c +--- libvirt-11.2.0.orig/tests/testutilsqemu.c 2025-04-17 13:00:44.045609984 +0200 ++++ libvirt-11.2.0/tests/testutilsqemu.c 2025-04-17 13:01:35.525734530 +0200 +@@ -402,9 +402,9 @@ cfg->backupTLSx509certdir = g_strdup("/etc/pki/libvirt-backup"); VIR_FREE(cfg->vncSASLdir); @@ -185,9 +173,9 @@ diff -ur libvirt-10.2.0.orig/tests/testutilsqemu.c libvirt-10.2.0/tests/testutil VIR_FREE(cfg->spicePassword); cfg->spicePassword = g_strdup("123456"); -diff -ur libvirt-10.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-10.2.0/tests/virconfdata/libvirtd.conf ---- libvirt-10.2.0.orig/tests/virconfdata/libvirtd.conf 2024-04-03 17:45:03.905119740 +0200 -+++ libvirt-10.2.0/tests/virconfdata/libvirtd.conf 2024-04-03 17:45:28.929454333 +0200 +diff -ur libvirt-11.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-11.2.0/tests/virconfdata/libvirtd.conf +--- libvirt-11.2.0.orig/tests/virconfdata/libvirtd.conf 2025-04-17 13:00:44.281610554 +0200 ++++ libvirt-11.2.0/tests/virconfdata/libvirtd.conf 2025-04-17 13:01:35.525734530 +0200 @@ -91,7 +91,7 @@ # the network providing auth (eg, TLS/x509 certificates) # @@ -206,9 +194,9 @@ diff -ur libvirt-10.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-10.2.0/test auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -ur libvirt-10.2.0.orig/tests/virconfdata/libvirtd.out libvirt-10.2.0/tests/virconfdata/libvirtd.out ---- libvirt-10.2.0.orig/tests/virconfdata/libvirtd.out 2024-04-03 17:45:03.905119740 +0200 -+++ libvirt-10.2.0/tests/virconfdata/libvirtd.out 2024-04-03 17:45:28.929454333 +0200 +diff -ur libvirt-11.2.0.orig/tests/virconfdata/libvirtd.out libvirt-11.2.0/tests/virconfdata/libvirtd.out +--- libvirt-11.2.0.orig/tests/virconfdata/libvirtd.out 2025-04-17 13:00:44.281610554 +0200 ++++ libvirt-11.2.0/tests/virconfdata/libvirtd.out 2025-04-17 13:01:35.525734530 +0200 @@ -73,7 +73,7 @@ # the network providing auth (eg, TLS/x509 certificates) # diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch index 6210c3f..a0acea4 100644 --- a/libvirt-sysctl-dir.patch +++ b/libvirt-sysctl-dir.patch @@ -1,7 +1,7 @@ -diff -ur libvirt-10.2.0.orig/src/qemu/meson.build libvirt-10.2.0/src/qemu/meson.build ---- libvirt-10.2.0.orig/src/qemu/meson.build 2024-04-03 17:51:45.090484121 +0200 -+++ libvirt-10.2.0/src/qemu/meson.build 2024-04-03 17:52:00.894695514 +0200 -@@ -212,7 +212,7 @@ +diff -ur libvirt-11.2.0.orig/src/qemu/meson.build libvirt-11.2.0/src/qemu/meson.build +--- libvirt-11.2.0.orig/src/qemu/meson.build 2025-04-17 13:07:08.510540390 +0200 ++++ libvirt-11.2.0/src/qemu/meson.build 2025-04-17 13:07:20.274568858 +0200 +@@ -214,7 +214,7 @@ if conf.has('WITH_USERFAULTFD_SYSCTL') install_data( 'postcopy-migration.sysctl', @@ -10,9 +10,9 @@ diff -ur libvirt-10.2.0.orig/src/qemu/meson.build libvirt-10.2.0/src/qemu/meson. rename: [ '60-qemu-postcopy-migration.conf' ], ) endif -diff -ur libvirt-10.2.0.orig/src/remote/meson.build libvirt-10.2.0/src/remote/meson.build ---- libvirt-10.2.0.orig/src/remote/meson.build 2024-04-03 17:51:45.098484228 +0200 -+++ libvirt-10.2.0/src/remote/meson.build 2024-04-03 17:52:00.894695514 +0200 +diff -ur libvirt-11.2.0.orig/src/remote/meson.build libvirt-11.2.0/src/remote/meson.build +--- libvirt-11.2.0.orig/src/remote/meson.build 2025-04-17 13:07:08.514540399 +0200 ++++ libvirt-11.2.0/src/remote/meson.build 2025-04-17 13:07:20.278568868 +0200 @@ -284,11 +284,9 @@ endforeach diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch index 83014cc..f086cb2 100644 --- a/libvirt-udevadm-settle.patch +++ b/libvirt-udevadm-settle.patch @@ -1,7 +1,7 @@ -diff -ur libvirt-10.2.0.orig/src/util/virutil.c libvirt-10.2.0/src/util/virutil.c ---- libvirt-10.2.0.orig/src/util/virutil.c 2024-04-03 17:50:30.809490688 +0200 -+++ libvirt-10.2.0/src/util/virutil.c 2024-04-03 17:50:43.373658680 +0200 -@@ -1322,7 +1322,7 @@ +diff -ur libvirt-11.2.0.orig/src/util/virutil.c libvirt-11.2.0/src/util/virutil.c +--- libvirt-11.2.0.orig/src/util/virutil.c 2025-04-17 13:05:53.698359342 +0200 ++++ libvirt-11.2.0/src/util/virutil.c 2025-04-17 13:06:12.230404190 +0200 +@@ -1332,7 +1332,7 @@ if (!(udev = virFindFileInPath(UDEVADM))) return; diff --git a/libvirt.spec b/libvirt.spec index bf7c0db..9eb508d 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -56,12 +56,12 @@ Summary: Toolkit to interact with virtualization capabilities Summary(pl.UTF-8): Narzędzia współpracujące z funkcjami wirtualizacji Name: libvirt -Version: 11.0.0 +Version: 11.2.0 Release: 1 License: LGPL v2.1+ Group: Libraries Source0: https://download.libvirt.org/libvirt-%{version}.tar.xz -# Source0-md5: ab57ae4b9d099dd015ff6299132238a4 +# Source0-md5: 19766394b91d1c1f08432607aebe3ced Source1: libvirtd.init Source2: virtlockd.init Source3: virtlogd.init @@ -529,11 +529,11 @@ Moduł sekcji Wiresharka do pakietów libvirt. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 %if %{with static_libs} %{__sed} -i '/^libvirt\(_admin\|_lxc\|_qemu\)\?_lib = / s/shared_library/library/' src/meson.build @@ -819,8 +819,8 @@ fi %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 %{?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 +#%dir %{_libdir}/libvirt/storage-file +#%attr(755,root,root) %{_libdir}/libvirt/storage-file/libvirt_storage_file_fs.so %{_datadir}/augeas/lenses/libvirt_lockd.aug %{_datadir}/augeas/lenses/libvirtd.aug %{_datadir}/augeas/lenses/libvirtd_network.aug @@ -869,8 +869,8 @@ fi %attr(711,root,root) %dir /var/lib/libvirt/filesystems %attr(700,root,root) %dir /var/log/libvirt %attr(711,root,root) %dir /var/cache/libvirt -%dir /var/run/libvirt -%dir /var/run/libvirt/network +#%dir /var/run/libvirt +#%dir /var/run/libvirt/network %if %{with glusterfs} %files daemon-storage-gluster @@ -910,7 +910,7 @@ fi %{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug %{_datadir}/augeas/lenses/tests/test_virtxend.aug %attr(700,root,root) %dir /var/lib/libvirt/libxl -%attr(700,root,root) %dir /var/run/libvirt/libxl +#%attr(700,root,root) %dir /var/run/libvirt/libxl %attr(700,root,root) %dir /var/log/libvirt/libxl %{_mandir}/man8/virtxend.8* %endif @@ -933,7 +933,7 @@ fi %{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug %{_datadir}/augeas/lenses/tests/test_virtlxcd.aug %attr(700,root,root) %dir /var/lib/libvirt/lxc -%attr(700,root,root) %dir /var/run/libvirt/lxc +#%attr(700,root,root) %dir /var/run/libvirt/lxc %attr(700,root,root) %dir /var/log/libvirt/lxc %{_mandir}/man8/virtlxcd.8* %endif @@ -959,7 +959,7 @@ fi %attr(750,qemu,qemu) %dir /var/cache/libvirt/qemu %attr(750,qemu,qemu) %dir /var/lib/libvirt/qemu %attr(700,root,root) %dir /var/log/libvirt/qemu -%attr(700,root,root) %dir /var/run/libvirt/qemu +#%attr(700,root,root) %dir /var/run/libvirt/qemu %config(noreplace) %verify(not md5 mtime size) /etc/sysctl.d/60-qemu-postcopy-migration.conf %{_mandir}/man8/virtqemud.8* %endif -- 2.49.0