]> TLD Linux GIT Repositories - packages/libvirt.git/blobdiff - libvirt-sasl.patch
- BR docutils
[packages/libvirt.git] / libvirt-sasl.patch
index f1f6e5f8848885e5689b15beb701b82cc1fb79ac..2f23a6b4f60b0e64266c1b0138e6f404e8320020 100644 (file)
@@ -1,43 +1,19 @@
-diff -urp libvirt-5.4.0.orig/docs/auth.html libvirt-5.4.0/docs/auth.html
---- libvirt-5.4.0.orig/docs/auth.html  2019-06-17 20:17:53.120000000 +0200
-+++ libvirt-5.4.0/docs/auth.html       2019-06-17 20:18:17.708000000 +0200
-@@ -318,7 +318,7 @@ to turn on SASL auth in these listeners.
-         <p>
- 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 <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>
- parameter to <code>scram-sha-1</code>.
-     </p>
-         <p>
-diff -urp libvirt-5.4.0.orig/docs/auth.html.in libvirt-5.4.0/docs/auth.html.in
---- libvirt-5.4.0.orig/docs/auth.html.in       2019-06-17 20:17:53.125000000 +0200
-+++ libvirt-5.4.0/docs/auth.html.in    2019-06-17 20:18:17.709000000 +0200
-@@ -277,7 +277,7 @@ to turn on SASL auth in these listeners.
-     <p>
- 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 <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>
- parameter to <code>scram-sha-1</code>.
-     </p>
-     <p>
-diff -urp libvirt-5.4.0.orig/src/Makefile.in libvirt-5.4.0/src/Makefile.in
---- libvirt-5.4.0.orig/src/Makefile.in 2019-06-17 20:17:53.264000000 +0200
-+++ libvirt-5.4.0/src/Makefile.in      2019-06-17 20:18:17.713000000 +0200
-@@ -6257,7 +6257,7 @@ REMOTE_DRIVER_PROTOCOL = \
+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 -urp libvirt-5.4.0.orig/src/qemu/qemu.conf libvirt-5.4.0/src/qemu/qemu.conf
---- libvirt-5.4.0.orig/src/qemu/qemu.conf      2019-06-17 20:17:53.240000000 +0200
-+++ libvirt-5.4.0/src/qemu/qemu.conf   2019-06-17 20:18:17.713000000 +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 -urp libvirt-5.4.0.orig/src/qemu/qemu.conf libvirt-5.4.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,10 +56,10 @@ diff -urp libvirt-5.4.0.orig/src/qemu/qemu.conf libvirt-5.4.0/src/qemu/qemu.conf
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-diff -urp libvirt-5.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.4.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-5.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2019-06-17 20:17:53.240000000 +0200
-+++ libvirt-5.4.0/src/qemu/test_libvirtd_qemu.aug.in   2019-06-17 20:18:17.713000000 +0200
-@@ -13,7 +13,7 @@ module Test_libvirtd_qemu =
+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" }
  { "vnc_sasl" = "1" }
@@ -92,7 +68,7 @@ diff -urp libvirt-5.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.4.0/sr
  { "vnc_allow_host_audio" = "0" }
  { "spice_listen" = "0.0.0.0" }
  { "spice_tls" = "1" }
-@@ -21,7 +21,7 @@ module Test_libvirtd_qemu =
+@@ -21,7 +21,7 @@
  { "spice_auto_unix_socket" = "1" }
  { "spice_password" = "XYZ12345" }
  { "spice_sasl" = "1" }
@@ -101,124 +77,118 @@ diff -urp libvirt-5.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.4.0/sr
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-diff -urp libvirt-5.4.0.orig/src/remote/libvirtd.conf libvirt-5.4.0/src/remote/libvirtd.conf
---- libvirt-5.4.0.orig/src/remote/libvirtd.conf        2019-06-17 20:17:53.242000000 +0200
-+++ libvirt-5.4.0/src/remote/libvirtd.conf     2019-06-17 20:18:17.713000000 +0200
-@@ -123,7 +123,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.
  #
-@@ -154,7 +154,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 -urp libvirt-5.4.0.orig/src/remote/Makefile.inc.am libvirt-5.4.0/src/remote/Makefile.inc.am
---- libvirt-5.4.0.orig/src/remote/Makefile.inc.am      2019-06-17 20:17:53.240000000 +0200
-+++ libvirt-5.4.0/src/remote/Makefile.inc.am   2019-06-17 20:18:17.714000000 +0200
-@@ -244,7 +244,7 @@ endif WITH_LIBVIRTD
- # This is needed for clients too, so can't wrap in
- # the WITH_LIBVIRTD conditional
- if WITH_SASL
--sasldir = $(sysconfdir)/sasl2
-+sasldir = $(sysconfdir)/sasl
+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=/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=/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=/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-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=/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.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=/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/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");
  
