+ 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.8.0.orig/docs/auth.html.in libvirt-5.8.0/docs/auth.html.in +--- libvirt-5.8.0.orig/docs/auth.html.in 2019-10-20 16:04:35.553000000 +0200 ++++ libvirt-5.8.0/docs/auth.html.in 2019-10-20 16:04:56.339000000 +0200 +@@ -275,7 +275,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.8.0.orig/src/Makefile.in libvirt-5.8.0/src/Makefile.in
+--- libvirt-5.8.0.orig/src/Makefile.in 2019-10-20 16:04:35.325000000 +0200
++++ libvirt-5.8.0/src/Makefile.in 2019-10-20 16:05:47.662000000 +0200
+@@ -7325,7 +7325,7 @@
- uninstall-data-sasl:
-- rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-- rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
-+ rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
-+ rmdir $(DESTDIR)$(sysconfdir)/sasl/ || :
- else ! WITH_SASL
- install-data-sasl:
- uninstall-data-sasl:
-diff -urp libvirt-2.3.0.orig/daemon/Makefile.in libvirt-2.3.0/daemon/Makefile.in
---- libvirt-2.3.0.orig/daemon/Makefile.in 2016-10-28 19:13:22.638715000 +0000
-+++ libvirt-2.3.0/daemon/Makefile.in 2016-10-28 19:13:48.469715000 +0000
-@@ -2847,13 +2847,13 @@ admin_dispatch.h: $(top_srcdir)/src/rpc/
# This is needed for clients too, so can't wrap in
# the WITH_LIBVIRTD conditional
- @WITH_SASL_TRUE@install-data-sasl:
--@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
-+@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
- @WITH_SASL_TRUE@ $(INSTALL_DATA) $(srcdir)/libvirtd.sasl \
--@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-+@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
-
- @WITH_SASL_TRUE@uninstall-data-sasl:
--@WITH_SASL_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
--@WITH_SASL_TRUE@ rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
-+@WITH_SASL_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
-+@WITH_SASL_TRUE@ rmdir $(DESTDIR)$(sysconfdir)/sasl/ || :
- @WITH_SASL_FALSE@install-data-sasl:
- @WITH_SASL_FALSE@uninstall-data-sasl:
-
-diff -urp libvirt-2.3.0.orig/docs/auth.html libvirt-2.3.0/docs/auth.html
---- libvirt-2.3.0.orig/docs/auth.html 2016-10-28 19:13:22.665715000 +0000
-+++ libvirt-2.3.0/docs/auth.html 2016-10-28 19:13:48.470715000 +0000
-@@ -415,7 +415,7 @@ again:
- The plain TCP socket of the libvirt daemon defaults to using SASL for authentication.
- The SASL mechanism configured by default is DIGEST-MD5, which provides a basic
- username+password style authentication. To enable Kerberos single-sign-on instead,
--the libvirt SASL configuration file must be changed. This is /etc/sasl2/libvirt.conf.
-+the libvirt SASL configuration file must be changed. This is /etc/sasl/libvirt.conf.
- The mech_list parameter must first be changed to gssapi
- instead of the default digest-md5, and keytab should be set to
- /etc/libvirt/krb5.tab . If SASL is enabled on the UNIX
-diff -urp libvirt-2.3.0.orig/docs/auth.html.in libvirt-2.3.0/docs/auth.html.in
---- libvirt-2.3.0.orig/docs/auth.html.in 2016-10-28 19:13:22.677715000 +0000
-+++ libvirt-2.3.0/docs/auth.html.in 2016-10-28 19:13:48.474715000 +0000
-@@ -246,7 +246,7 @@ again:
- The plain TCP socket of the libvirt daemon defaults to using SASL for authentication.
- The SASL mechanism configured by default is DIGEST-MD5, which provides a basic
- username+password style authentication. To enable Kerberos single-sign-on instead,
--the libvirt SASL configuration file must be changed. This is /etc/sasl2/libvirt.conf.
-+the libvirt SASL configuration file must be changed. This is /etc/sasl/libvirt.conf.
- The mech_list parameter must first be changed to gssapi
- instead of the default digest-md5, and keytab should be set to
- /etc/libvirt/krb5.tab . If SASL is enabled on the UNIX
-Only in libvirt-2.3.0: libvirt-sasl.patch
-diff -urp libvirt-2.3.0.orig/libvirt.spec libvirt-2.3.0/libvirt.spec
---- libvirt-2.3.0.orig/libvirt.spec 2016-10-28 19:13:22.458715000 +0000
-+++ libvirt-2.3.0/libvirt.spec 2016-10-28 19:13:48.474715000 +0000
-@@ -1832,7 +1832,7 @@ exit 0
- %{_datadir}/libvirt/cpu_map.xml
- %{_datadir}/libvirt/libvirtLogo.png
-
--%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
-+%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
-
- %files admin
- %{_mandir}/man1/virt-admin.1*
-diff -urp libvirt-2.3.0.orig/libvirt.spec.in libvirt-2.3.0/libvirt.spec.in
---- libvirt-2.3.0.orig/libvirt.spec.in 2016-10-28 19:13:22.455715000 +0000
-+++ libvirt-2.3.0/libvirt.spec.in 2016-10-28 19:13:48.475715000 +0000
-@@ -1832,7 +1832,7 @@ exit 0
- %{_datadir}/libvirt/cpu_map.xml
- %{_datadir}/libvirt/libvirtLogo.png
-
--%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
-+%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
-
- %files admin
- %{_mandir}/man1/virt-admin.1*
-diff -urp libvirt-2.3.0.orig/src/qemu/qemu.conf libvirt-2.3.0/src/qemu/qemu.conf
---- libvirt-2.3.0.orig/src/qemu/qemu.conf 2016-10-28 19:13:22.586715000 +0000
-+++ libvirt-2.3.0/src/qemu/qemu.conf 2016-10-28 19:13:48.475715000 +0000
-@@ -98,18 +98,18 @@
+-@WITH_SASL_TRUE@sasldir = $(sysconfdir)/sasl2
++@WITH_SASL_TRUE@sasldir = $(sysconfdir)/sasl
+ LIBVIRTD_UNIT_VARS = \
+ $(COMMON_UNIT_VARS) \
+ -e 's|[@]name[@]|Libvirt|g' \
+diff -ur libvirt-5.8.0.orig/src/qemu/qemu.conf libvirt-5.8.0/src/qemu/qemu.conf
+--- libvirt-5.8.0.orig/src/qemu/qemu.conf 2019-10-20 16:04:35.385000000 +0200
++++ libvirt-5.8.0/src/qemu/qemu.conf 2019-10-20 16:04:56.343000000 +0200
+@@ -135,18 +135,18 @@
# Examples include vinagre, virt-viewer and virt-manager
# itself. UltraVNC, RealVNC, TightVNC do not support this
#
@@ -135,7 +59,7 @@ diff -urp libvirt-2.3.0.orig/src/qemu/qemu.conf libvirt-2.3.0/src/qemu/qemu.conf
# QEMU implements an extension for providing audio over a VNC connection,
-@@ -173,17 +173,17 @@
+@@ -211,17 +211,17 @@
# Enable use of SASL encryption on the SPICE server. This requires
# a SPICE client which supports the SASL protocol extension.
#
@@ -156,10 +80,10 @@ diff -urp libvirt-2.3.0.orig/src/qemu/qemu.conf libvirt-2.3.0/src/qemu/qemu.conf
# Enable use of TLS encryption on the chardev TCP transports.
#
-diff -urp libvirt-2.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-2.3.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-2.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2016-10-28 19:13:22.588715000 +0000
-+++ libvirt-2.3.0/src/qemu/test_libvirtd_qemu.aug.in 2016-10-28 19:14:27.032715000 +0000
-@@ -11,7 +11,7 @@ module Test_libvirtd_qemu =
+diff -ur libvirt-5.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.8.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-5.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2019-10-20 16:04:35.351000000 +0200
++++ libvirt-5.8.0/src/qemu/test_libvirtd_qemu.aug.in 2019-10-20 16:04:56.343000000 +0200
+@@ -13,7 +13,7 @@
{ "vnc_tls_x509_verify" = "1" }
{ "vnc_password" = "XYZ12345" }
{ "vnc_sasl" = "1" }
@@ -168,7 +92,7 @@ diff -urp libvirt-2.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-2.3.0/sr
{ "vnc_allow_host_audio" = "0" }
{ "spice_listen" = "0.0.0.0" }
{ "spice_tls" = "1" }
-@@ -19,7 +19,7 @@ module Test_libvirtd_qemu =
+@@ -21,7 +21,7 @@
{ "spice_auto_unix_socket" = "1" }
{ "spice_password" = "XYZ12345" }
{ "spice_sasl" = "1" }
@@ -177,91 +101,136 @@ diff -urp libvirt-2.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-2.3.0/sr
{ "chardev_tls" = "1" }
{ "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
{ "chardev_tls_x509_verify" = "1" }
-diff -urp libvirt-2.3.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-2.3.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args
---- libvirt-2.3.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-10-28 19:13:23.321715000 +0000
-+++ libvirt-2.3.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-10-28 19:13:48.476715000 +0000
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+diff -ur libvirt-5.8.0.orig/src/remote/libvirtd.conf.in libvirt-5.8.0/src/remote/libvirtd.conf.in
+--- libvirt-5.8.0.orig/src/remote/libvirtd.conf.in 2019-10-20 16:04:35.339000000 +0200
++++ libvirt-5.8.0/src/remote/libvirtd.conf.in 2019-10-20 16:06:12.441000000 +0200
+@@ -134,7 +134,7 @@
+ # the network providing auth (eg, TLS/x509 certificates)
+ #
+ # - sasl: use SASL infrastructure. The actual auth scheme is then
+-# 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.
+ #
+@@ -166,7 +166,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 @sysconfdir@/sasl2/libvirt.conf
++# mechanism in @sysconfdir@/sasl/libvirt.conf
+ #auth_tcp = "sasl"
+
+ # Change the authentication scheme for TLS sockets.
+diff -ur libvirt-5.8.0.orig/src/remote/Makefile.inc.am libvirt-5.8.0/src/remote/Makefile.inc.am
+--- libvirt-5.8.0.orig/src/remote/Makefile.inc.am 2019-10-20 16:04:35.339000000 +0200
++++ libvirt-5.8.0/src/remote/Makefile.inc.am 2019-10-20 16:04:58.545000000 +0200
+@@ -360,7 +360,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.8.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.8.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
+--- libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-10-20 16:04:35.069000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-10-20 16:04:58.545000000 +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 \
+ QEMU_AUDIO_DRV=spice \
+ /usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-diff -urp libvirt-2.3.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-2.3.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args
---- libvirt-2.3.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-10-28 19:13:23.321715000 +0000
-+++ libvirt-2.3.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-10-28 19:13:48.476715000 +0000
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+--- libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2019-10-20 16:04:35.078000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2019-10-20 16:04:58.546000000 +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 \
+ /usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
---- libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-10-28 19:13:23.399715000 +0000
-+++ libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-10-28 19:13:48.476715000 +0000
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
+--- libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-10-20 16:04:35.069000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-10-20 16:04:58.546000000 +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 \
+ QEMU_AUDIO_DRV=none \
+ /usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
---- libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-10-28 19:13:23.399715000 +0000
-+++ libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-10-28 19:13:48.477715000 +0000
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+--- libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2019-10-20 16:04:35.078000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2019-10-20 16:04:58.546000000 +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 \
- -name QEMUGuest1 \
-diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
---- libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-10-28 19:13:23.399715000 +0000
-+++ libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-10-28 19:13:48.477715000 +0000
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+ /usr/bin/qemu-system-i686 \
+ -name guest=QEMUGuest1,debug-threads=on \
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
+--- libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2019-10-20 16:04:35.073000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2019-10-20 16:04:58.546000000 +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 \
- -name QEMUGuest1 \
-diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvtest.c libvirt-2.3.0/tests/qemuxml2argvtest.c
---- libvirt-2.3.0.orig/tests/qemuxml2argvtest.c 2016-10-28 19:13:22.696715000 +0000
-+++ libvirt-2.3.0/tests/qemuxml2argvtest.c 2016-10-28 19:13:48.478715000 +0000
-@@ -978,7 +978,7 @@ mymain(void)
+ /usr/bin/qemu-system-i686 \
+ -name guest=QEMUGuest1,debug-threads=on \
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+--- libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2019-10-20 16:04:35.075000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2019-10-20 16:04:58.546000000 +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 guest=QEMUGuest1,debug-threads=on \
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvtest.c libvirt-5.8.0/tests/qemuxml2argvtest.c
+--- libvirt-5.8.0.orig/tests/qemuxml2argvtest.c 2019-10-20 16:04:35.085000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvtest.c 2019-10-20 16:04:58.547000000 +0200
+@@ -1215,7 +1215,7 @@
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);
+ DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
driver.config->vncTLS = 1;
driver.config->vncTLSx509verify = 1;
-@@ -1002,7 +1002,7 @@ mymain(void)
+@@ -1247,7 +1247,7 @@
DO_TEST("graphics-spice-no-args",
- QEMU_CAPS_SPICE);
+ 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_VGA_QXL,
QEMU_CAPS_SPICE,
-diff -urp libvirt-2.3.0.orig/tests/virconfdata/libvirtd.conf libvirt-2.3.0/tests/virconfdata/libvirtd.conf
---- libvirt-2.3.0.orig/tests/virconfdata/libvirtd.conf 2016-10-28 19:13:23.469715000 +0000
-+++ libvirt-2.3.0/tests/virconfdata/libvirtd.conf 2016-10-28 19:13:48.478715000 +0000
-@@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
+ QEMU_CAPS_DEVICE_QXL);
+diff -ur libvirt-5.8.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.8.0/tests/virconfdata/libvirtd.conf
+--- libvirt-5.8.0.orig/tests/virconfdata/libvirtd.conf 2019-10-20 16:04:35.211000000 +0200
++++ libvirt-5.8.0/tests/virconfdata/libvirtd.conf 2019-10-20 16:04:58.547000000 +0200
+@@ -91,7 +91,7 @@
# the network providing auth (eg, TLS/x509 certificates)
#
# - sasl: use SASL infrastructure. The actual auth scheme is then
@@ -270,7 +239,7 @@ diff -urp libvirt-2.3.0.orig/tests/virconfdata/libvirtd.conf libvirt-2.3.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
@@ -279,10 +248,10 @@ diff -urp libvirt-2.3.0.orig/tests/virconfdata/libvirtd.conf libvirt-2.3.0/tests
auth_tcp = "sasl"
# Change the authentication scheme for TLS sockets.
-diff -urp libvirt-2.3.0.orig/tests/virconfdata/libvirtd.out libvirt-2.3.0/tests/virconfdata/libvirtd.out
---- libvirt-2.3.0.orig/tests/virconfdata/libvirtd.out 2016-10-28 19:13:23.469715000 +0000
-+++ libvirt-2.3.0/tests/virconfdata/libvirtd.out 2016-10-28 19:13:48.479715000 +0000
-@@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700"
+diff -ur libvirt-5.8.0.orig/tests/virconfdata/libvirtd.out libvirt-5.8.0/tests/virconfdata/libvirtd.out
+--- libvirt-5.8.0.orig/tests/virconfdata/libvirtd.out 2019-10-20 16:04:35.211000000 +0200
++++ libvirt-5.8.0/tests/virconfdata/libvirtd.out 2019-10-20 16:04:58.547000000 +0200
+@@ -73,7 +73,7 @@
# the network providing auth (eg, TLS/x509 certificates)
#
# - sasl: use SASL infrastructure. The actual auth scheme is then
@@ -291,7 +260,7 @@ diff -urp libvirt-2.3.0.orig/tests/virconfdata/libvirtd.out libvirt-2.3.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