-diff -urp libvirt-4.2.0.orig/docs/auth.html libvirt-4.2.0/docs/auth.html
---- libvirt-4.2.0.orig/docs/auth.html 2018-04-12 12:41:58.327580941 +0000
-+++ libvirt-4.2.0/docs/auth.html 2018-04-12 12:42:15.267580750 +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.2.0.orig/docs/auth.html.in libvirt-4.2.0/docs/auth.html.in
---- libvirt-4.2.0.orig/docs/auth.html.in 2018-04-12 12:41:58.331580941 +0000
-+++ libvirt-4.2.0/docs/auth.html.in 2018-04-12 12:42:15.268580750 +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.2.0.orig/libvirt.spec libvirt-4.2.0/libvirt.spec
---- libvirt-4.2.0.orig/libvirt.spec 2018-04-12 12:41:58.347580941 +0000
-+++ libvirt-4.2.0/libvirt.spec 2018-04-12 12:42:15.268580750 +0000
-@@ -2124,7 +2124,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.2.0.orig/libvirt.spec.in libvirt-4.2.0/libvirt.spec.in
---- libvirt-4.2.0.orig/libvirt.spec.in 2018-04-12 12:41:58.346580941 +0000
-+++ libvirt-4.2.0/libvirt.spec.in 2018-04-12 12:42:15.268580750 +0000
-@@ -2124,7 +2124,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.2.0.orig/src/Makefile.in libvirt-4.2.0/src/Makefile.in
---- libvirt-4.2.0.orig/src/Makefile.in 2018-04-12 12:41:58.401580940 +0000
-+++ libvirt-4.2.0/src/Makefile.in 2018-04-12 12:42:15.272580750 +0000
-@@ -13098,13 +13098,13 @@ lxc/lxc_controller_dispatch.h: $(srcdir)
- # 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.2.0.orig/src/qemu/qemu.conf libvirt-4.2.0/src/qemu/qemu.conf
---- libvirt-4.2.0.orig/src/qemu/qemu.conf 2018-04-12 12:41:58.380580940 +0000
-+++ libvirt-4.2.0/src/qemu/qemu.conf 2018-04-12 12:42:15.272580750 +0000
-@@ -129,18 +129,18 @@
+diff -ur libvirt-8.4.0.orig/docs/auth.rst libvirt-8.4.0/docs/auth.rst
+--- libvirt-8.4.0.orig/docs/auth.rst 2022-06-02 23:58:08.077490237 +0200
++++ libvirt-8.4.0/docs/auth.rst 2022-06-02 23:58:27.936533169 +0200
+@@ -225,7 +225,7 @@
+
+ Since the libvirt SASL config file defaults to using ``GSSAPI`` (Kerberos), a
+ config change is required to enable plain password auth. This is done by
+-editing ``/etc/sasl2/libvirt.conf`` to set the ``mech_list``
++editing ``/etc/sasl/libvirt.conf`` to set the ``mech_list``
+ parameter to ``scram-sha-256``.
+
+ **Note:** previous versions of libvirt suggested ``DIGEST-MD5`` and
+diff -ur libvirt-8.4.0.orig/src/qemu/qemu.conf.in libvirt-8.4.0/src/qemu/qemu.conf.in
+--- libvirt-8.4.0.orig/src/qemu/qemu.conf.in 2022-06-02 23:58:08.164490425 +0200
++++ libvirt-8.4.0/src/qemu/qemu.conf.in 2022-06-03 00:01:05.398849381 +0200
+@@ -141,18 +141,18 @@