X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-sasl.patch;h=88ef7aa64698413e39cd149ff0b028c4b383ff57;hp=d23a77027af33bc8fa780687454a9639fe2dcdfd;hb=HEAD;hpb=c833928a7e72d39a9e4302b345e26bad8fbbd5ff diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch index d23a770..2f23a6b 100644 --- a/libvirt-sasl.patch +++ b/libvirt-sasl.patch @@ -1,43 +1,19 @@ -diff -ur libvirt-5.5.0.orig/docs/auth.html libvirt-5.5.0/docs/auth.html ---- libvirt-5.5.0.orig/docs/auth.html 2019-07-14 19:23:33.979000000 +0200 -+++ libvirt-5.5.0/docs/auth.html 2019-07-14 19:23:54.564000000 +0200 -@@ -318,7 +318,7 @@ -

- Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a - config change is rquired to enable plain password auth. This is done by --editting /etc/sasl2/libvirt.conf to set the mech_list -+editting /etc/sasl/libvirt.conf to set the mech_list - parameter to scram-sha-1. -

-

-diff -ur libvirt-5.5.0.orig/docs/auth.html.in libvirt-5.5.0/docs/auth.html.in ---- libvirt-5.5.0.orig/docs/auth.html.in 2019-07-14 19:23:33.991000000 +0200 -+++ libvirt-5.5.0/docs/auth.html.in 2019-07-14 19:23:54.564000000 +0200 -@@ -277,7 +277,7 @@ -

- Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a - config change is rquired to enable plain password auth. This is done by --editting /etc/sasl2/libvirt.conf to set the mech_list -+editting /etc/sasl/libvirt.conf to set the mech_list - parameter to scram-sha-1. -

-

