-diff -urp libvirt-2.1.0.orig/daemon/libvirtd.conf libvirt-2.1.0/daemon/libvirtd.conf
---- libvirt-2.1.0.orig/daemon/libvirtd.conf 2016-08-20 10:07:32.043554000 +0000
-+++ libvirt-2.1.0/daemon/libvirtd.conf 2016-08-20 10:07:47.074554000 +0000
+diff -urp libvirt-4.0.0.orig/daemon/libvirtd.conf libvirt-4.0.0/daemon/libvirtd.conf
+--- libvirt-4.0.0.orig/daemon/libvirtd.conf 2018-01-24 11:43:38.147588228 +0000
++++ libvirt-4.0.0/daemon/libvirtd.conf 2018-01-24 11:44:02.010586806 +0000
@@ -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-2.1.0.orig/daemon/Makefile.am libvirt-2.1.0/daemon/Makefile.am
---- libvirt-2.1.0.orig/daemon/Makefile.am 2016-08-20 10:07:32.040554000 +0000
-+++ libvirt-2.1.0/daemon/Makefile.am 2016-08-20 10:07:47.074554000 +0000
-@@ -528,13 +528,13 @@ POD2MAN = pod2man -c "Virtualization Sup
+diff -urp libvirt-4.0.0.orig/daemon/Makefile.am libvirt-4.0.0/daemon/Makefile.am
+--- libvirt-4.0.0.orig/daemon/Makefile.am 2018-01-24 11:43:38.146588228 +0000
++++ libvirt-4.0.0/daemon/Makefile.am 2018-01-24 11:44:02.010586806 +0000
+@@ -477,13 +477,13 @@ POD2MAN = pod2man -c "Virtualization Sup
# the WITH_LIBVIRTD conditional
if WITH_SASL
install-data-sasl:
else ! WITH_SASL
install-data-sasl:
uninstall-data-sasl:
-diff -urp libvirt-2.1.0.orig/daemon/Makefile.in libvirt-2.1.0/daemon/Makefile.in
---- libvirt-2.1.0.orig/daemon/Makefile.in 2016-08-20 10:07:32.040554000 +0000
-+++ libvirt-2.1.0/daemon/Makefile.in 2016-08-20 10:07:47.076554000 +0000
-@@ -2842,13 +2842,13 @@ admin_dispatch.h: $(top_srcdir)/src/rpc/
+diff -urp libvirt-4.0.0.orig/daemon/Makefile.in libvirt-4.0.0/daemon/Makefile.in
+--- libvirt-4.0.0.orig/daemon/Makefile.in 2018-01-24 11:43:38.146588228 +0000
++++ libvirt-4.0.0/daemon/Makefile.in 2018-01-24 11:44:02.010586806 +0000
+@@ -2941,13 +2941,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_FALSE@install-data-sasl:
@WITH_SASL_FALSE@uninstall-data-sasl:
-diff -urp libvirt-2.1.0.orig/docs/auth.html libvirt-2.1.0/docs/auth.html
---- libvirt-2.1.0.orig/docs/auth.html 2016-08-20 10:07:32.082554000 +0000
-+++ libvirt-2.1.0/docs/auth.html 2016-08-20 10:07:47.076554000 +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 <code>/etc/sasl2/libvirt.conf</code>.
-+the libvirt SASL configuration file must be changed. This is <code>/etc/sasl/libvirt.conf</code>.
- The <code>mech_list</code> parameter must first be changed to <code>gssapi</code>
- instead of the default <code>digest-md5</code>, and keytab should be set to
- <code>/etc/libvirt/krb5.tab</code> . If SASL is enabled on the UNIX
-diff -urp libvirt-2.1.0.orig/docs/auth.html.in libvirt-2.1.0/docs/auth.html.in
---- libvirt-2.1.0.orig/docs/auth.html.in 2016-08-20 10:07:32.100554000 +0000
-+++ libvirt-2.1.0/docs/auth.html.in 2016-08-20 10:07:47.077554000 +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 <code>/etc/sasl2/libvirt.conf</code>.
-+the libvirt SASL configuration file must be changed. This is <code>/etc/sasl/libvirt.conf</code>.
- The <code>mech_list</code> parameter must first be changed to <code>gssapi</code>
- instead of the default <code>digest-md5</code>, and keytab should be set to
- <code>/etc/libvirt/krb5.tab</code> . If SASL is enabled on the UNIX
-diff -urp libvirt-2.1.0.orig/libvirt.spec libvirt-2.1.0/libvirt.spec
---- libvirt-2.1.0.orig/libvirt.spec 2016-08-20 10:07:31.917554000 +0000
-+++ libvirt-2.1.0/libvirt.spec 2016-08-20 10:08:58.351554000 +0000
-@@ -1827,7 +1827,7 @@ exit 0
- %{_datadir}/libvirt/cpu_map.xml
- %{_datadir}/libvirt/libvirtLogo.png
+diff -urp libvirt-4.0.0.orig/docs/auth.html libvirt-4.0.0/docs/auth.html
+--- libvirt-4.0.0.orig/docs/auth.html 2018-01-24 11:43:38.029588235 +0000
++++ libvirt-4.0.0/docs/auth.html 2018-01-24 11:44:02.011586806 +0000
+@@ -338,7 +338,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-4.0.0.orig/docs/auth.html.in libvirt-4.0.0/docs/auth.html.in
+--- libvirt-4.0.0.orig/docs/auth.html.in 2018-01-24 11:43:38.033588235 +0000
++++ libvirt-4.0.0/docs/auth.html.in 2018-01-24 11:44:02.011586806 +0000
+@@ -267,7 +267,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-4.0.0.orig/libvirt.spec libvirt-4.0.0/libvirt.spec
+--- libvirt-4.0.0.orig/libvirt.spec 2018-01-24 11:43:38.090588232 +0000
++++ libvirt-4.0.0/libvirt.spec 2018-01-24 11:44:02.011586806 +0000
+@@ -2106,7 +2106,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-2.1.0.orig/libvirt.spec.in libvirt-2.1.0/libvirt.spec.in
---- libvirt-2.1.0.orig/libvirt.spec.in 2016-08-20 10:07:31.915554000 +0000
-+++ libvirt-2.1.0/libvirt.spec.in 2016-08-20 10:09:09.031554000 +0000
-@@ -1827,7 +1827,7 @@ exit 0
- %{_datadir}/libvirt/cpu_map.xml
- %{_datadir}/libvirt/libvirtLogo.png
+diff -urp libvirt-4.0.0.orig/libvirt.spec.in libvirt-4.0.0/libvirt.spec.in
+--- libvirt-4.0.0.orig/libvirt.spec.in 2018-01-24 11:43:38.089588232 +0000
++++ libvirt-4.0.0/libvirt.spec.in 2018-01-24 11:44:02.011586806 +0000
+@@ -2106,7 +2106,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-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.0/src/qemu/qemu.conf
---- libvirt-2.1.0.orig/src/qemu/qemu.conf 2016-08-20 10:07:31.997554000 +0000
-+++ libvirt-2.1.0/src/qemu/qemu.conf 2016-08-20 10:07:47.087554000 +0000
-@@ -74,18 +74,18 @@
+diff -urp libvirt-4.0.0.orig/src/qemu/qemu.conf libvirt-4.0.0/src/qemu/qemu.conf
+--- libvirt-4.0.0.orig/src/qemu/qemu.conf 2018-01-24 11:43:38.123588230 +0000
++++ libvirt-4.0.0/src/qemu/qemu.conf 2018-01-24 11:44:02.012586806 +0000
+@@ -129,18 +129,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,
-@@ -154,17 +154,17 @@
+@@ -205,17 +205,17 @@
# Enable use of SASL encryption on the SPICE server. This requires
# a SPICE client which supports the SASL protocol extension.
#
-#spice_sasl_dir = "/some/directory/sasl2"
+#spice_sasl_dir = "/some/directory/sasl"
-
- # By default, if no graphical front end is configured, libvirt will disable
-diff -urp libvirt-2.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-2.1.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-2.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2016-08-20 10:07:31.997554000 +0000
-+++ libvirt-2.1.0/src/qemu/test_libvirtd_qemu.aug.in 2016-08-20 10:09:46.009554000 +0000
-@@ -9,7 +9,7 @@ module Test_libvirtd_qemu =
+ # Enable use of TLS encryption on the chardev TCP transports.
+ #
+diff -urp libvirt-4.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.0.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-4.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2018-01-24 11:43:38.123588230 +0000
++++ libvirt-4.0.0/src/qemu/test_libvirtd_qemu.aug.in 2018-01-24 11:44:02.012586806 +0000
+@@ -12,7 +12,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" }
-@@ -17,7 +17,7 @@ module Test_libvirtd_qemu =
+@@ -20,7 +20,7 @@ module Test_libvirtd_qemu =
{ "spice_auto_unix_socket" = "1" }
{ "spice_password" = "XYZ12345" }
{ "spice_sasl" = "1" }
-{ "spice_sasl_dir" = "/some/directory/sasl2" }
+{ "spice_sasl_dir" = "/some/directory/sasl" }
- { "nographics_allow_host_audio" = "1" }
- { "remote_display_port_min" = "5900" }
- { "remote_display_port_max" = "65535" }
-diff -urp libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args
---- libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-08-20 10:07:32.590554000 +0000
-+++ libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-08-20 10:07:48.739554000 +0000
+ { "chardev_tls" = "1" }
+ { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
+ { "chardev_tls_x509_verify" = "1" }
+diff -urp libvirt-4.0.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-4.0.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
+--- libvirt-4.0.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-01-24 11:43:39.724588134 +0000
++++ libvirt-4.0.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-01-24 11:57:36.684538248 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
HOME=/home/test \
USER=test \
-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.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args
---- libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-08-20 10:07:32.591554000 +0000
-+++ libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-08-20 10:07:48.739554000 +0000
+diff -urp libvirt-4.0.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-4.0.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
+--- libvirt-4.0.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-01-24 11:43:39.724588134 +0000
++++ libvirt-4.0.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-01-24 11:57:57.508537006 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
HOME=/home/test \
USER=test \
-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.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
---- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-08-20 10:07:32.622554000 +0000
-+++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-08-20 10:07:48.740554000 +0000
+diff -urp libvirt-4.0.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-4.0.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
+--- libvirt-4.0.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-01-24 11:43:39.747588133 +0000
++++ libvirt-4.0.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-01-24 11:58:03.869536627 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
HOME=/home/test \
USER=test \
-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-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
---- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-08-20 10:07:32.623554000 +0000
-+++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-08-20 10:07:48.740554000 +0000
+diff -urp libvirt-4.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-4.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+--- libvirt-4.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-01-24 11:43:39.747588133 +0000
++++ libvirt-4.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-01-24 11:58:00.876536806 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
HOME=/home/test \
USER=test \
-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.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
---- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-08-20 10:07:32.623554000 +0000
-+++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-08-20 10:07:48.740554000 +0000
+diff -urp libvirt-4.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-4.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
+--- libvirt-4.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-01-24 11:43:39.747588133 +0000
++++ libvirt-4.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-01-24 11:58:06.308536482 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
HOME=/home/test \
USER=test \
-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.1.0.orig/tests/qemuxml2argvtest.c libvirt-2.1.0/tests/qemuxml2argvtest.c
---- libvirt-2.1.0.orig/tests/qemuxml2argvtest.c 2016-08-20 10:07:32.132554000 +0000
-+++ libvirt-2.1.0/tests/qemuxml2argvtest.c 2016-08-20 10:07:48.741554000 +0000
-@@ -929,7 +929,7 @@ mymain(void)
+diff -urp libvirt-4.0.0.orig/tests/qemuxml2argvtest.c libvirt-4.0.0/tests/qemuxml2argvtest.c
+--- libvirt-4.0.0.orig/tests/qemuxml2argvtest.c 2018-01-24 11:43:38.900588183 +0000
++++ libvirt-4.0.0/tests/qemuxml2argvtest.c 2018-01-24 11:44:07.107586502 +0000
+@@ -1092,7 +1092,7 @@ mymain(void)
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;
-@@ -953,7 +953,7 @@ mymain(void)
+@@ -1116,7 +1116,7 @@ mymain(void)
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.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-2.1.0/tests/virconfdata/libvirtd.conf
---- libvirt-2.1.0.orig/tests/virconfdata/libvirtd.conf 2016-08-20 10:07:33.070554000 +0000
-+++ libvirt-2.1.0/tests/virconfdata/libvirtd.conf 2016-08-20 10:09:58.088554000 +0000
+ QEMU_CAPS_DEVICE_QXL);
+diff -urp libvirt-4.0.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.0.0/tests/virconfdata/libvirtd.conf
+--- libvirt-4.0.0.orig/tests/virconfdata/libvirtd.conf 2018-01-24 11:43:38.873588185 +0000
++++ libvirt-4.0.0/tests/virconfdata/libvirtd.conf 2018-01-24 11:44:07.107586502 +0000
@@ -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-2.1.0.orig/tests/virconfdata/libvirtd.out libvirt-2.1.0/tests/virconfdata/libvirtd.out
---- libvirt-2.1.0.orig/tests/virconfdata/libvirtd.out 2016-08-20 10:07:33.070554000 +0000
-+++ libvirt-2.1.0/tests/virconfdata/libvirtd.out 2016-08-20 10:10:07.948554000 +0000
+diff -urp libvirt-4.0.0.orig/tests/virconfdata/libvirtd.out libvirt-4.0.0/tests/virconfdata/libvirtd.out
+--- libvirt-4.0.0.orig/tests/virconfdata/libvirtd.out 2018-01-24 11:43:38.873588185 +0000
++++ libvirt-4.0.0/tests/virconfdata/libvirtd.out 2018-01-24 11:44:07.108586502 +0000
@@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700"
# the network providing auth (eg, TLS/x509 certificates)
#