-diff -ur libvirt-6.1.0.orig/tools/libvirt-guests.sh.in libvirt-6.1.0/tools/libvirt-guests.sh.in
---- libvirt-6.1.0.orig/tools/libvirt-guests.sh.in 2020-03-06 09:51:29.981000000 +0100
-+++ libvirt-6.1.0/tools/libvirt-guests.sh.in 2020-03-06 09:51:54.935000000 +0100
+diff -ur libvirt-7.5.0.orig/tools/libvirt-guests.sh.in libvirt-7.5.0/tools/libvirt-guests.sh.in
+--- libvirt-7.5.0.orig/tools/libvirt-guests.sh.in 2021-07-10 01:21:48.420677568 +0200
++++ libvirt-7.5.0/tools/libvirt-guests.sh.in 2021-07-10 01:21:55.874677568 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
-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
+diff -ur libvirt-7.5.0.orig/src/qemu/qemu_command.c libvirt-7.5.0/src/qemu/qemu_command.c
+--- libvirt-7.5.0.orig/src/qemu/qemu_command.c 2021-07-10 01:17:10.220677568 +0200
++++ libvirt-7.5.0/src/qemu/qemu_command.c 2021-07-10 01:17:25.635677568 +0200
+@@ -8087,6 +8087,10 @@
+ virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
+
+ /* TODO: Support ACLs later */
++
++ if (cfg->vncACL)
++ virBufferAddLit(&opt, ",acl");
++
+ }
+
+ if (graphics->data.vnc.powerControl != VIR_TRISTATE_BOOL_ABSENT) {
+diff -ur libvirt-7.5.0.orig/src/qemu/qemu.conf libvirt-7.5.0/src/qemu/qemu.conf
+--- libvirt-7.5.0.orig/src/qemu/qemu.conf 2021-07-10 01:17:10.225677568 +0200
++++ libvirt-7.5.0/src/qemu/qemu.conf 2021-07-10 01:17:25.633677568 +0200
@@ -147,6 +147,15 @@
#vnc_sasl = 1
# 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.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 */
-+
-+ if (cfg->vncACL)
-+ virBufferAddLit(&opt, ",acl");
-+
- }
-
- virCommandAddArg(cmd, "-vnc");
-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 @@
+diff -ur libvirt-7.5.0.orig/src/qemu/qemu_conf.c libvirt-7.5.0/src/qemu/qemu_conf.c
+--- libvirt-7.5.0.orig/src/qemu/qemu_conf.c 2021-07-10 01:17:10.220677568 +0200
++++ libvirt-7.5.0/src/qemu/qemu_conf.c 2021-07-10 01:17:25.636677568 +0200
+@@ -450,6 +450,8 @@
return -1;
if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
return -1;
return 0;
}
-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 @@
+diff -ur libvirt-7.5.0.orig/src/qemu/qemu_conf.h libvirt-7.5.0/src/qemu/qemu_conf.h
+--- libvirt-7.5.0.orig/src/qemu/qemu_conf.h 2021-07-10 01:17:10.220677568 +0200
++++ libvirt-7.5.0/src/qemu/qemu_conf.h 2021-07-10 01:17:25.636677568 +0200
+@@ -114,6 +114,7 @@
bool vncTLSx509verify;
bool vncTLSx509verifyPresent;
bool vncSASL;
-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
+diff -ur libvirt-7.5.0.orig/docs/auth.rst libvirt-7.5.0/docs/auth.rst
+--- libvirt-7.5.0.orig/docs/auth.rst 2021-07-10 01:12:46.853677568 +0200
++++ libvirt-7.5.0/docs/auth.rst 2021-07-10 01:16:24.992677568 +0200
+@@ -225,7 +225,7 @@
+
+ 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
--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.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
+-editing ``/etc/sasl2/libvirt.conf`` to set the ``mech_list``
++editing ``/etc/sasl/libvirt.conf`` to set the ``mech_list``
+ parameter to ``scram-sha-256``.
+
+ **Note:** previous versions of libvirt suggested ``DIGEST-MD5`` and
+diff -ur libvirt-7.5.0.orig/src/qemu/qemu.conf libvirt-7.5.0/src/qemu/qemu.conf
+--- libvirt-7.5.0.orig/src/qemu/qemu.conf 2021-07-10 01:12:46.952677568 +0200
++++ libvirt-7.5.0/src/qemu/qemu.conf 2021-07-10 01:13:10.078677568 +0200
@@ -141,18 +141,18 @@
# Examples include vinagre, virt-viewer and virt-manager
# itself. UltraVNC, RealVNC, TightVNC do not support this
# Enable use of TLS encryption on the chardev TCP transports.
#
-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
+diff -ur libvirt-7.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-7.5.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-7.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2021-07-10 01:12:46.959677568 +0200
++++ libvirt-7.5.0/src/qemu/test_libvirtd_qemu.aug.in 2021-07-10 01:13:10.078677568 +0200
@@ -13,7 +13,7 @@
{ "vnc_tls_x509_verify" = "1" }
{ "vnc_password" = "XYZ12345" }
{ "chardev_tls" = "1" }
{ "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
{ "chardev_tls_x509_verify" = "1" }
-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
+diff -ur libvirt-7.5.0.orig/src/remote/libvirtd.conf.in libvirt-7.5.0/src/remote/libvirtd.conf.in
+--- libvirt-7.5.0.orig/src/remote/libvirtd.conf.in 2021-07-10 01:12:46.960677568 +0200
++++ libvirt-7.5.0/src/remote/libvirtd.conf.in 2021-07-10 01:13:10.079677568 +0200
@@ -136,7 +136,7 @@
# the network providing auth (eg, TLS/x509 certificates)
#
#auth_tcp = "sasl"
# Change the authentication scheme for TLS sockets.
-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
+diff -ur libvirt-7.5.0.orig/src/remote/meson.build libvirt-7.5.0/src/remote/meson.build
+--- libvirt-7.5.0.orig/src/remote/meson.build 2021-07-10 01:12:46.960677568 +0200
++++ libvirt-7.5.0/src/remote/meson.build 2021-07-10 01:13:10.079677568 +0200
@@ -309,7 +309,7 @@
if conf.has('WITH_SASL')
install_data(
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 \
+diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-7.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
+--- libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2021-07-10 01:12:47.150677568 +0200
++++ libvirt-7.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2021-07-10 01:14:29.481677568 +0200
+@@ -7,7 +7,7 @@
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+ QEMU_AUDIO_DRV=spice \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/root/.sasl \
- QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-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 \
+ -S \
+diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+--- libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2021-07-10 01:12:47.151677568 +0200
++++ libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2021-07-10 01:13:56.615677568 +0200
+@@ -7,7 +7,7 @@
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+ QEMU_AUDIO_DRV=none \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/root/.sasl \
- QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-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 \
+ -S \
+diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
+--- libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2021-07-10 01:12:47.152677568 +0200
++++ libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2021-07-10 01:14:19.077677568 +0200
+@@ -7,7 +7,7 @@
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+ QEMU_AUDIO_DRV=none \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/root/.sasl \
- QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
- -name guest=QEMUGuest1,debug-threads=on \
-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
+ -name QEMUGuest1 \
+ -S \
+diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
+--- libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2021-07-10 01:12:47.151677568 +0200
++++ libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2021-07-10 01:16:03.483677568 +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 \
- QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
-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
+ -name guest=QEMUGuest1,debug-threads=on \
+ -S \
+diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+--- libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2021-07-10 01:12:47.152677568 +0200
++++ libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2021-07-10 01:14:04.510677568 +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 \
- QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-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
+ -S \
+diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+--- libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2021-07-10 01:12:47.152677568 +0200
++++ libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2021-07-10 01:14:09.866677568 +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 \
- QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-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 @@
+ -S \
+diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvtest.c libvirt-7.5.0/tests/qemuxml2argvtest.c
+--- libvirt-7.5.0.orig/tests/qemuxml2argvtest.c 2021-07-10 01:12:47.108677568 +0200
++++ libvirt-7.5.0/tests/qemuxml2argvtest.c 2021-07-10 01:13:11.819677568 +0200
+@@ -1525,7 +1525,7 @@
driver.config->vncSASL = 1;
VIR_FREE(driver.config->vncSASLdir);
DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
driver.config->vncTLS = 1;
driver.config->vncTLSx509verify = 1;
-@@ -1395,7 +1395,7 @@
+@@ -1555,7 +1555,7 @@
DO_TEST("graphics-spice-no-args",
QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
driver.config->spiceSASL = 1;
DO_TEST("graphics-spice-sasl",
QEMU_CAPS_SPICE,
QEMU_CAPS_DEVICE_QXL);
-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
+diff -ur libvirt-7.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-7.5.0/tests/virconfdata/libvirtd.conf
+--- libvirt-7.5.0.orig/tests/virconfdata/libvirtd.conf 2021-07-10 01:12:47.331677568 +0200
++++ libvirt-7.5.0/tests/virconfdata/libvirtd.conf 2021-07-10 01:13:11.819677568 +0200
@@ -91,7 +91,7 @@
# the network providing auth (eg, TLS/x509 certificates)
#
auth_tcp = "sasl"
# Change the authentication scheme for TLS sockets.
-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
+diff -ur libvirt-7.5.0.orig/tests/virconfdata/libvirtd.out libvirt-7.5.0/tests/virconfdata/libvirtd.out
+--- libvirt-7.5.0.orig/tests/virconfdata/libvirtd.out 2021-07-10 01:12:47.331677568 +0200
++++ libvirt-7.5.0/tests/virconfdata/libvirtd.out 2021-07-10 01:13:11.819677568 +0200
@@ -73,7 +73,7 @@
# the network providing auth (eg, TLS/x509 certificates)
#
-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
+diff -ur libvirt-7.5.0.orig/src/remote/meson.build libvirt-7.5.0/src/remote/meson.build
+--- libvirt-7.5.0.orig/src/remote/meson.build 2021-07-10 01:22:28.190677568 +0200
++++ libvirt-7.5.0/src/remote/meson.build 2021-07-10 01:22:48.926677568 +0200
@@ -265,11 +265,9 @@
endforeach
-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 @@
+diff -ur libvirt-7.5.0.orig/src/util/virutil.c libvirt-7.5.0/src/util/virutil.c
+--- libvirt-7.5.0.orig/src/util/virutil.c 2021-07-10 01:20:50.499677568 +0200
++++ libvirt-7.5.0/src/util/virutil.c 2021-07-10 01:21:10.732677568 +0200
+@@ -1296,7 +1296,7 @@
if (!(udev = virFindFileInPath(UDEVADM)))
return;
#
# Conditional build:
# - virtualization
+%bcond_without ch # Cloud-Hypervisor support
%bcond_without esx # VMware ESX support
%bcond_without hyperv # Hyper-V support
%bcond_without libxl # libxenlight support
# - storage locking
%bcond_without sanlock # sanlock storage lock manager
# - other
+%bcond_with apparmor # apparmor support
%bcond_without netcf # host interfaces support
%bcond_without polkit # PolicyKit support
%bcond_without systemtap # systemtap/dtrace probes
Summary: Toolkit to interact with virtualization capabilities
Summary(pl.UTF-8): Narzędzia współpracujące z funkcjami wirtualizacji
Name: libvirt
-Version: 6.10.0
+Version: 7.5.0
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0: http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5: 43037045ef94c8600d4289b49ec73a77
+# Source0-md5: c811b546f7d0b83fc259bf82ee7a0d19
Source1: libvirtd.init
Source2: virtlockd.init
Source3: virtlogd.init
BuildRequires: glib2-devel >= 2.48.0
%{?with_glusterfs:BuildRequires: glusterfs-devel >= 3.4.1}
BuildRequires: gnutls-devel >= 3.2.0
-BuildRequires: libapparmor-devel
+%{?with_apparmor:BuildRequires: libapparmor-devel}
BuildRequires: libblkid-devel >= 2.17
BuildRequires: libcap-ng-devel >= 0.4.0
BuildRequires: libfuse-devel >= 2.8.6
Requires: dbus-devel >= 1.0.0
Requires: device-mapper-devel >= 1.0.0
Requires: gnutls-devel >= 3.2.0
-Requires: libapparmor-devel
+%{?with_apparmor:Requires: libapparmor-devel}
Requires: libcap-ng-devel >= 0.4.0
Requires: libgcrypt-devel
Requires: libnl-devel >= 3.2
Wtyczka składowania danych wykorzystująca urządzenie blokowe RADOS
(system plików Ceph).
+%package daemon-ch
+Summary: Server side driver required to run Cloud-Hypervisor
+Summary(pl.UTF-8): Sterownik wymagany po stronie serwera do uruchamiania gości Cloud-Hypervisor
+Group: Libraries
+Requires: %{name}-daemon = %{version}-%{release}
+Requires: /usr/sbin/qcow-create
+Requires: xen >= 4.4
+Provides: libvirt(hypervisor)
+
+%description daemon-ch
+Server side driver required to manage the virtualization capabilities
+of Cloud-Hypervisor.
+
+%description daemon-ch -l pl.UTF-8
+Sterownik wymagany po stronie serwera do zarządzania funkcjami
+wirtualizacji Cloud-Hypervisor.
+
%package daemon-libxl
Summary: Server side driver required to run XEN guests (xenlight)
Summary(pl.UTF-8): Sterownik wymagany po stronie serwera do uruchamiania gości XEN (xenlight)
Group: Applications/System
Requires: %{name}-client = %{version}-%{release}
Requires: %{name}-daemon = %{version}-%{release}
+Requires: %{name}-daemon-ch = %{version}-%{release}
%{?with_libxl:Requires: %{name}-daemon-libxl = %{version}-%{release}}
Requires: %{name}-daemon-lxc = %{version}-%{release}
Requires: %{name}-daemon-qemu = %{version}-%{release}
-Dpackager_version="%{name}-%{version}-%{release}.%{_target_cpu}" \
-Dqemu_user=qemu \
-Dqemu_group=qemu \
- -Dapparmor=enabled \
+ -Dapparmor=%{__enabled_disabled apparmor} \
+ -Dapparmor_profiles=%{__enabled_disabled apparmor} \
-Dattr=enabled \
-Daudit=enabled \
-Dbash_completion=enabled \
-Dstorage_vstorage=disabled \
-Dstorage_zfs=enabled \
-Ddriver_bhyve=disabled \
+ -Ddriver_ch=%{__enabled_disabled ch} \
-Ddriver_esx=%{__enabled_disabled esx} \
-Ddriver_hyperv=%{__enabled_disabled hyperv} \
-Ddriver_interface=enabled \
+ -Ddriver_libvirtd=enabled \
-Ddriver_libxl=%{__enabled_disabled libxl} \
-Ddriver_lxc=%{__enabled_disabled lxc} \
-Ddriver_network=enabled \
-Ddriver_secrets=enabled \
-Ddriver_vbox=%{__enabled_disabled vbox} \
-Ddriver_vmware=%{__enabled_disabled vmware} \
- -Ddriver_vz=disabled
+ -Ddriver_vz=disabled \
+ -Dsecdriver_apparmor=%{__enabled_disabled apparmor} \
+ -Dsecdriver_selinux=enabled
%meson_build -C build
%defattr(644,root,root,755)
%doc AUTHORS.rst NEWS.rst README.rst
%dir %{_sysconfdir}/libvirt
+%if %{with apparmor}
+%dir %{_sysconfdir}/apparmor.d/libvirt
+%endif
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt.conf
%attr(755,root,root) %{_libdir}/libvirt.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libvirt.so.0
%defattr(644,root,root,755)
/etc/bash_completion.d/virsh
/etc/bash_completion.d/virt-admin
-/etc/bash_completion.d/vsh
%files devel
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/virtlogd
%config(noreplace) %verify(not md5 mtime size) /etc/sysctl.d/60-libvirtd.conf
%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd
+%if %{with apparmor}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/local/usr.lib.libvirt.virt-aa-helper
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/usr.lib.libvirt.virt-aa-helper
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/usr.sbin.libvirtd
+%endif
%attr(755,root,root) %{_libexecdir}/libvirt_iohelper
%attr(755,root,root) %{_libexecdir}/libvirt_parthelper
+%if %{with apparmor}
%attr(755,root,root) %{_libexecdir}/virt-aa-helper
+%endif
%attr(755,root,root) %{_sbindir}/libvirtd
%attr(755,root,root) %{_sbindir}/virtlockd
%attr(755,root,root) %{_sbindir}/virtlogd
%{_datadir}/polkit-1/rules.d/50-libvirt.rules
%endif
%{_mandir}/man8/libvirtd.8*
+%{_mandir}/man8/virtinterfaced.8*
%{_mandir}/man8/virtlockd.8*
%{_mandir}/man8/virtlogd.8*
+%{_mandir}/man8/virtnetworkd.8*
+%{_mandir}/man8/virtnodedevd.8*
+%{_mandir}/man8/virtnwfilterd.8*
+%{_mandir}/man8/virtproxyd.8*
+%{_mandir}/man8/virtsecretd.8*
+%{_mandir}/man8/virtstoraged.8*
%dir /var/lib/libvirt
%dir /var/lib/libvirt/dnsmasq
%attr(711,root,root) %dir /var/lib/libvirt/boot
%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_rbd.so
%endif
+%if %{with ch}
+%files daemon-ch
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtchd.conf
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_ch.so
+%attr(755,root,root) %{_sbindir}/virtchd
+%{_datadir}/augeas/lenses/virtchd.aug
+%{_datadir}/augeas/lenses/tests/test_virtchd.aug
+%endif
+
%if %{with libxl}
%files daemon-libxl
%defattr(644,root,root,755)
%attr(700,root,root) %dir /var/lib/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
%if %{with lxc}
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/lxc.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtlxcd.conf
%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.lxc
+%if %{with apparmor}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/abstractions/libvirt-lxc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/libvirt/TEMPLATE.lxc
+%endif
%attr(700,root,root) %dir /var/lib/libvirt/lxc
%attr(700,root,root) %dir /var/run/libvirt/lxc
%attr(700,root,root) %dir /var/log/libvirt/lxc
%attr(755,root,root) %{_libexecdir}/libvirt_lxc
%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_lxc.so
%attr(755,root,root) %{_sbindir}/virtlxcd
+%{_mandir}/man8/virtlxcd.8*
%endif
%if %{with qemu}
%{?with_sanlock:%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu-sanlock.conf}
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtqemud.conf
%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.qemu
+%if %{with apparmor}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/abstractions/libvirt-qemu
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor.d/libvirt/TEMPLATE.qemu
+%endif
%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
%{_datadir}/augeas/lenses/tests/test_virtqemud.aug
%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_qemu.so
%attr(755,root,root) %{_sbindir}/virtqemud
+%{_mandir}/man8/virtqemud.8*
%endif
%if %{with vbox}
%{_datadir}/augeas/lenses/virtvboxd.aug
%{_datadir}/augeas/lenses/tests/test_virtvboxd.aug
%{?with_vbox:%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so}
+%{_mandir}/man8/virtvboxd.8*
%endif
%files client
TLD / packages / libvirt.git / commitdiff