-diff -ur libvirt-5.5.0.orig/src/Makefile.in libvirt-5.5.0/src/Makefile.in ---- libvirt-5.5.0.orig/src/Makefile.in 2019-07-14 19:23:33.798000000 +0200 -+++ libvirt-5.5.0/src/Makefile.in 2019-07-14 19:23:54.566000000 +0200 -@@ -6723,7 +6723,7 @@ +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 +@@ -225,7 +225,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 - THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD) - SECDRIVER_CFLAGS = $(am__append_191) $(am__append_193) - SECDRIVER_LIBS = $(am__append_192) $(am__append_194) -diff -ur libvirt-5.5.0.orig/src/qemu/qemu.conf libvirt-5.5.0/src/qemu/qemu.conf ---- libvirt-5.5.0.orig/src/qemu/qemu.conf 2019-07-14 19:23:33.825000000 +0200 -+++ libvirt-5.5.0/src/qemu/qemu.conf 2019-07-14 19:23:54.566000000 +0200 -@@ -135,18 +135,18 @@ + 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 ``/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-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 +@@ -141,18 +141,18 @@ # Examples include vinagre, virt-viewer and virt-manager # itself. UltraVNC, RealVNC, TightVNC do not support this # @@ -59,7 +35,7 @@ diff -ur libvirt-5.5.0.orig/src/qemu/qemu.conf libvirt-5.5.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. # @@ -80,9 +56,9 @@ diff -ur libvirt-5.5.0.orig/src/qemu/qemu.conf libvirt-5.5.0/src/qemu/qemu.conf # Enable use of TLS encryption on the chardev TCP transports. # -diff -ur libvirt-5.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.5.0/src/qemu/test_libvirtd_qemu.aug.in ---- libvirt-5.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2019-07-14 19:23:33.824000000 +0200 -+++ libvirt-5.5.0/src/qemu/test_libvirtd_qemu.aug.in 2019-07-14 19:23:54.566000000 +0200 +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 @@ -13,7 +13,7 @@ { "vnc_tls_x509_verify" = "1" } { "vnc_password" = "XYZ12345" } @@ -101,135 +77,117 @@ diff -ur libvirt-5.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.5.0/src { "chardev_tls" = "1" } { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" } { "chardev_tls_x509_verify" = "1" } -diff -ur libvirt-5.5.0.orig/src/remote/libvirtd.conf libvirt-5.5.0/src/remote/libvirtd.conf ---- libvirt-5.5.0.orig/src/remote/libvirtd.conf 2019-07-14 19:23:33.810000000 +0200 -+++ libvirt-5.5.0/src/remote/libvirtd.conf 2019-07-14 19:23:54.566000000 +0200 -@@ -101,7 +101,7 @@ +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 +@@ -140,7 +140,7 @@ # the network providing auth (eg, TLS/x509 certificates) # # - sasl: use SASL infrastructure. The actual auth scheme is then --# controlled from /etc/sasl2/libvirt.conf. For the TCP -+# controlled from /etc/sasl/libvirt.conf. For the TCP +-# controlled from @sysconfdir@/sasl2/libvirt.conf. For the TCP ++# controlled from @sysconfdir@/sasl/libvirt.conf. For the TCP # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. # For non-TCP or TLS sockets, any scheme is allowed. # -@@ -132,7 +132,7 @@ +@@ -190,7 +190,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 --# mechanism in /etc/sasl2/libvirt.conf -+# mechanism in /etc/sasl/libvirt.conf +-# mechanism in @sysconfdir@/sasl2/libvirt.conf ++# mechanism in @sysconfdir@/sasl/libvirt.conf #auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -ur libvirt-5.5.0.orig/src/remote/Makefile.inc.am libvirt-5.5.0/src/remote/Makefile.inc.am ---- libvirt-5.5.0.orig/src/remote/Makefile.inc.am 2019-07-14 19:23:33.812000000 +0200 -+++ libvirt-5.5.0/src/remote/Makefile.inc.am 2019-07-14 19:23:54.567000000 +0200 -@@ -244,7 +244,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-5.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args ---- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-07-14 19:23:33.362000000 +0200 -+++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-07-14 19:23:59.923000000 +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=spice \ - /usr/bin/qemu-system-i686 \ - -name QEMUGuest1 \ -diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args ---- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2019-07-14 19:23:33.375000000 +0200 -+++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2019-07-14 19:23:59.923000000 +0200 +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 @@ + if conf.has('WITH_SASL') + install_data( + 'libvirtd.sasl', +- install_dir: sysconfdir / 'sasl2', ++ install_dir: sysconfdir / 'sasl', + 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=/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-i686 \ - -name QEMUGuest1 \ -diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args ---- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-07-14 19:23:33.361000000 +0200 -+++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-07-14 19:23:59.923000000 +0200 + 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 @@ -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-i686 \ - -name QEMUGuest1 \ -diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args ---- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2019-07-14 19:23:33.375000000 +0200 -+++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2019-07-14 19:26:27.145000000 +0200 + 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-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 @@ -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-i686 \ + 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 \ -diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args ---- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2019-07-14 19:23:33.369000000 +0200 -+++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2019-07-14 19:26:23.287000000 +0200 + -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 @@ -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-i686 \ + 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 \ -diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args ---- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2019-07-14 19:23:33.371000000 +0200 -+++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2019-07-14 19:26:19.952000000 +0200 + -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 @@ -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-i686 \ + 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 \ -diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvtest.c libvirt-5.5.0/tests/qemuxml2argvtest.c ---- libvirt-5.5.0.orig/tests/qemuxml2argvtest.c 2019-07-14 19:23:33.401000000 +0200 -+++ libvirt-5.5.0/tests/qemuxml2argvtest.c 2019-07-14 19:23:59.924000000 +0200 -@@ -1155,7 +1155,7 @@ + -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 @@ + cfg->backupTLSx509certdir = g_strdup("/etc/pki/libvirt-backup"); + + 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"); - driver.config->vncSASL = 1; - VIR_FREE(driver.config->vncSASLdir); -- ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl2")); -+ ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl")); - DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); - driver.config->vncTLS = 1; - driver.config->vncTLSx509verify = 1; -@@ -1187,7 +1187,7 @@ - DO_TEST("graphics-spice-no-args", - QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA); - driver.config->spiceSASL = 1; -- ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl2")); -+ ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl")); - DO_TEST("graphics-spice-sasl", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL); -diff -ur libvirt-5.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.5.0/tests/virconfdata/libvirtd.conf ---- libvirt-5.5.0.orig/tests/virconfdata/libvirtd.conf 2019-07-14 19:23:33.602000000 +0200 -+++ libvirt-5.5.0/tests/virconfdata/libvirtd.conf 2019-07-14 19:23:59.924000000 +0200 + 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 @@ -91,7 +91,7 @@ # the network providing auth (eg, TLS/x509 certificates) # @@ -248,9 +206,9 @@ diff -ur libvirt-5.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.5.0/tests/ auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -ur libvirt-5.5.0.orig/tests/virconfdata/libvirtd.out libvirt-5.5.0/tests/virconfdata/libvirtd.out ---- libvirt-5.5.0.orig/tests/virconfdata/libvirtd.out 2019-07-14 19:23:33.602000000 +0200 -+++ libvirt-5.5.0/tests/virconfdata/libvirtd.out 2019-07-14 19:23:59.924000000 +0200 +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 @@ -73,7 +73,7 @@ # the network providing auth (eg, TLS/x509 certificates) #