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

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index f1f6e5f..d23a770 100644
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-5.4.0.orig/docs/auth.html libvirt-5.4.0/docs/auth.html
---- libvirt-5.4.0.orig/docs/auth.html	2019-06-17 20:17:53.120000000 +0200
-+++ libvirt-5.4.0/docs/auth.html	2019-06-17 20:18:17.708000000 +0200
-@@ -318,7 +318,7 @@ to turn on SASL auth in these listeners.
+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
@@ -10,10 +10,10 @@ diff -urp libvirt-5.4.0.orig/docs/auth.html libvirt-5.4.0/docs/auth.html
  parameter to <code>scram-sha-1</code>.
      </p>
          <p>
-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.
+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 @@
      <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
@@ -22,10 +22,10 @@ diff -urp libvirt-5.4.0.orig/docs/auth.html.in libvirt-5.4.0/docs/auth.html.in
  parameter to <code>scram-sha-1</code>.
      </p>
      <p>
-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 = \
+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 @@
  
  # This is needed for clients too, so can't wrap in
  # the WITH_LIBVIRTD conditional
@@ -34,9 +34,9 @@ diff -urp libvirt-5.4.0.orig/src/Makefile.in libvirt-5.4.0/src/Makefile.in
  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
+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
 @@ -135,18 +135,18 @@
  # Examples include vinagre, virt-viewer and virt-manager
  # itself. UltraVNC, RealVNC, TightVNC do not support this
@@ -80,10 +80,10 @@ diff -urp libvirt-5.4.0.orig/src/qemu/qemu.conf libvirt-5.4.0/src/qemu/qemu.conf
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-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 =
+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
+@@ -13,7 +13,7 @@
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
  { "vnc_sasl" = "1" }
@@ -92,7 +92,7 @@ diff -urp libvirt-5.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.4.0/sr
  { "vnc_allow_host_audio" = "0" }
  { "spice_listen" = "0.0.0.0" }
  { "spice_tls" = "1" }
-@@ -21,7 +21,7 @@ module Test_libvirtd_qemu =
+@@ -21,7 +21,7 @@
  { "spice_auto_unix_socket" = "1" }
  { "spice_password" = "XYZ12345" }
  { "spice_sasl" = "1" }
@@ -101,10 +101,10 @@ diff -urp libvirt-5.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.4.0/sr
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-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 @@
+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 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
  #  - sasl: use SASL infrastructure. The actual auth scheme is then
@@ -113,7 +113,7 @@ diff -urp libvirt-5.4.0.orig/src/remote/libvirtd.conf libvirt-5.4.0/src/remote/l
  #          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
  #          For non-TCP or TLS sockets, any scheme is allowed.
  #
-@@ -154,7 +154,7 @@
+@@ -132,7 +132,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
@@ -122,10 +122,10 @@ diff -urp libvirt-5.4.0.orig/src/remote/libvirtd.conf libvirt-5.4.0/src/remote/l
  #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
+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
@@ -134,46 +134,46 @@ diff -urp libvirt-5.4.0.orig/src/remote/Makefile.inc.am libvirt-5.4.0/src/remote
  
  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 \
- LOGNAME=test \
+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
+@@ -6,7 +6,7 @@
+ 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 \
+ QEMU_AUDIO_DRV=spice \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-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 \
- LOGNAME=test \
+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
+@@ -6,7 +6,7 @@
+ 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-system-i686 \
  -name QEMUGuest1 \
-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 \
+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
+@@ -6,7 +6,7 @@
  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 \
+ QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-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 \
+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
+@@ -6,7 +6,7 @@
  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 \
@@ -181,11 +181,11 @@ diff -urp libvirt-5.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvi
 +SASL_CONF_PATH=/root/.sasl \
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
- -name QEMUGuest1 \
-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 \
+ -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
+@@ -6,7 +6,7 @@
  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 \
@@ -193,11 +193,23 @@ diff -urp libvirt-5.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvir
 +SASL_CONF_PATH=/root/.sasl \
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
- -name QEMUGuest1 \
-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)
+ -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
+@@ -6,7 +6,7 @@
+ 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-system-i686 \
+ -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 @@
  
      driver.config->vncSASL = 1;
      VIR_FREE(driver.config->vncSASLdir);
@@ -206,7 +218,7 @@ diff -urp libvirt-5.4.0.orig/tests/qemuxml2argvtest.c libvirt-5.4.0/tests/qemuxm
      DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->vncTLS = 1;
      driver.config->vncTLSx509verify = 1;
-@@ -1177,7 +1177,7 @@ mymain(void)
+@@ -1187,7 +1187,7 @@
      DO_TEST("graphics-spice-no-args",
              QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->spiceSASL = 1;
@@ -215,10 +227,10 @@ diff -urp libvirt-5.4.0.orig/tests/qemuxml2argvtest.c libvirt-5.4.0/tests/qemuxm
      DO_TEST("graphics-spice-sasl",
              QEMU_CAPS_SPICE,
              QEMU_CAPS_DEVICE_QXL);
-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"
+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
+@@ -91,7 +91,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
  #  - sasl: use SASL infrastructure. The actual auth scheme is then
@@ -227,7 +239,7 @@ diff -urp libvirt-5.4.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.4.0/tests
  #          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
  #          For non-TCP or TLS sockets,  any scheme is allowed.
  #
-@@ -139,7 +139,7 @@ auth_unix_rw = "none"
+@@ -122,7 +122,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
@@ -236,10 +248,10 @@ diff -urp libvirt-5.4.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.4.0/tests
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-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"
+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
+@@ -73,7 +73,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
  #  - sasl: use SASL infrastructure. The actual auth scheme is then
@@ -248,7 +260,7 @@ diff -urp libvirt-5.4.0.orig/tests/virconfdata/libvirtd.out libvirt-5.4.0/tests/
  #          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
  #          For non-TCP or TLS sockets,  any scheme is allowed.
  #
-@@ -116,7 +116,7 @@ auth_unix_rw = "none"
+@@ -102,7 +102,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