-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.
- <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.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.
- <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.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
-
- %{_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 @@