X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-sasl.patch;h=1ebc932fb2bfcff9a7fc33045bb556007b44d8ff;hb=60d0909aad60cee96ddf2119563f92fe778f2269;hp=d23a77027af33bc8fa780687454a9639fe2dcdfd;hpb=c833928a7e72d39a9e4302b345e26bad8fbbd5ff;p=packages%2Flibvirt.git

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index d23a770..1ebc932 100644
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,42 +1,30 @@
-diff -ur libvirt-5.5.0.orig/docs/auth.html libvirt-5.5.0/docs/auth.html
---- libvirt-5.5.0.orig/docs/auth.html	2019-07-14 19:23:33.979000000 +0200
-+++ libvirt-5.5.0/docs/auth.html	2019-07-14 19:23:54.564000000 +0200
-@@ -318,7 +318,7 @@
-         <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 -ur libvirt-5.5.0.orig/docs/auth.html.in libvirt-5.5.0/docs/auth.html.in
---- libvirt-5.5.0.orig/docs/auth.html.in	2019-07-14 19:23:33.991000000 +0200
-+++ libvirt-5.5.0/docs/auth.html.in	2019-07-14 19:23:54.564000000 +0200
-@@ -277,7 +277,7 @@
+diff -ur libvirt-6.1.0.orig/docs/auth.html.in libvirt-6.1.0/docs/auth.html.in
+--- libvirt-6.1.0.orig/docs/auth.html.in	2020-03-06 09:47:34.102000000 +0100
++++ libvirt-6.1.0/docs/auth.html.in	2020-03-06 09:48:38.900000000 +0100
+@@ -275,7 +275,7 @@
      <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
+ config change is required 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 -ur libvirt-5.5.0.orig/src/Makefile.in libvirt-5.5.0/src/Makefile.in
---- libvirt-5.5.0.orig/src/Makefile.in	2019-07-14 19:23:33.798000000 +0200
-+++ libvirt-5.5.0/src/Makefile.in	2019-07-14 19:23:54.566000000 +0200
-@@ -6723,7 +6723,7 @@
+diff -ur libvirt-6.1.0.orig/src/Makefile.in libvirt-6.1.0/src/Makefile.in
+--- libvirt-6.1.0.orig/src/Makefile.in	2020-03-06 09:47:34.051000000 +0100
++++ libvirt-6.1.0/src/Makefile.in	2020-03-06 09:47:52.660000000 +0100
+@@ -6273,7 +6273,7 @@
  
  # 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 -ur libvirt-5.5.0.orig/src/qemu/qemu.conf libvirt-5.5.0/src/qemu/qemu.conf
---- libvirt-5.5.0.orig/src/qemu/qemu.conf	2019-07-14 19:23:33.825000000 +0200
-+++ libvirt-5.5.0/src/qemu/qemu.conf	2019-07-14 19:23:54.566000000 +0200
+ LIBVIRTD_UNIT_VARS = \
+ 	$(COMMON_UNIT_VARS) \
+ 	-e 's|[@]name[@]|Libvirt|g' \
+diff -ur libvirt-6.1.0.orig/src/qemu/qemu.conf libvirt-6.1.0/src/qemu/qemu.conf
+--- libvirt-6.1.0.orig/src/qemu/qemu.conf	2020-03-06 09:47:34.078000000 +0100
++++ libvirt-6.1.0/src/qemu/qemu.conf	2020-03-06 09:47:52.660000000 +0100
 @@ -135,18 +135,18 @@
  # Examples include vinagre, virt-viewer and virt-manager
  # itself. UltraVNC, RealVNC, TightVNC do not support this
