- Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
+diff -ur libvirt-8.4.0.orig/docs/auth.rst libvirt-8.4.0/docs/auth.rst
+--- libvirt-8.4.0.orig/docs/auth.rst 2022-06-02 23:58:08.077490237 +0200
++++ libvirt-8.4.0/docs/auth.rst 2022-06-02 23:58:27.936533169 +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 /etc/sasl2/libvirt.conf to set the mech_list
-+editing /etc/sasl/libvirt.conf to set the mech_list
- parameter to scram-sha-1.
-
-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-8.4.0.orig/src/qemu/qemu.conf.in libvirt-8.4.0/src/qemu/qemu.conf.in +--- libvirt-8.4.0.orig/src/qemu/qemu.conf.in 2022-06-02 23:58:08.164490425 +0200 ++++ libvirt-8.4.0/src/qemu/qemu.conf.in 2022-06-03 00:01:05.398849381 +0200 @@ -141,18 +141,18 @@ # Examples include vinagre, virt-viewer and virt-manager # itself. UltraVNC, RealVNC, TightVNC do not support this @@ -56,9 +56,9 @@ diff -ur libvirt-6.10.0.orig/src/qemu/qemu.conf libvirt-6.10.0/src/qemu/qemu.con # 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-8.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-8.4.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-8.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2022-06-02 23:58:08.170490438 +0200 ++++ libvirt-8.4.0/src/qemu/test_libvirtd_qemu.aug.in 2022-06-02 23:58:30.521538761 +0200 @@ -13,7 +13,7 @@ { "vnc_tls_x509_verify" = "1" } { "vnc_password" = "XYZ12345" } @@ -77,9 +77,9 @@ diff -ur libvirt-6.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-6.10.0/s { "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-8.4.0.orig/src/remote/libvirtd.conf.in libvirt-8.4.0/src/remote/libvirtd.conf.in +--- libvirt-8.4.0.orig/src/remote/libvirtd.conf.in 2022-06-02 23:58:08.171490440 +0200 ++++ libvirt-8.4.0/src/remote/libvirtd.conf.in 2022-06-02 23:58:30.521538761 +0200 @@ -136,7 +136,7 @@ # the network providing auth (eg, TLS/x509 certificates) # @@ -98,10 +98,10 @@ diff -ur libvirt-6.10.0.orig/src/remote/libvirtd.conf.in libvirt-6.10.0/src/remo #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 -@@ -309,7 +309,7 @@ +diff -ur libvirt-8.4.0.orig/src/remote/meson.build libvirt-8.4.0/src/remote/meson.build +--- libvirt-8.4.0.orig/src/remote/meson.build 2022-06-02 23:58:08.171490440 +0200 ++++ libvirt-8.4.0/src/remote/meson.build 2022-06-02 23:58:30.522538764 +0200 +@@ -302,7 +302,7 @@ if conf.has('WITH_SASL') install_data( 'libvirtd.sasl', @@ -110,102 +110,90 @@ diff -ur libvirt-6.10.0.orig/src/remote/meson.build libvirt-6.10.0/src/remote/me 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 \ - 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-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 +diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args +--- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args 2022-06-02 23:58:08.323490769 +0200 ++++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args 2022-06-02 23:58:30.522538764 +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-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 + /usr/bin/qemu-system-x86_64 \ + -name guest=QEMUGuest1,debug-threads=on \ + -S \ +diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args +--- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args 2022-06-02 23:58:08.324490771 +0200 ++++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args 2022-06-02 23:58:31.535540952 +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 \ + /usr/bin/qemu-system-x86_64 \ -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 + -S \ +diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args +--- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2022-06-02 23:58:08.324490771 +0200 ++++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2022-06-02 23:58:31.535540952 +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 + /usr/bin/qemu-system-x86_64 \ + -name guest=QEMUGuest1,debug-threads=on \ + -S \ +diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args +--- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2022-06-02 23:58:08.324490771 +0200 ++++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2022-06-02 23:58:31.536540954 +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 \ + /usr/bin/qemu-system-x86_64 \ -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-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args +--- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2022-06-02 23:58:08.324490771 +0200 ++++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2022-06-02 23:58:32.239542466 +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 \ + /usr/bin/qemu-system-x86_64 \ -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-8.4.0.orig/tests/qemuxml2argvtest.c libvirt-8.4.0/tests/qemuxml2argvtest.c +--- libvirt-8.4.0.orig/tests/qemuxml2argvtest.c 2022-06-02 23:58:08.469491084 +0200 ++++ libvirt-8.4.0/tests/qemuxml2argvtest.c 2022-06-02 23:59:10.540619907 +0200 +@@ -1509,7 +1509,7 @@ 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("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_LATEST("graphics-vnc-sasl"); driver.config->vncTLS = 1; driver.config->vncTLSx509verify = 1; -@@ -1395,7 +1395,7 @@ - DO_TEST("graphics-spice-no-args", - QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA); +@@ -1531,7 +1531,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("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 + DO_TEST_CAPS_LATEST("graphics-spice-sasl"); + VIR_FREE(driver.config->spiceSASLdir); + driver.config->spiceSASL = 0; +diff -ur libvirt-8.4.0.orig/tests/virconfdata/libvirtd.conf libvirt-8.4.0/tests/virconfdata/libvirtd.conf +--- libvirt-8.4.0.orig/tests/virconfdata/libvirtd.conf 2022-06-02 23:58:08.555491270 +0200 ++++ libvirt-8.4.0/tests/virconfdata/libvirtd.conf 2022-06-02 23:58:32.240542468 +0200 @@ -91,7 +91,7 @@ # the network providing auth (eg, TLS/x509 certificates) # @@ -224,9 +212,9 @@ diff -ur libvirt-6.10.0.orig/tests/virconfdata/libvirtd.conf libvirt-6.10.0/test 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-8.4.0.orig/tests/virconfdata/libvirtd.out libvirt-8.4.0/tests/virconfdata/libvirtd.out +--- libvirt-8.4.0.orig/tests/virconfdata/libvirtd.out 2022-06-02 23:58:08.555491270 +0200 ++++ libvirt-8.4.0/tests/virconfdata/libvirtd.out 2022-06-02 23:58:32.240542468 +0200 @@ -73,7 +73,7 @@ # the network providing auth (eg, TLS/x509 certificates) #