From 3e36cfaeb430c9abf7b9a6b93d92661d49120ce4 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Sat, 2 Jan 2021 13:34:22 +0100
Subject: [PATCH] - updated to 6.10.0, now uses meson for building
---
libvirt-qemu-acl.patch | 32 ++---
libvirt-sasl.patch | 132 ++++++++---------
libvirt-sysctl-dir.patch | 38 ++---
libvirt-udevadm-settle.patch | 8 +-
libvirt.spec | 267 +++++++++++++----------------------
5 files changed, 196 insertions(+), 281 deletions(-)
diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 03959ac..3ea5678 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -ur libvirt-6.1.0.orig/src/qemu/qemu.conf libvirt-6.1.0/src/qemu/qemu.conf
---- libvirt-6.1.0.orig/src/qemu/qemu.conf 2020-03-06 09:49:35.413000000 +0100
-+++ libvirt-6.1.0/src/qemu/qemu.conf 2020-03-06 09:50:04.229000000 +0100
-@@ -141,6 +141,15 @@
+diff -ur libvirt-6.10.0.orig/src/qemu/qemu.conf libvirt-6.10.0/src/qemu/qemu.conf
+--- libvirt-6.10.0.orig/src/qemu/qemu.conf 2021-01-01 20:40:17.379692686 +0100
++++ libvirt-6.10.0/src/qemu/qemu.conf 2021-01-01 20:40:45.381692686 +0100
+@@ -147,6 +147,15 @@
#vnc_sasl = 1
@@ -17,10 +17,10 @@ diff -ur libvirt-6.1.0.orig/src/qemu/qemu.conf libvirt-6.1.0/src/qemu/qemu.conf
# The default SASL configuration file is located in /etc/sasl/
# When running libvirtd unprivileged, it may be desirable to
# override the configs in this location. Set this parameter to
-diff -ur libvirt-6.1.0.orig/src/qemu/qemu_command.c libvirt-6.1.0/src/qemu/qemu_command.c
---- libvirt-6.1.0.orig/src/qemu/qemu_command.c 2020-03-06 09:49:35.413000000 +0100
-+++ libvirt-6.1.0/src/qemu/qemu_command.c 2020-03-06 09:50:04.230000000 +0100
-@@ -7569,6 +7569,10 @@
+diff -ur libvirt-6.10.0.orig/src/qemu/qemu_command.c libvirt-6.10.0/src/qemu/qemu_command.c
+--- libvirt-6.10.0.orig/src/qemu/qemu_command.c 2021-01-01 20:40:17.375692686 +0100
++++ libvirt-6.10.0/src/qemu/qemu_command.c 2021-01-01 20:40:45.382692686 +0100
+@@ -7597,6 +7597,10 @@
virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
/* TODO: Support ACLs later */
@@ -31,10 +31,10 @@ diff -ur libvirt-6.1.0.orig/src/qemu/qemu_command.c libvirt-6.1.0/src/qemu/qemu_
}
virCommandAddArg(cmd, "-vnc");
-diff -ur libvirt-6.1.0.orig/src/qemu/qemu_conf.c libvirt-6.1.0/src/qemu/qemu_conf.c
---- libvirt-6.1.0.orig/src/qemu/qemu_conf.c 2020-03-06 09:49:35.410000000 +0100
-+++ libvirt-6.1.0/src/qemu/qemu_conf.c 2020-03-06 09:50:04.230000000 +0100
-@@ -428,6 +428,8 @@
+diff -ur libvirt-6.10.0.orig/src/qemu/qemu_conf.c libvirt-6.10.0/src/qemu/qemu_conf.c
+--- libvirt-6.10.0.orig/src/qemu/qemu_conf.c 2021-01-01 20:40:17.375692686 +0100
++++ libvirt-6.10.0/src/qemu/qemu_conf.c 2021-01-01 20:40:45.382692686 +0100
+@@ -446,6 +446,8 @@
return -1;
if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
return -1;
@@ -43,10 +43,10 @@ diff -ur libvirt-6.1.0.orig/src/qemu/qemu_conf.c libvirt-6.1.0/src/qemu/qemu_con
return 0;
}
-diff -ur libvirt-6.1.0.orig/src/qemu/qemu_conf.h libvirt-6.1.0/src/qemu/qemu_conf.h
---- libvirt-6.1.0.orig/src/qemu/qemu_conf.h 2020-03-06 09:49:35.409000000 +0100
-+++ libvirt-6.1.0/src/qemu/qemu_conf.h 2020-03-06 09:50:04.230000000 +0100
-@@ -118,6 +118,7 @@
+diff -ur libvirt-6.10.0.orig/src/qemu/qemu_conf.h libvirt-6.10.0/src/qemu/qemu_conf.h
+--- libvirt-6.10.0.orig/src/qemu/qemu_conf.h 2021-01-01 20:40:17.375692686 +0100
++++ libvirt-6.10.0/src/qemu/qemu_conf.h 2021-01-01 20:40:45.383692686 +0100
+@@ -116,6 +116,7 @@
bool vncTLSx509verify;
bool vncTLSx509verifyPresent;
bool vncSASL;
diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 1ebc932..88ef7aa 100644
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,31 +1,19 @@
-diff -ur libvirt-6.1.0.orig/docs/auth.html.in libvirt-6.1.0/docs/auth.html.in
---- libvirt-6.1.0.orig/docs/auth.html.in 2020-03-06 09:47:34.102000000 +0100
-+++ libvirt-6.1.0/docs/auth.html.in 2020-03-06 09:48:38.900000000 +0100
-@@ -275,7 +275,7 @@
+diff -ur libvirt-6.10.0.orig/docs/auth.html.in libvirt-6.10.0/docs/auth.html.in
+--- libvirt-6.10.0.orig/docs/auth.html.in 2021-01-02 12:52:25.742090801 +0100
++++ libvirt-6.10.0/docs/auth.html.in 2021-01-02 12:52:59.973090801 +0100
+@@ -277,7 +277,7 @@
<p>
Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
config change is required to enable plain password auth. This is done by
--editting <code>/etc/sasl2/libvirt.conf</code> to set the <code>mech_list</code>
-+editting <code>/etc/sasl/libvirt.conf</code> to set the <code>mech_list</code>
+-editing <code>/etc/sasl2/libvirt.conf</code> to set the <code>mech_list</code>
++editing <code>/etc/sasl/libvirt.conf</code> to set the <code>mech_list</code>
parameter to <code>scram-sha-1</code>.
</p>
<p>
-diff -ur libvirt-6.1.0.orig/src/Makefile.in libvirt-6.1.0/src/Makefile.in
---- libvirt-6.1.0.orig/src/Makefile.in 2020-03-06 09:47:34.051000000 +0100
-+++ libvirt-6.1.0/src/Makefile.in 2020-03-06 09:47:52.660000000 +0100
-@@ -6273,7 +6273,7 @@
-
- # This is needed for clients too, so can't wrap in
- # the WITH_LIBVIRTD conditional
--@WITH_SASL_TRUE@sasldir = $(sysconfdir)/sasl2
-+@WITH_SASL_TRUE@sasldir = $(sysconfdir)/sasl
- LIBVIRTD_UNIT_VARS = \
- $(COMMON_UNIT_VARS) \
- -e 's|[@]name[@]|Libvirt|g' \
-diff -ur libvirt-6.1.0.orig/src/qemu/qemu.conf libvirt-6.1.0/src/qemu/qemu.conf
---- libvirt-6.1.0.orig/src/qemu/qemu.conf 2020-03-06 09:47:34.078000000 +0100
-+++ libvirt-6.1.0/src/qemu/qemu.conf 2020-03-06 09:47:52.660000000 +0100
-@@ -135,18 +135,18 @@
+diff -ur libvirt-6.10.0.orig/src/qemu/qemu.conf libvirt-6.10.0/src/qemu/qemu.conf
+--- libvirt-6.10.0.orig/src/qemu/qemu.conf 2021-01-02 12:52:25.824090801 +0100
++++ libvirt-6.10.0/src/qemu/qemu.conf 2021-01-02 12:52:59.974090801 +0100
+@@ -141,18 +141,18 @@
# Examples include vinagre, virt-viewer and virt-manager
# itself. UltraVNC, RealVNC, TightVNC do not support this
#
@@ -47,7 +35,7 @@ diff -ur libvirt-6.1.0.orig/src/qemu/qemu.conf libvirt-6.1.0/src/qemu/qemu.conf
# QEMU implements an extension for providing audio over a VNC connection,
-@@ -211,17 +211,17 @@
+@@ -217,17 +217,17 @@
# Enable use of SASL encryption on the SPICE server. This requires
# a SPICE client which supports the SASL protocol extension.
#
@@ -68,9 +56,9 @@ diff -ur libvirt-6.1.0.orig/src/qemu/qemu.conf libvirt-6.1.0/src/qemu/qemu.conf
# Enable use of TLS encryption on the chardev TCP transports.
#
-diff -ur libvirt-6.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-6.1.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-6.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2020-03-06 09:47:34.077000000 +0100
-+++ libvirt-6.1.0/src/qemu/test_libvirtd_qemu.aug.in 2020-03-06 09:47:52.661000000 +0100
+diff -ur libvirt-6.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-6.10.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-6.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2021-01-02 12:52:25.830090801 +0100
++++ libvirt-6.10.0/src/qemu/test_libvirtd_qemu.aug.in 2021-01-02 12:52:59.974090801 +0100
@@ -13,7 +13,7 @@
{ "vnc_tls_x509_verify" = "1" }
{ "vnc_password" = "XYZ12345" }
@@ -89,22 +77,10 @@ diff -ur libvirt-6.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-6.1.0/src
{ "chardev_tls" = "1" }
{ "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
{ "chardev_tls_x509_verify" = "1" }
-diff -ur libvirt-6.1.0.orig/src/remote/Makefile.inc.am libvirt-6.1.0/src/remote/Makefile.inc.am
---- libvirt-6.1.0.orig/src/remote/Makefile.inc.am 2020-03-06 09:47:34.063000000 +0100
-+++ libvirt-6.1.0/src/remote/Makefile.inc.am 2020-03-06 09:47:52.661000000 +0100
-@@ -382,7 +382,7 @@
- # This is needed for clients too, so can't wrap in
- # the WITH_LIBVIRTD conditional
- if WITH_SASL
--sasldir = $(sysconfdir)/sasl2
-+sasldir = $(sysconfdir)/sasl
-
- install-sasl:
- $(MKDIR_P) $(DESTDIR)$(sasldir)
-diff -ur libvirt-6.1.0.orig/src/remote/libvirtd.conf.in libvirt-6.1.0/src/remote/libvirtd.conf.in
---- libvirt-6.1.0.orig/src/remote/libvirtd.conf.in 2020-03-06 09:47:34.063000000 +0100
-+++ libvirt-6.1.0/src/remote/libvirtd.conf.in 2020-03-06 09:47:52.661000000 +0100
-@@ -134,7 +134,7 @@
+diff -ur libvirt-6.10.0.orig/src/remote/libvirtd.conf.in libvirt-6.10.0/src/remote/libvirtd.conf.in
+--- libvirt-6.10.0.orig/src/remote/libvirtd.conf.in 2021-01-02 12:52:25.830090801 +0100
++++ libvirt-6.10.0/src/remote/libvirtd.conf.in 2021-01-02 12:52:59.975090801 +0100
+@@ -136,7 +136,7 @@
# the network providing auth (eg, TLS/x509 certificates)
#
# - sasl: use SASL infrastructure. The actual auth scheme is then
@@ -113,7 +89,7 @@ diff -ur libvirt-6.1.0.orig/src/remote/libvirtd.conf.in libvirt-6.1.0/src/remote
# socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
# For non-TCP or TLS sockets, any scheme is allowed.
#
-@@ -166,7 +166,7 @@
+@@ -186,7 +186,7 @@
# If you don't enable SASL, then all TCP traffic is cleartext.
# Don't do this outside of a dev/test scenario. For real world
# use, always enable SASL and use the GSSAPI or DIGEST-MD5
@@ -122,9 +98,21 @@ diff -ur libvirt-6.1.0.orig/src/remote/libvirtd.conf.in libvirt-6.1.0/src/remote
#auth_tcp = "sasl"
# Change the authentication scheme for TLS sockets.
-diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2020-03-06 09:47:33.713000000 +0100
-+++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2020-03-06 09:47:52.661000000 +0100
+diff -ur libvirt-6.10.0.orig/src/remote/meson.build libvirt-6.10.0/src/remote/meson.build
+--- libvirt-6.10.0.orig/src/remote/meson.build 2021-01-02 12:52:25.831090801 +0100
++++ libvirt-6.10.0/src/remote/meson.build 2021-01-02 12:53:19.602090801 +0100
+@@ -309,7 +309,7 @@
+ if conf.has('WITH_SASL')
+ install_data(
+ 'libvirtd.sasl',
+- install_dir: sysconfdir / 'sasl2',
++ install_dir: sysconfdir / 'sasl',
+ rename: [ 'libvirt.conf' ],
+ )
+ endif
+diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-6.10.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
+--- libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2021-01-02 12:52:25.975090801 +0100
++++ libvirt-6.10.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2021-01-02 12:52:59.975090801 +0100
@@ -6,7 +6,7 @@
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -134,9 +122,9 @@ diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libv
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2020-03-06 09:47:33.722000000 +0100
-+++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2020-03-06 09:47:52.662000000 +0100
+diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+--- libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2021-01-02 12:52:25.976090801 +0100
++++ libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2021-01-02 12:52:59.975090801 +0100
@@ -6,7 +6,7 @@
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -146,9 +134,9 @@ diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvir
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
---- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2020-03-06 09:47:33.722000000 +0100
-+++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2020-03-06 09:47:52.662000000 +0100
+diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+--- libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2021-01-02 12:52:25.976090801 +0100
++++ libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2021-01-02 12:52:59.975090801 +0100
@@ -6,7 +6,7 @@
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -158,9 +146,9 @@ diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_6
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2020-03-06 09:47:33.713000000 +0100
-+++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2020-03-06 09:47:52.663000000 +0100
+diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
+--- libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2021-01-02 12:52:25.976090801 +0100
++++ libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2021-01-02 12:52:59.975090801 +0100
@@ -6,7 +6,7 @@
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -170,9 +158,9 @@ diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
---- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2020-03-06 09:47:33.718000000 +0100
-+++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2020-03-06 09:47:52.663000000 +0100
+diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
+--- libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2021-01-02 12:52:25.976090801 +0100
++++ libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2021-01-02 12:52:59.976090801 +0100
@@ -6,7 +6,7 @@
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -182,9 +170,9 @@ diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
---- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2020-03-06 09:47:33.719000000 +0100
-+++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2020-03-06 09:47:52.664000000 +0100
+diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+--- libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2021-01-02 12:52:25.976090801 +0100
++++ libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2021-01-02 12:52:59.976090801 +0100
@@ -6,7 +6,7 @@
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -194,10 +182,10 @@ diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-lates
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvtest.c libvirt-6.1.0/tests/qemuxml2argvtest.c
---- libvirt-6.1.0.orig/tests/qemuxml2argvtest.c 2020-03-06 09:47:33.741000000 +0100
-+++ libvirt-6.1.0/tests/qemuxml2argvtest.c 2020-03-06 09:47:52.665000000 +0100
-@@ -1197,7 +1197,7 @@
+diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvtest.c libvirt-6.10.0/tests/qemuxml2argvtest.c
+--- libvirt-6.10.0.orig/tests/qemuxml2argvtest.c 2021-01-02 12:52:26.020090801 +0100
++++ libvirt-6.10.0/tests/qemuxml2argvtest.c 2021-01-02 12:52:59.976090801 +0100
+@@ -1365,7 +1365,7 @@
driver.config->vncSASL = 1;
VIR_FREE(driver.config->vncSASLdir);
@@ -206,7 +194,7 @@ diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvtest.c libvirt-6.1.0/tests/qemuxml
DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
driver.config->vncTLS = 1;
driver.config->vncTLSx509verify = 1;
-@@ -1227,7 +1227,7 @@
+@@ -1395,7 +1395,7 @@
DO_TEST("graphics-spice-no-args",
QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
driver.config->spiceSASL = 1;
@@ -215,9 +203,9 @@ diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvtest.c libvirt-6.1.0/tests/qemuxml
DO_TEST("graphics-spice-sasl",
QEMU_CAPS_SPICE,
QEMU_CAPS_DEVICE_QXL);
-diff -ur libvirt-6.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-6.1.0/tests/virconfdata/libvirtd.conf
---- libvirt-6.1.0.orig/tests/virconfdata/libvirtd.conf 2020-03-06 09:47:33.909000000 +0100
-+++ libvirt-6.1.0/tests/virconfdata/libvirtd.conf 2020-03-06 09:47:52.665000000 +0100
+diff -ur libvirt-6.10.0.orig/tests/virconfdata/libvirtd.conf libvirt-6.10.0/tests/virconfdata/libvirtd.conf
+--- libvirt-6.10.0.orig/tests/virconfdata/libvirtd.conf 2021-01-02 12:52:26.083090801 +0100
++++ libvirt-6.10.0/tests/virconfdata/libvirtd.conf 2021-01-02 12:52:59.977090801 +0100
@@ -91,7 +91,7 @@
# the network providing auth (eg, TLS/x509 certificates)
#
@@ -236,9 +224,9 @@ diff -ur libvirt-6.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-6.1.0/tests/
auth_tcp = "sasl"
# Change the authentication scheme for TLS sockets.
-diff -ur libvirt-6.1.0.orig/tests/virconfdata/libvirtd.out libvirt-6.1.0/tests/virconfdata/libvirtd.out
---- libvirt-6.1.0.orig/tests/virconfdata/libvirtd.out 2020-03-06 09:47:33.909000000 +0100
-+++ libvirt-6.1.0/tests/virconfdata/libvirtd.out 2020-03-06 09:47:52.665000000 +0100
+diff -ur libvirt-6.10.0.orig/tests/virconfdata/libvirtd.out libvirt-6.10.0/tests/virconfdata/libvirtd.out
+--- libvirt-6.10.0.orig/tests/virconfdata/libvirtd.out 2021-01-02 12:52:26.083090801 +0100
++++ libvirt-6.10.0/tests/virconfdata/libvirtd.out 2021-01-02 12:52:59.977090801 +0100
@@ -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 e6b16f8..a8245ca 100644
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,24 +1,16 @@
-diff -ur libvirt-6.1.0.orig/src/Makefile.in libvirt-6.1.0/src/Makefile.in
---- libvirt-6.1.0.orig/src/Makefile.in 2020-03-06 09:52:13.294000000 +0100
-+++ libvirt-6.1.0/src/Makefile.in 2020-03-06 09:52:22.081000000 +0100
-@@ -6266,7 +6266,7 @@
+diff -ur libvirt-6.10.0.orig/src/remote/meson.build libvirt-6.10.0/src/remote/meson.build
+--- libvirt-6.10.0.orig/src/remote/meson.build 2021-01-01 20:42:34.317692686 +0100
++++ libvirt-6.10.0/src/remote/meson.build 2021-01-01 20:46:19.143692686 +0100
+@@ -265,11 +265,9 @@
+ endforeach
- # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
- # /usr/lib/sysctl.d/ even when libdir is /usr/lib64
--@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@sysctldir = $(prefix)/lib/sysctl.d
-+@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@sysctldir = $(sysconfdir)/sysctl.d
- @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@polkitdir = $(datadir)/polkit-1
- @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@polkitactionsdir = $(polkitdir)/actions
- @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@polkitrulesdir = $(polkitdir)/rules.d
-diff -ur libvirt-6.1.0.orig/src/remote/Makefile.inc.am libvirt-6.1.0/src/remote/Makefile.inc.am
---- libvirt-6.1.0.orig/src/remote/Makefile.inc.am 2020-03-06 09:52:13.305000000 +0100
-+++ libvirt-6.1.0/src/remote/Makefile.inc.am 2020-03-06 09:52:22.081000000 +0100
-@@ -334,7 +334,7 @@
- if WITH_SYSCTL
- # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
- # /usr/lib/sysctl.d/ even when libdir is /usr/lib64
--sysctldir = $(prefix)/lib/sysctl.d
-+sysctldir = $(sysconfdir)/sysctl.d
-
- install-sysctl:
- $(MKDIR_P) $(DESTDIR)$(sysctldir)
+ if conf.has('WITH_SYSCTL')
+- # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
+- # /usr/lib/sysctl.d/ even when libdir is /usr/lib64
+ install_data(
+ 'libvirtd.sysctl',
+- install_dir: prefix / 'lib' / 'sysctl.d',
++ install_dir: sysconfdir / 'sysctl.d',
+ rename: [ '60-libvirtd.conf' ],
+ )
+ endif
diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch
index 19ac146..bb32ff3 100644
--- a/libvirt-udevadm-settle.patch
+++ b/libvirt-udevadm-settle.patch
@@ -1,7 +1,7 @@
-diff -ur libvirt-6.1.0.orig/src/util/virutil.c libvirt-6.1.0/src/util/virutil.c
---- libvirt-6.1.0.orig/src/util/virutil.c 2020-03-06 09:50:30.870000000 +0100
-+++ libvirt-6.1.0/src/util/virutil.c 2020-03-06 09:50:47.350000000 +0100
-@@ -1332,7 +1332,7 @@
+diff -ur libvirt-6.10.0.orig/src/util/virutil.c libvirt-6.10.0/src/util/virutil.c
+--- libvirt-6.10.0.orig/src/util/virutil.c 2021-01-01 20:41:27.420692686 +0100
++++ libvirt-6.10.0/src/util/virutil.c 2021-01-01 20:41:48.503692686 +0100
+@@ -1316,7 +1316,7 @@
if (!(udev = virFindFileInPath(UDEVADM)))
return;
diff --git a/libvirt.spec b/libvirt.spec
index 85e509f..036266f 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -23,7 +23,6 @@
%bcond_without polkit # PolicyKit support
%bcond_without systemtap # systemtap/dtrace probes
%bcond_with wireshark # wireshark dissector module
-%bcond_without static_libs # static libraries build
# qemu available only on x86 and ppc
%ifnarch %{ix86} %{x8664} ppc
@@ -43,12 +42,12 @@
Summary: Toolkit to interact with virtualization capabilities
Summary(pl.UTF-8): NarzÄdzia wspóÅpracujÄ
ce z funkcjami wirtualizacji
Name: libvirt
-Version: 6.6.0
+Version: 6.10.0
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0: http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5: a1f1d1580292f8932bcbacf5801cf223
+# Source0-md5: 43037045ef94c8600d4289b49ec73a77
Source1: libvirtd.init
Source2: virtlockd.init
Source3: virtlogd.init
@@ -72,54 +71,62 @@ BuildRequires: automake
BuildRequires: bash-completion >= 2.0
%{?with_ceph:BuildRequires: ceph-devel}
BuildRequires: curl-devel >= 7.18.0
-BuildRequires: cyrus-sasl-devel
+BuildRequires: cyrus-sasl-devel >= 2.1.26
BuildRequires: dbus-devel >= 1.0.0
BuildRequires: device-mapper-devel >= 1.0.0
BuildRequires: gawk
BuildRequires: gcc >= 6:4.4
BuildRequires: gettext-tools >= 0.17
+BuildRequires: glib2-devel >= 2.48.0
%{?with_glusterfs:BuildRequires: glusterfs-devel >= 3.4.1}
-BuildRequires: gnutls-devel >= 2.2.0
+BuildRequires: gnutls-devel >= 3.2.0
BuildRequires: libapparmor-devel
BuildRequires: libblkid-devel >= 2.17
BuildRequires: libcap-ng-devel >= 0.4.0
BuildRequires: libfuse-devel >= 2.8.6
BuildRequires: libgcrypt-devel
+BuildRequires: libiscsi-devel >= 1.18.0
BuildRequires: libnl-devel >= 3.2
-BuildRequires: libpcap-devel >= 1.0.0
+BuildRequires: libpcap-devel >= 1.5.0
BuildRequires: libselinux-devel >= 2.5
BuildRequires: libssh-devel >= 0.7
BuildRequires: libssh2-devel >= 1.3
BuildRequires: libtool
-BuildRequires: libxml2-devel >= 1:2.6.0
+BuildRequires: libxml2-devel >= 1:2.9.1
BuildRequires: libxslt-devel
+BuildRequires: lvm2
+BuildRequires: meson >= 0.54.0
BuildRequires: ncurses-devel
%{?with_netcf:BuildRequires: netcf-devel >= 0.2.0}
-BuildRequires: numactl-devel
-%{?with_hyperv:BuildRequires: openwsman-devel >= 2.2.3}
+BuildRequires: numactl-devel >= 2.0.6
+BuildRequires: open-iscsi
+%{?with_hyperv:BuildRequires: openwsman-devel >= 2.6.3}
BuildRequires: parted-devel >= 1.8.0
BuildRequires: pkgconfig
%{?with_polkit:BuildRequires: polkit}
%{?with_polkit:BuildRequires: polkit-devel >= 0.90}
-BuildRequires: readline-devel
-BuildRequires: rpmbuild(macros) >= 1.627
+BuildRequires: readline-devel >= 7.0
+BuildRequires: rpmbuild(macros) >= 1.728
%{?with_sanlock:BuildRequires: sanlock-devel >= 0.8}
+BuildRequires: sheepdog
%{?with_systemtap:BuildRequires: systemtap-sdt-devel}
-BuildRequires: udev-devel >= 1:218
-%{?with_wireshark:BuildRequires: wireshark-devel >= 1.11.3}
-%{?with_libxl:BuildRequires: xen-devel >= 4.4}
+BuildRequires: udev-devel >= 1:219
+%{?with_wireshark:BuildRequires: wireshark-devel >= 2.6.0}
+%{?with_libxl:BuildRequires: xen-devel >= 4.6.0}
# For disk driver
BuildRequires: xorg-lib-libpciaccess-devel >= 0.10.0
+BuildRequires: yajl-devel >= 2.0.3
+BuildRequires: zfs-devel
Requires: curl-libs >= 7.18.0
Requires: device-mapper >= 1.0.0
Requires: libcap-ng >= 0.4.0
Requires: libnl >= 3.2
-Requires: libpcap >= 1.0.0
+Requires: libpcap >= 1.5.0
Requires: libselinux >= 2.5
Requires: libssh >= 0.7
Requires: libssh2 >= 1.3
-Requires: libxml2 >= 1:2.6.0
-%{?with_hyperv:Requires: openwsman-libs >= 2.2.3}
+Requires: libxml2 >= 1:2.9.1
+%{?with_hyperv:Requires: openwsman-libs >= 2.6.3}
Obsoletes: libvirt-daemon-esx
Obsoletes: libvirt-daemon-hyperv
Obsoletes: libvirt-daemon-openvz
@@ -176,16 +183,16 @@ Requires: audit-libs-devel
Requires: curl-devel >= 7.18.0
Requires: dbus-devel >= 1.0.0
Requires: device-mapper-devel >= 1.0.0
-Requires: gnutls-devel >= 2.2.0
+Requires: gnutls-devel >= 3.2.0
Requires: libapparmor-devel
Requires: libcap-ng-devel >= 0.4.0
Requires: libgcrypt-devel
Requires: libnl-devel >= 3.2
-Requires: libpcap-devel >= 1.0.0
+Requires: libpcap-devel >= 1.5.0
Requires: libselinux-devel >= 2.5
-Requires: libxml2-devel >= 1:2.6.0
-Requires: numactl-devel
-%{?with_hyperv:Requires: openwsman-devel >= 2.2.3}
+Requires: libxml2-devel >= 1:2.9.1
+Requires: numactl-devel >= 2.0.6
+%{?with_hyperv:Requires: openwsman-devel >= 2.6.3}
%description devel
Libvirt is a C toolkit to interact with the virtualization
@@ -201,26 +208,6 @@ obecnych wersji Linuksa.
Ten pakiet zawiera pliki nagÅówkowe potrzebne do tworzenia programów
wykorzystujÄ
cych bibliotekÄ libvirt.
-%package static
-Summary: Development static libraries for programs using libvirt
-Summary(pl.UTF-8): Statyczne biblioteki programistyczne do programów wykorzystujÄ
cych libvirt
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-
-%description static
-Libvirt is a C toolkit to interact with the virtualization
-capabilities of recent versions of Linux.
-
-This package contains the static libraries for developing programs
-using the libvirt library.
-
-%description static -l pl.UTF-8
-Libvirt to zestaw narzÄdzi w C do wspóÅpracy z funkcjami wirtualizacji
-obecnych wersji Linuksa.
-
-Ten pakiet zawiera biblioteki statyczne do tworzenia programów
-wykorzystujÄ
cych bibliotekÄ libvirt.
-
%package lock-sanlock
Summary: Sanlock lock manager plugin for libvirt
Summary(pl.UTF-8): ZarzÄ
dca blokad sanlock dla biblioteki libvirt
@@ -381,7 +368,7 @@ Summary(pl.UTF-8): NarzÄdzia klienckie do biblioteki libvirt
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: gettext >= 0.18.1.1-6
-Requires: gnutls >= 2.2.0
+Requires: gnutls >= 3.2.0
Requires: netcat-openbsd
Requires: rc-scripts
Requires(post,preun): /sbin/chkconfig
@@ -451,109 +438,78 @@ ModuŠsekcji Wiresharka do pakietów libvirt.
%patch4 -p1
%build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-
-install -d build
-cd build
-
-../%configure \
- PVCREATE=/sbin/pvcreate \
- VGCREATE=/sbin/vgcreate \
- LVCREATE=/sbin/lvcreate \
- PVREMOVE=/sbin/pvremove \
- VGREMOVE=/sbin/vgremove \
- LVREMOVE=/sbin/lvremove \
- VGCHANGE=/sbin/vgchange \
- LVCHANGE=/sbin/lvchange \
- VGSCAN=/sbin/vgscan \
- PVS=/sbin/pvs \
- VGS=/sbin/vgs \
- LVS=/sbin/lvs \
- TC=/sbin/tc \
- BRCTL=/sbin/brctl \
- ISCSIADM=/sbin/iscsiadm \
- SHOWMOUNT=/usr/sbin/showmount \
- MOUNT=/bin/mount \
- UMOUNT=/bin/umount \
- MKFS=/sbin/mkfs \
- SHOWMOUNT=/usr/sbin/showmount \
- IPTABLES_PATH=/usr/sbin/iptables \
- IP6TABLES_PATH=/usr/sbin/ip6tables \
- EBTABLES_PATH=/usr/sbin/ebtables \
- ISCSIADM=/sbin/iscsiadm \
- DNSMASQ=/usr/sbin/dnsmasq \
- RADVD=/usr/sbin/radvd \
- UDEVADM=/sbin/udevadm \
- MODPROBE=/sbin/modprobe \
- SCRUB=/usr/bin/scrub \
- OVSVSCTL=/usr/bin/ovs-vsctl \
- NUMAD=/usr/bin/numad \
- SHEEPDOGCLI=/usr/sbin/collie \
- ZFS=/usr/sbin/zfs \
- ZPOOL=/usr/sbin/zpool \
- --disable-silent-rules \
- %{?with_static_libs:--enable-static} \
- --with-bash-completion \
- --with-bash-completions-dir=/etc/bash_completion.d \
- --with-packager="TLD-Linux" \
- --with-packager-version="%{name}-%{version}-%{release}.%{_target_cpu}" \
- --with-qemu-user=qemu \
- --with-qemu-group=qemu \
- --with-storage-disk \
- --with-storage-fs \
- --with-storage-gluster%{!?with_glusterfs:=no} \
- --with-storage-iscsi \
- --with-storage-lvm \
- --with-storage-mpath \
- --with-storage-rbd%{!?with_ceph:=no} \
- --with-storage-scsi \
- --with-storage-sheepdog \
- --with-apparmor \
- --with-audit \
- --without-firewalld \
- --without-firewalld-zone \
- %{__with_without systemtap dtrace} \
- %{__with_without esx} \
- --with-driver-modules \
- --without-hal \
- %{__with_without hyperv} \
- --with-blkid \
- --with-ssh2 \
- %{__with_without libxl} \
- %{__with_without lxc} \
- --with-macvtap \
- %{__with_without netcf} \
- --with-numactl \
- --with-numad \
- %{__with_without openvz} \
- %{__with_without phyp} \
- %{__with_without polkit} \
- %{__with_without qemu} \
- %{__with_without sanlock} \
- --with-sasl \
- --with-selinux \
- --with-udev \
- %{__with_without vbox vbox %{_libdir}/VirtualBox} \
- --with-virtualport \
- %{__with_without vmware} \
- %{!?with_wireshark:--without-wireshark-dissector} \
- --x-libraries=%{_libdir}
-
-%{__make} \
- AWK=gawk
-
-cd ..
+%meson build \
+ -Dpackager="TLD-Linux" \
+ -Dpackager_version="%{name}-%{version}-%{release}.%{_target_cpu}" \
+ -Dqemu_user=qemu \
+ -Dqemu_group=qemu \
+ -Dapparmor=enabled \
+ -Dattr=enabled \
+ -Daudit=enabled \
+ -Dbash_completion=enabled \
+ -Dbash_completion_dir=/etc/bash_completion.d \
+ -Dblkid=enabled \
+ -Dcapng=enabled \
+ -Dcurl=enabled \
+ -Ddtrace=%{__enabled_disabled systemtap} \
+ -Dfirewalld=disabled \
+ -Dfirewalld_zone=disabled \
+ -Dfuse=enabled \
+ -Dglusterfs=%{__enabled_disabled glusterfs} \
+ -Dlibiscsi=enabled \
+ -Dlibnl=enabled \
+ -Dlibssh=enabled \
+ -Dlibssh2=enabled \
+ -Dnetcf=%{__enabled_disabled netcf} \
+ -Dnls=enabled \
+ -Dnumactl=enabled \
+ -Dnumad=disabled \
+ -Dopenwsman=enabled \
+ -Dpciaccess=enabled \
+ -Dpolkit=%{__enabled_disabled polkit} \
+ -Dreadline=enabled \
+ -Dsanlock=enabled \
+ -Dsasl=enabled \
+ -Dselinux=enabled \
+ -Dsysctl_config=enabled \
+ -Dudev=enabled \
+ -Dwireshark_dissector=%{__enabled_disabled wireshark} \
+ -Dyajl=enabled \
+ -Dstorage_dir=enabled \
+ -Dstorage_disk=enabled \
+ -Dstorage_fs=enabled \
+ -Dstorage_glusterfs=%{__enabled_disabled glusterfs} \
+ -Dstorage_iscsi=enabled \
+ -Dstorage_iscsi_direct=enabled \
+ -Dstorage_lvm=enabled \
+ -Dstorage_mpath=enabled \
+ -Dstorage_rbd=%{__enabled_disabled ceph} \
+ -Dstorage_scsi=enabled \
+ -Dstorage_sheepdog=enabled \
+ -Dstorage_vstorage=disabled \
+ -Dstorage_zfs=enabled \
+ -Ddriver_bhyve=disabled \
+ -Ddriver_esx=%{__enabled_disabled esx} \
+ -Ddriver_hyperv=%{__enabled_disabled hyperv} \
+ -Ddriver_interface=enabled \
+ -Ddriver_libxl=%{__enabled_disabled libxl} \
+ -Ddriver_lxc=%{__enabled_disabled lxc} \
+ -Ddriver_network=enabled \
+ -Ddriver_openvz=%{__enabled_disabled openvz} \
+ -Ddriver_qemu=%{__enabled_disabled qemu} \
+ -Ddriver_remote=enabled \
+ -Ddriver_secrets=enabled \
+ -Ddriver_vbox=%{__enabled_disabled vbox} \
+ -Ddriver_vmware=%{__enabled_disabled vmware} \
+ -Ddriver_vz=disabled
+
+%meson_build -C build
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{sysconfig,sysctl.d,rc.d/init.d}
-%{__make} -C build install \
- DESTDIR=$RPM_BUILD_ROOT
+%meson_install -C build
install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirtd
install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlockd
@@ -564,23 +520,6 @@ install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/virtlockd
install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/virtlogd
install -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/libvirt-guests
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.la \
- %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.la \
- %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.a}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.la \
- %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.a}
-
-%if %{with sanlock}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.la \
- %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.a}
-%endif
-%if %{with wireshark}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/epan/libvirt.la \
- %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/epan/libvirt.a} \
-%endif
-
rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale/{bal,ilo,kw@kkcor,kw@uccor,kw_GB,tw,wba}
%find_lang %{name}
@@ -622,7 +561,7 @@ fi
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README
+%doc AUTHORS.rst NEWS.rst README.rst
%dir %{_sysconfdir}/libvirt
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt.conf
%attr(755,root,root) %{_libdir}/libvirt.so.*.*.*
@@ -665,13 +604,6 @@ fi
%{_mandir}/man7/virkeycode-*.7*
%{_mandir}/man7/virkeyname-*.7*
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libvirt.a
-%{_libdir}/libvirt-admin.a
-%{?with_lxc:%{_libdir}/libvirt-lxc.a}
-%{_libdir}/libvirt-qemu.a
-
%if %{with sanlock}
%files lock-sanlock
%defattr(644,root,root,755)
@@ -784,6 +716,7 @@ fi
%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_disk.so
%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_fs.so
%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi.so
+%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi-direct.so
%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_logical.so
# mpath requires libdevmapper, but libvirt itself requires it too
%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_mpath.so
@@ -887,6 +820,7 @@ fi
%if %{with qemu}
%attr(755,root,root) %{_bindir}/virt-qemu-run
%endif
+%attr(755,root,root) %{_bindir}/virt-ssh-helper
%attr(754,root,root) %{_libexecdir}/libvirt-guests.sh
%{_libdir}/virt-login-shell-helper
%{_mandir}/man1/virsh.1*
@@ -901,6 +835,7 @@ fi
%dir %{_datadir}/libvirt/schemas
%{_datadir}/libvirt/schemas/basictypes.rng
%{_datadir}/libvirt/schemas/capability.rng
+%{_datadir}/libvirt/schemas/cpu.rng
%{_datadir}/libvirt/schemas/cputypes.rng
%{_datadir}/libvirt/schemas/domain.rng
%{_datadir}/libvirt/schemas/domainbackup.rng
--
2.49.0