- install-sasl:
-       $(MKDIR_P) $(DESTDIR)$(sasldir)
-diff -urp libvirt-5.4.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-5.4.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
---- libvirt-5.4.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args   2019-06-17 20:17:54.132000000 +0200
-+++ libvirt-5.4.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args        2019-06-17 20:18:17.714000000 +0200
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
--SASL_CONF_PATH=/root/.sasl2 \
-+SASL_CONF_PATH=/root/.sasl \
- QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i686 \
- -name QEMUGuest1 \
-diff -urp libvirt-5.4.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-5.4.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
---- libvirt-5.4.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args    2019-06-17 20:17:54.132000000 +0200
-+++ libvirt-5.4.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2019-06-17 20:18:17.714000000 +0200
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
--SASL_CONF_PATH=/root/.sasl2 \
-+SASL_CONF_PATH=/root/.sasl \
- QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i686 \
- -name QEMUGuest1 \
-diff -urp libvirt-5.4.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.4.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-5.4.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-06-17 20:17:54.162000000 +0200
-+++ libvirt-5.4.0/tests/qemuxml2argvdata/graphics-spice-sasl.args      2019-06-17 20:18:17.714000000 +0200
-@@ -6,7 +6,7 @@ LOGNAME=test \
- 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 -urp libvirt-5.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.4.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-5.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args   2019-06-17 20:17:54.163000000 +0200
-+++ libvirt-5.4.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args        2019-06-17 20:18:17.714000000 +0200
-@@ -6,7 +6,7 @@ LOGNAME=test \
- 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 -urp libvirt-5.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.4.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-5.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args    2019-06-17 20:17:54.165000000 +0200
-+++ libvirt-5.4.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-06-17 20:18:17.714000000 +0200
-@@ -6,7 +6,7 @@ LOGNAME=test \
- 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 -urp libvirt-5.4.0.orig/tests/qemuxml2argvtest.c libvirt-5.4.0/tests/qemuxml2argvtest.c
---- libvirt-5.4.0.orig/tests/qemuxml2argvtest.c        2019-06-17 20:17:53.274000000 +0200
-+++ libvirt-5.4.0/tests/qemuxml2argvtest.c     2019-06-17 20:18:17.715000000 +0200
-@@ -1145,7 +1145,7 @@ mymain(void)
+     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;
-@@ -1177,7 +1177,7 @@ mymain(void)
-     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 -urp libvirt-5.4.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.4.0/tests/virconfdata/libvirtd.conf
---- libvirt-5.4.0.orig/tests/virconfdata/libvirtd.conf 2019-06-17 20:17:54.591000000 +0200
-+++ libvirt-5.4.0/tests/virconfdata/libvirtd.conf      2019-06-17 20:18:17.715000000 +0200
-@@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
+     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)
  #
  #  - sasl: use SASL infrastructure. The actual auth scheme is then
@@ -227,7 +197,7 @@ diff -urp libvirt-5.4.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.4.0/tests
  #          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
  #          For non-TCP or TLS sockets,  any scheme is allowed.
  #
-@@ -139,7 +139,7 @@ auth_unix_rw = "none"
+@@ -122,7 +122,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
@@ -236,10 +206,10 @@ diff -urp libvirt-5.4.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.4.0/tests
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -urp libvirt-5.4.0.orig/tests/virconfdata/libvirtd.out libvirt-5.4.0/tests/virconfdata/libvirtd.out
---- libvirt-5.4.0.orig/tests/virconfdata/libvirtd.out  2019-06-17 20:17:54.591000000 +0200
-+++ libvirt-5.4.0/tests/virconfdata/libvirtd.out       2019-06-17 20:18:17.715000000 +0200
-@@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700"
+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)
  #
  #  - sasl: use SASL infrastructure. The actual auth scheme is then
@@ -248,7 +218,7 @@ diff -urp libvirt-5.4.0.orig/tests/virconfdata/libvirtd.out libvirt-5.4.0/tests/
  #          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
  #          For non-TCP or TLS sockets,  any scheme is allowed.
  #
-@@ -116,7 +116,7 @@ auth_unix_rw = "none"
+@@ -102,7 +102,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