-diff -urp libvirt-4.1.0.orig/docs/auth.html libvirt-4.1.0/docs/auth.html
---- libvirt-4.1.0.orig/docs/auth.html 2018-02-26 09:05:10.000000000 +0000
-+++ libvirt-4.1.0/docs/auth.html 2018-03-12 10:51:10.186949975 +0000
-@@ -338,7 +338,7 @@ to turn on SASL auth in these listeners.
+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
parameter to <code>scram-sha-1</code>.
</p>
<p>
-diff -urp libvirt-4.1.0.orig/docs/auth.html.in libvirt-4.1.0/docs/auth.html.in
---- libvirt-4.1.0.orig/docs/auth.html.in 2017-08-29 08:38:20.000000000 +0000
-+++ libvirt-4.1.0/docs/auth.html.in 2018-03-12 10:51:10.186949975 +0000
-@@ -267,7 +267,7 @@ to turn on SASL auth in these listeners.
+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
parameter to <code>scram-sha-1</code>.
</p>
<p>
-diff -urp libvirt-4.1.0.orig/libvirt.spec libvirt-4.1.0/libvirt.spec
---- libvirt-4.1.0.orig/libvirt.spec 2018-03-05 09:00:00.000000000 +0000
-+++ libvirt-4.1.0/libvirt.spec 2018-03-12 10:51:10.199949975 +0000
-@@ -2118,7 +2118,7 @@ exit 0
+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 = \
- %{_datadir}/libvirt/test-screenshot.png
-
--%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
-+%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
-
- %files admin
- %{_mandir}/man1/virt-admin.1*
-diff -urp libvirt-4.1.0.orig/libvirt.spec.in libvirt-4.1.0/libvirt.spec.in
---- libvirt-4.1.0.orig/libvirt.spec.in 2018-02-28 16:48:15.000000000 +0000
-+++ libvirt-4.1.0/libvirt.spec.in 2018-03-12 10:51:10.199949975 +0000
-@@ -2118,7 +2118,7 @@ exit 0
-
- %{_datadir}/libvirt/test-screenshot.png
-
--%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
-+%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
-
- %files admin
- %{_mandir}/man1/virt-admin.1*
-diff -urp libvirt-4.1.0.orig/src/Makefile.am libvirt-4.1.0/src/Makefile.am
---- libvirt-4.1.0.orig/src/Makefile.am 2018-03-05 08:57:31.000000000 +0000
-+++ libvirt-4.1.0/src/Makefile.am 2018-03-12 10:52:52.804948819 +0000
-@@ -2300,13 +2300,13 @@ endif ! WITH_LIBVIRTD
- # the WITH_LIBVIRTD conditional
- if WITH_SASL
- install-sasl:
-- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
-+ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
- $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \
-- $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-+ $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
-
- uninstall-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-sasl:
- uninstall-sasl:
-diff -urp libvirt-4.1.0.orig/src/Makefile.in libvirt-4.1.0/src/Makefile.in
---- libvirt-4.1.0.orig/src/Makefile.in 2018-03-05 08:59:17.000000000 +0000
-+++ libvirt-4.1.0/src/Makefile.in 2018-03-12 10:53:22.637948484 +0000
-@@ -12931,13 +12931,13 @@ uninstall-sysconfig:
# This is needed for clients too, so can't wrap in
# the WITH_LIBVIRTD conditional
- @WITH_SASL_TRUE@install-sasl:
--@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
-+@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
- @WITH_SASL_TRUE@ $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \
--@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-+@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
-
- @WITH_SASL_TRUE@uninstall-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-sasl:
- @WITH_SASL_FALSE@uninstall-sasl:
-
-diff -urp libvirt-4.1.0.orig/src/qemu/qemu.conf libvirt-4.1.0/src/qemu/qemu.conf
---- libvirt-4.1.0.orig/src/qemu/qemu.conf 2018-01-12 14:48:37.000000000 +0000
-+++ libvirt-4.1.0/src/qemu/qemu.conf 2018-03-12 10:51:10.199949975 +0000
-@@ -129,18 +129,18 @@
+-@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 @@
# Examples include vinagre, virt-viewer and virt-manager
# itself. UltraVNC, RealVNC, TightVNC do not support this
#
# QEMU implements an extension for providing audio over a VNC connection,
-@@ -205,17 +205,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.
#
# Enable use of TLS encryption on the chardev TCP transports.
#
-diff -urp libvirt-4.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.1.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-4.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2017-09-29 07:30:58.000000000 +0000
-+++ libvirt-4.1.0/src/qemu/test_libvirtd_qemu.aug.in 2018-03-12 10:51:10.199949975 +0000
-@@ -12,7 +12,7 @@ module Test_libvirtd_qemu =
+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 =
{ "vnc_tls_x509_verify" = "1" }
{ "vnc_password" = "XYZ12345" }
{ "vnc_sasl" = "1" }
{ "vnc_allow_host_audio" = "0" }
{ "spice_listen" = "0.0.0.0" }
{ "spice_tls" = "1" }
-@@ -20,7 +20,7 @@ module Test_libvirtd_qemu =
+@@ -21,7 +21,7 @@ module Test_libvirtd_qemu =
{ "spice_auto_unix_socket" = "1" }
{ "spice_password" = "XYZ12345" }
{ "spice_sasl" = "1" }
{ "chardev_tls" = "1" }
{ "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
{ "chardev_tls_x509_verify" = "1" }
-diff -urp libvirt-4.1.0.orig/src/remote/libvirtd.conf libvirt-4.1.0/src/remote/libvirtd.conf
---- libvirt-4.1.0.orig/src/remote/libvirtd.conf 2018-02-26 09:02:18.000000000 +0000
-+++ libvirt-4.1.0/src/remote/libvirtd.conf 2018-03-12 10:52:04.539949363 +0000
+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 @@
# the network providing auth (eg, TLS/x509 certificates)
#
#auth_tcp = "sasl"
# Change the authentication scheme for TLS sockets.
-diff -urp libvirt-4.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-4.1.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
---- libvirt-4.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-01-12 14:48:37.000000000 +0000
-+++ libvirt-4.1.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-03-12 10:51:10.199949975 +0000
+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
+
+ 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 \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-diff -urp libvirt-4.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-4.1.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
---- libvirt-4.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-01-12 14:48:37.000000000 +0000
-+++ libvirt-4.1.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-03-12 10:51:10.199949975 +0000
+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 \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-diff -urp libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-4.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-01-12 14:48:37.000000000 +0000
-+++ libvirt-4.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-03-12 10:51:10.200949975 +0000
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+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-4.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-4.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-01-12 14:48:37.000000000 +0000
-+++ libvirt-4.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-03-12 10:51:10.200949975 +0000
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+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-4.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-4.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-01-12 14:48:37.000000000 +0000
-+++ libvirt-4.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-03-12 10:51:10.200949975 +0000
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+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-4.1.0.orig/tests/qemuxml2argvtest.c libvirt-4.1.0/tests/qemuxml2argvtest.c
---- libvirt-4.1.0.orig/tests/qemuxml2argvtest.c 2018-02-26 09:02:18.000000000 +0000
-+++ libvirt-4.1.0/tests/qemuxml2argvtest.c 2018-03-12 10:51:10.207949975 +0000
-@@ -1097,7 +1097,7 @@ mymain(void)
+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)
driver.config->vncSASL = 1;
VIR_FREE(driver.config->vncSASLdir);
DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
driver.config->vncTLS = 1;
driver.config->vncTLSx509verify = 1;
-@@ -1121,7 +1121,7 @@ mymain(void)
+@@ -1177,7 +1177,7 @@ mymain(void)
DO_TEST("graphics-spice-no-args",
QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
driver.config->spiceSASL = 1;
DO_TEST("graphics-spice-sasl",
QEMU_CAPS_SPICE,
QEMU_CAPS_DEVICE_QXL);
-diff -urp libvirt-4.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.1.0/tests/virconfdata/libvirtd.conf
---- libvirt-4.1.0.orig/tests/virconfdata/libvirtd.conf 2017-10-30 07:32:36.000000000 +0000
-+++ libvirt-4.1.0/tests/virconfdata/libvirtd.conf 2018-03-12 10:51:10.218949974 +0000
+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"
# the network providing auth (eg, TLS/x509 certificates)
#
auth_tcp = "sasl"
# Change the authentication scheme for TLS sockets.
-diff -urp libvirt-4.1.0.orig/tests/virconfdata/libvirtd.out libvirt-4.1.0/tests/virconfdata/libvirtd.out
---- libvirt-4.1.0.orig/tests/virconfdata/libvirtd.out 2017-10-30 07:32:36.000000000 +0000
-+++ libvirt-4.1.0/tests/virconfdata/libvirtd.out 2018-03-12 10:51:10.218949974 +0000
+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"
# the network providing auth (eg, TLS/x509 certificates)
#