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
@@ -73,10 +10,10 @@ diff -urp libvirt-3.2.0.orig/docs/auth.html libvirt-3.2.0/docs/auth.html
parameter to scram-sha-1.
-diff -urp libvirt-3.2.0.orig/docs/auth.html.in libvirt-3.2.0/docs/auth.html.in ---- libvirt-3.2.0.orig/docs/auth.html.in 2017-03-24 11:48:12.048612800 +0000 -+++ libvirt-3.2.0/docs/auth.html.in 2017-04-11 12:47:14.492286837 +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.
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
@@ -85,34 +22,22 @@ diff -urp libvirt-3.2.0.orig/docs/auth.html.in libvirt-3.2.0/docs/auth.html.in
parameter to scram-sha-1.
-diff -urp libvirt-3.2.0.orig/libvirt.spec libvirt-3.2.0/libvirt.spec ---- libvirt-3.2.0.orig/libvirt.spec 2017-04-02 14:58:24.226088535 +0000 -+++ libvirt-3.2.0/libvirt.spec 2017-04-11 12:43:19.501270077 +0000 -@@ -1988,7 +1988,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-3.2.0.orig/libvirt.spec.in libvirt-3.2.0/libvirt.spec.in ---- libvirt-3.2.0.orig/libvirt.spec.in 2017-04-02 14:53:27.904098953 +0000 -+++ libvirt-3.2.0/libvirt.spec.in 2017-04-11 12:43:19.501270077 +0000 -@@ -1988,7 +1988,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-3.2.0.orig/src/qemu/qemu.conf libvirt-3.2.0/src/qemu/qemu.conf ---- libvirt-3.2.0.orig/src/qemu/qemu.conf 2017-03-28 06:58:37.453915260 +0000 -+++ libvirt-3.2.0/src/qemu/qemu.conf 2017-04-11 12:47:07.132286312 +0000 -@@ -119,18 +119,18 @@ + # 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 @@ # Examples include vinagre, virt-viewer and virt-manager # itself. UltraVNC, RealVNC, TightVNC do not support this # @@ -134,7 +59,7 @@ diff -urp libvirt-3.2.0.orig/src/qemu/qemu.conf libvirt-3.2.0/src/qemu/qemu.conf # QEMU implements an extension for providing audio over a VNC connection, -@@ -194,17 +194,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. # @@ -155,10 +80,10 @@ diff -urp libvirt-3.2.0.orig/src/qemu/qemu.conf libvirt-3.2.0/src/qemu/qemu.conf # Enable use of TLS encryption on the chardev TCP transports. # -diff -urp libvirt-3.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-3.2.0/src/qemu/test_libvirtd_qemu.aug.in ---- libvirt-3.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2017-03-28 06:58:37.467915094 +0000 -+++ libvirt-3.2.0/src/qemu/test_libvirtd_qemu.aug.in 2017-04-11 12:43:19.502270077 +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" } @@ -167,7 +92,7 @@ diff -urp libvirt-3.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-3.2.0/sr { "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" } @@ -176,9 +101,42 @@ diff -urp libvirt-3.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-3.2.0/sr { "chardev_tls" = "1" } { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" } { "chardev_tls_x509_verify" = "1" } -diff -urp libvirt-3.2.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-3.2.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args ---- libvirt-3.2.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-02-16 14:25:07.637706478 +0000 -+++ libvirt-3.2.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2017-04-11 12:43:19.502270077 +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) + # + # - 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 + # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. + # For non-TCP or TLS sockets, any scheme is allowed. + # +@@ -154,7 +154,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 + #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 + + 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 \ @@ -186,11 +144,11 @@ diff -urp libvirt-3.2.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sa -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-3.2.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-3.2.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args ---- libvirt-3.2.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-02-16 14:25:07.637706478 +0000 -+++ libvirt-3.2.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2017-04-11 12:43:19.502270077 +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 \ @@ -198,48 +156,48 @@ diff -urp libvirt-3.2.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tl -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-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-3.2.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args ---- libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-07-27 12:39:35.395705103 +0000 -+++ libvirt-3.2.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2017-04-11 12:43:19.502270077 +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 \ + /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-3.2.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args ---- libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-07-27 12:39:35.396705092 +0000 -+++ libvirt-3.2.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2017-04-11 12:43:19.502270077 +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 \ + /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-3.2.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args ---- libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-07-27 12:39:35.396705092 +0000 -+++ libvirt-3.2.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2017-04-11 12:43:19.502270077 +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 \ + /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvtest.c libvirt-3.2.0/tests/qemuxml2argvtest.c ---- libvirt-3.2.0.orig/tests/qemuxml2argvtest.c 2017-03-28 06:58:37.491914811 +0000 -+++ libvirt-3.2.0/tests/qemuxml2argvtest.c 2017-04-11 12:43:19.503270077 +0000 -@@ -1032,7 +1032,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); @@ -248,7 +206,7 @@ diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvtest.c libvirt-3.2.0/tests/qemuxm DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); driver.config->vncTLS = 1; driver.config->vncTLSx509verify = 1; -@@ -1056,7 +1056,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; @@ -257,9 +215,9 @@ diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvtest.c libvirt-3.2.0/tests/qemuxm DO_TEST("graphics-spice-sasl", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_QXL); -diff -urp libvirt-3.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-3.2.0/tests/virconfdata/libvirtd.conf ---- libvirt-3.2.0.orig/tests/virconfdata/libvirtd.conf 2016-04-26 02:20:09.322242995 +0000 -+++ libvirt-3.2.0/tests/virconfdata/libvirtd.conf 2017-04-11 12:47:00.916285869 +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) # @@ -278,9 +236,9 @@ diff -urp libvirt-3.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-3.2.0/tests auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -urp libvirt-3.2.0.orig/tests/virconfdata/libvirtd.out libvirt-3.2.0/tests/virconfdata/libvirtd.out ---- libvirt-3.2.0.orig/tests/virconfdata/libvirtd.out 2016-04-26 02:20:09.322242995 +0000 -+++ libvirt-3.2.0/tests/virconfdata/libvirtd.out 2017-04-11 12:46:58.300285682 +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) #