@@ -80,9 +68,9 @@ diff -ur libvirt-5.5.0.orig/src/qemu/qemu.conf libvirt-5.5.0/src/qemu/qemu.conf
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-diff -ur libvirt-5.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.5.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-5.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in	2019-07-14 19:23:33.824000000 +0200
-+++ libvirt-5.5.0/src/qemu/test_libvirtd_qemu.aug.in	2019-07-14 19:23:54.566000000 +0200
+diff -ur libvirt-6.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-6.1.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-6.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in	2020-03-06 09:47:34.077000000 +0100
++++ libvirt-6.1.0/src/qemu/test_libvirtd_qemu.aug.in	2020-03-06 09:47:52.661000000 +0100
 @@ -13,7 +13,7 @@
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
@@ -101,42 +89,42 @@ diff -ur libvirt-5.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.5.0/src
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-diff -ur libvirt-5.5.0.orig/src/remote/libvirtd.conf libvirt-5.5.0/src/remote/libvirtd.conf
---- libvirt-5.5.0.orig/src/remote/libvirtd.conf	2019-07-14 19:23:33.810000000 +0200
-+++ libvirt-5.5.0/src/remote/libvirtd.conf	2019-07-14 19:23:54.566000000 +0200
-@@ -101,7 +101,7 @@
+diff -ur libvirt-6.1.0.orig/src/remote/Makefile.inc.am libvirt-6.1.0/src/remote/Makefile.inc.am
+--- libvirt-6.1.0.orig/src/remote/Makefile.inc.am	2020-03-06 09:47:34.063000000 +0100
++++ libvirt-6.1.0/src/remote/Makefile.inc.am	2020-03-06 09:47:52.661000000 +0100
+@@ -382,7 +382,7 @@
+ # 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 -ur libvirt-6.1.0.orig/src/remote/libvirtd.conf.in libvirt-6.1.0/src/remote/libvirtd.conf.in
+--- libvirt-6.1.0.orig/src/remote/libvirtd.conf.in	2020-03-06 09:47:34.063000000 +0100
++++ libvirt-6.1.0/src/remote/libvirtd.conf.in	2020-03-06 09:47:52.661000000 +0100
+@@ -134,7 +134,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
+-#          controlled from @sysconfdir@/sasl2/libvirt.conf. For the TCP
++#          controlled from @sysconfdir@/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.
  #
-@@ -132,7 +132,7 @@
+@@ -166,7 +166,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
+-# mechanism in @sysconfdir@/sasl2/libvirt.conf
++# mechanism in @sysconfdir@/sasl/libvirt.conf
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-5.5.0.orig/src/remote/Makefile.inc.am libvirt-5.5.0/src/remote/Makefile.inc.am
---- libvirt-5.5.0.orig/src/remote/Makefile.inc.am	2019-07-14 19:23:33.812000000 +0200
-+++ libvirt-5.5.0/src/remote/Makefile.inc.am	2019-07-14 19:23:54.567000000 +0200
-@@ -244,7 +244,7 @@
- # 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 -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args	2019-07-14 19:23:33.362000000 +0200
-+++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args	2019-07-14 19:23:59.923000000 +0200
+diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
+--- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args	2020-03-06 09:47:33.713000000 +0100
++++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args	2020-03-06 09:47:52.661000000 +0100
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -144,11 +132,11 @@ diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libv
 -SASL_CONF_PATH=/root/.sasl2 \
 +SASL_CONF_PATH=/root/.sasl \
  QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-i686 \
+ /usr/bin/qemu-system-i386 \
  -name QEMUGuest1 \
-diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args	2019-07-14 19:23:33.375000000 +0200
-+++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args	2019-07-14 19:23:59.923000000 +0200
+diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+--- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args	2020-03-06 09:47:33.722000000 +0100
++++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args	2020-03-06 09:47:52.662000000 +0100
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -156,11 +144,11 @@ diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvir
 -SASL_CONF_PATH=/root/.sasl2 \
 +SASL_CONF_PATH=/root/.sasl \
  QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i686 \
+ /usr/bin/qemu-system-i386 \
  -name QEMUGuest1 \
-diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args	2019-07-14 19:23:33.361000000 +0200
-+++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args	2019-07-14 19:23:59.923000000 +0200
+diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+--- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args	2020-03-06 09:47:33.722000000 +0100
++++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args	2020-03-06 09:47:52.662000000 +0100
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -168,11 +156,11 @@ diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt
 -SASL_CONF_PATH=/root/.sasl2 \
 +SASL_CONF_PATH=/root/.sasl \
  QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i686 \
- -name QEMUGuest1 \
-diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
---- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args	2019-07-14 19:23:33.375000000 +0200
-+++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args	2019-07-14 19:26:27.145000000 +0200
+ /usr/bin/qemu-system-i386 \
+ -name guest=QEMUGuest1,debug-threads=on \
+diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
+--- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args	2020-03-06 09:47:33.713000000 +0100
++++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args	2020-03-06 09:47:52.663000000 +0100
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -180,11 +168,11 @@ diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_6
 -SASL_CONF_PATH=/root/.sasl2 \
 +SASL_CONF_PATH=/root/.sasl \
  QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i686 \
