-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
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
# 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" }
{ "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)
#
#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(
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)
#
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)
#