- -name guest=QEMUGuest1,debug-threads=on \
-diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
---- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args	2019-07-14 19:23:33.369000000 +0200
-+++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args	2019-07-14 19:26:23.287000000 +0200
+ /usr/bin/qemu-system-i386 \
+ -name QEMUGuest1 \
+diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
+--- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args	2020-03-06 09:47:33.718000000 +0100
++++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args	2020-03-06 09:47:52.663000000 +0100
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -192,11 +180,11 @@ diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0
 -SASL_CONF_PATH=/root/.sasl2 \
 +SASL_CONF_PATH=/root/.sasl \
  QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i686 \
+ /usr/bin/qemu-system-i386 \
  -name guest=QEMUGuest1,debug-threads=on \
-diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
---- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args	2019-07-14 19:23:33.371000000 +0200
-+++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args	2019-07-14 19:26:19.952000000 +0200
+diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+--- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args	2020-03-06 09:47:33.719000000 +0100
++++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args	2020-03-06 09:47:52.664000000 +0100
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -204,32 +192,32 @@ diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-lates
 -SASL_CONF_PATH=/root/.sasl2 \
 +SASL_CONF_PATH=/root/.sasl \
  QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i686 \
+ /usr/bin/qemu-system-i386 \
  -name guest=QEMUGuest1,debug-threads=on \
-diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvtest.c libvirt-5.5.0/tests/qemuxml2argvtest.c
---- libvirt-5.5.0.orig/tests/qemuxml2argvtest.c	2019-07-14 19:23:33.401000000 +0200
-+++ libvirt-5.5.0/tests/qemuxml2argvtest.c	2019-07-14 19:23:59.924000000 +0200
-@@ -1155,7 +1155,7 @@
+diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvtest.c libvirt-6.1.0/tests/qemuxml2argvtest.c
+--- libvirt-6.1.0.orig/tests/qemuxml2argvtest.c	2020-03-06 09:47:33.741000000 +0100
++++ libvirt-6.1.0/tests/qemuxml2argvtest.c	2020-03-06 09:47:52.665000000 +0100
+@@ -1197,7 +1197,7 @@
  
      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"));
+-    driver.config->vncSASLdir = g_strdup("/root/.sasl2");
++    driver.config->vncSASLdir = g_strdup("/root/.sasl");
      DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->vncTLS = 1;
      driver.config->vncTLSx509verify = 1;
-@@ -1187,7 +1187,7 @@
+@@ -1227,7 +1227,7 @@
      DO_TEST("graphics-spice-no-args",
              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"));
+-    driver.config->spiceSASLdir = g_strdup("/root/.sasl2");
++    driver.config->spiceSASLdir = g_strdup("/root/.sasl");
      DO_TEST("graphics-spice-sasl",
              QEMU_CAPS_SPICE,
              QEMU_CAPS_DEVICE_QXL);
-diff -ur libvirt-5.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.5.0/tests/virconfdata/libvirtd.conf
---- libvirt-5.5.0.orig/tests/virconfdata/libvirtd.conf	2019-07-14 19:23:33.602000000 +0200
-+++ libvirt-5.5.0/tests/virconfdata/libvirtd.conf	2019-07-14 19:23:59.924000000 +0200
+diff -ur libvirt-6.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-6.1.0/tests/virconfdata/libvirtd.conf
+--- libvirt-6.1.0.orig/tests/virconfdata/libvirtd.conf	2020-03-06 09:47:33.909000000 +0100
++++ libvirt-6.1.0/tests/virconfdata/libvirtd.conf	2020-03-06 09:47:52.665000000 +0100
 @@ -91,7 +91,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -248,9 +236,9 @@ diff -ur libvirt-5.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.5.0/tests/
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-5.5.0.orig/tests/virconfdata/libvirtd.out libvirt-5.5.0/tests/virconfdata/libvirtd.out
---- libvirt-5.5.0.orig/tests/virconfdata/libvirtd.out	2019-07-14 19:23:33.602000000 +0200
-+++ libvirt-5.5.0/tests/virconfdata/libvirtd.out	2019-07-14 19:23:59.924000000 +0200
+diff -ur libvirt-6.1.0.orig/tests/virconfdata/libvirtd.out libvirt-6.1.0/tests/virconfdata/libvirtd.out
+--- libvirt-6.1.0.orig/tests/virconfdata/libvirtd.out	2020-03-06 09:47:33.909000000 +0100
++++ libvirt-6.1.0/tests/virconfdata/libvirtd.out	2020-03-06 09:47:52.665000000 +0100
 @@ -73,7 +73,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #