]> TLD Linux GIT Repositories - packages/libvirt.git/blobdiff - libvirt-sasl.patch
- updated to 4.5.0
[packages/libvirt.git] / libvirt-sasl.patch
index 570cb176ad04164d87f18103af277dc464be47f3..0a8ad520ecf42b6db4ce6cd98c714c3e78059cb2 100644 (file)
@@ -1,70 +1,7 @@
-diff -urp libvirt-3.2.0.orig/daemon/libvirtd.conf libvirt-3.2.0/daemon/libvirtd.conf
---- libvirt-3.2.0.orig/daemon/libvirtd.conf    2017-02-24 14:48:08.985914076 +0000
-+++ libvirt-3.2.0/daemon/libvirtd.conf 2017-04-11 12:46:54.195285389 +0000
-@@ -123,7 +123,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
- #          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
- #          For non-TCP or TLS sockets, any scheme is allowed.
- #
-@@ -154,7 +154,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
- #auth_tcp = "sasl"
- # Change the authentication scheme for TLS sockets.
-diff -urp libvirt-3.2.0.orig/daemon/Makefile.am libvirt-3.2.0/daemon/Makefile.am
---- libvirt-3.2.0.orig/daemon/Makefile.am      2016-11-30 12:57:30.326292858 +0000
-+++ libvirt-3.2.0/daemon/Makefile.am   2017-04-11 12:43:19.499270077 +0000
-@@ -532,13 +532,13 @@ POD2MAN = pod2man -c "Virtualization Sup
- # the WITH_LIBVIRTD conditional
- if WITH_SASL
- install-data-sasl:
--      $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
-+      $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
-       $(INSTALL_DATA) $(srcdir)/libvirtd.sasl \
--              $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-+              $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
- uninstall-data-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-data-sasl:
- uninstall-data-sasl:
-diff -urp libvirt-3.2.0.orig/daemon/Makefile.in libvirt-3.2.0/daemon/Makefile.in
---- libvirt-3.2.0.orig/daemon/Makefile.in      2017-04-02 14:57:47.028717494 +0000
-+++ libvirt-3.2.0/daemon/Makefile.in   2017-04-11 12:43:19.500270077 +0000
-@@ -2934,13 +2934,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_TRUE@      $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
-+@WITH_SASL_TRUE@      $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
- @WITH_SASL_TRUE@      $(INSTALL_DATA) $(srcdir)/libvirtd.sasl \
--@WITH_SASL_TRUE@              $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-+@WITH_SASL_TRUE@              $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
- @WITH_SASL_TRUE@uninstall-data-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-data-sasl:
- @WITH_SASL_FALSE@uninstall-data-sasl:
-diff -urp libvirt-3.2.0.orig/docs/auth.html libvirt-3.2.0/docs/auth.html
---- libvirt-3.2.0.orig/docs/auth.html  2017-03-28 07:02:00.525629157 +0000
-+++ libvirt-3.2.0/docs/auth.html       2017-04-11 12:47:17.292287037 +0000
-@@ -265,7 +265,7 @@ to turn on SASL auth in these listeners.
+diff -urp libvirt-4.5.0.orig/docs/auth.html libvirt-4.5.0/docs/auth.html
+--- libvirt-4.5.0.orig/docs/auth.html  2018-07-09 16:24:49.467875585 +0000
++++ libvirt-4.5.0/docs/auth.html       2018-07-09 16:25:07.306874521 +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
@@ -73,9 +10,9 @@ diff -urp libvirt-3.2.0.orig/docs/auth.html libvirt-3.2.0/docs/auth.html
  parameter to <code>scram-sha-1</code>.
      </p>
          <p>
-diff -urp libvirt-3.2.0.orig/docs/auth.html.in libvirt-3.2.0/docs/auth.html.in
---- libvirt-3.2.0.orig/docs/auth.html.in       2017-03-24 11:48:12.048612800 +0000
-+++ libvirt-3.2.0/docs/auth.html.in    2017-04-11 12:47:14.492286837 +0000
+diff -urp libvirt-4.5.0.orig/docs/auth.html.in libvirt-4.5.0/docs/auth.html.in
+--- libvirt-4.5.0.orig/docs/auth.html.in       2018-07-09 16:24:49.471875584 +0000
++++ libvirt-4.5.0/docs/auth.html.in    2018-07-09 16:25:07.307874521 +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
@@ -85,34 +22,31 @@ diff -urp libvirt-3.2.0.orig/docs/auth.html.in libvirt-3.2.0/docs/auth.html.in
  parameter to <code>scram-sha-1</code>.
      </p>
      <p>
-diff -urp libvirt-3.2.0.orig/libvirt.spec libvirt-3.2.0/libvirt.spec
---- libvirt-3.2.0.orig/libvirt.spec    2017-04-02 14:58:24.226088535 +0000
-+++ libvirt-3.2.0/libvirt.spec 2017-04-11 12:43:19.501270077 +0000
-@@ -1988,7 +1988,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-3.2.0.orig/libvirt.spec.in libvirt-3.2.0/libvirt.spec.in
---- libvirt-3.2.0.orig/libvirt.spec.in 2017-04-02 14:53:27.904098953 +0000
-+++ libvirt-3.2.0/libvirt.spec.in      2017-04-11 12:43:19.501270077 +0000
-@@ -1988,7 +1988,7 @@ exit 0
- %{_datadir}/libvirt/test-screenshot.png
+diff -urp libvirt-4.5.0.orig/src/Makefile.in libvirt-4.5.0/src/Makefile.in
+--- libvirt-4.5.0.orig/src/Makefile.in 2018-07-09 16:24:49.542875580 +0000
++++ libvirt-4.5.0/src/Makefile.in      2018-07-09 16:25:07.311874521 +0000
+@@ -13166,13 +13166,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
  
--%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
-+%config(noreplace) %{_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:
  
- %files admin
- %{_mandir}/man1/virt-admin.1*
-diff -urp libvirt-3.2.0.orig/src/qemu/qemu.conf libvirt-3.2.0/src/qemu/qemu.conf
---- libvirt-3.2.0.orig/src/qemu/qemu.conf      2017-03-28 06:58:37.453915260 +0000
-+++ libvirt-3.2.0/src/qemu/qemu.conf   2017-04-11 12:47:07.132286312 +0000
-@@ -119,18 +119,18 @@
+diff -urp libvirt-4.5.0.orig/src/qemu/qemu.conf libvirt-4.5.0/src/qemu/qemu.conf
+--- libvirt-4.5.0.orig/src/qemu/qemu.conf      2018-07-09 16:24:49.520875581 +0000
++++ libvirt-4.5.0/src/qemu/qemu.conf   2018-07-09 16:25:07.311874521 +0000
+@@ -129,18 +129,18 @@
  # Examples include vinagre, virt-viewer and virt-manager
  # itself. UltraVNC, RealVNC, TightVNC do not support this
  #
@@ -134,7 +68,7 @@ diff -urp libvirt-3.2.0.orig/src/qemu/qemu.conf libvirt-3.2.0/src/qemu/qemu.conf
  
  
  # QEMU implements an extension for providing audio over a VNC connection,
-@@ -194,17 +194,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.
  #
@@ -155,9 +89,9 @@ diff -urp libvirt-3.2.0.orig/src/qemu/qemu.conf libvirt-3.2.0/src/qemu/qemu.conf
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-diff -urp libvirt-3.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-3.2.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-3.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2017-03-28 06:58:37.467915094 +0000
-+++ libvirt-3.2.0/src/qemu/test_libvirtd_qemu.aug.in   2017-04-11 12:43:19.502270077 +0000
+diff -urp libvirt-4.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.5.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-4.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2018-07-09 16:24:49.520875581 +0000
++++ libvirt-4.5.0/src/qemu/test_libvirtd_qemu.aug.in   2018-07-09 16:25:07.312874521 +0000
 @@ -12,7 +12,7 @@ module Test_libvirtd_qemu =
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
@@ -176,9 +110,51 @@ diff -urp libvirt-3.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-3.2.0/sr
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-diff -urp libvirt-3.2.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-3.2.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args
---- libvirt-3.2.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args      2016-02-16 14:25:07.637706478 +0000
-+++ libvirt-3.2.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args   2017-04-11 12:43:19.502270077 +0000
+diff -urp libvirt-4.5.0.orig/src/remote/libvirtd.conf libvirt-4.5.0/src/remote/libvirtd.conf
+--- libvirt-4.5.0.orig/src/remote/libvirtd.conf        2018-07-09 16:24:49.523875581 +0000
++++ libvirt-4.5.0/src/remote/libvirtd.conf     2018-07-09 16:25:07.312874521 +0000
+@@ -123,7 +123,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
+ #          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
+ #          For non-TCP or TLS sockets, any scheme is allowed.
+ #
+@@ -154,7 +154,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
+ #auth_tcp = "sasl"
+ # Change the authentication scheme for TLS sockets.
+diff -urp libvirt-4.5.0.orig/src/remote/Makefile.inc.am libvirt-4.5.0/src/remote/Makefile.inc.am
+--- libvirt-4.5.0.orig/src/remote/Makefile.inc.am      2018-07-09 16:24:49.520875581 +0000
++++ libvirt-4.5.0/src/remote/Makefile.inc.am   2018-07-09 16:25:07.312874521 +0000
+@@ -248,13 +248,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.5.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-4.5.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
+--- libvirt-4.5.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args   2018-07-09 16:24:50.006875552 +0000
++++ libvirt-4.5.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args        2018-07-09 16:25:07.312874521 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -186,11 +162,11 @@ diff -urp libvirt-3.2.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sa
 -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-3.2.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-3.2.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args
---- libvirt-3.2.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args       2016-02-16 14:25:07.637706478 +0000
-+++ libvirt-3.2.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args    2017-04-11 12:43:19.502270077 +0000
+diff -urp libvirt-4.5.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-4.5.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
+--- libvirt-4.5.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args    2018-07-09 16:24:50.006875552 +0000
++++ libvirt-4.5.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-07-09 16:25:07.312874521 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -198,11 +174,11 @@ diff -urp libvirt-3.2.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tl
 -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-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-3.2.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
---- libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args    2016-07-27 12:39:35.395705103 +0000
-+++ libvirt-3.2.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2017-04-11 12:43:19.502270077 +0000
+diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-4.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
+--- libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-07-09 16:24:49.567875579 +0000
++++ libvirt-4.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args      2018-07-09 16:25:07.312874521 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -210,11 +186,11 @@ diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-
 -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-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-3.2.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
---- libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args      2016-07-27 12:39:35.396705092 +0000
-+++ libvirt-3.2.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args   2017-04-11 12:43:19.502270077 +0000
+diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-4.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+--- libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args   2018-07-09 16:24:49.567875579 +0000
++++ libvirt-4.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args        2018-07-09 16:25:07.312874521 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -222,11 +198,11 @@ diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sa
 -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-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-3.2.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
---- libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args       2016-07-27 12:39:35.396705092 +0000
-+++ libvirt-3.2.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args    2017-04-11 12:43:19.502270077 +0000
+diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-4.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
+--- libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args    2018-07-09 16:24:49.567875579 +0000
++++ libvirt-4.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-07-09 16:25:07.313874521 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -234,12 +210,12 @@ diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tl
 -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-3.2.0.orig/tests/qemuxml2argvtest.c libvirt-3.2.0/tests/qemuxml2argvtest.c
---- libvirt-3.2.0.orig/tests/qemuxml2argvtest.c        2017-03-28 06:58:37.491914811 +0000
-+++ libvirt-3.2.0/tests/qemuxml2argvtest.c     2017-04-11 12:43:19.503270077 +0000
-@@ -1032,7 +1032,7 @@ mymain(void)
+diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvtest.c libvirt-4.5.0/tests/qemuxml2argvtest.c
+--- libvirt-4.5.0.orig/tests/qemuxml2argvtest.c        2018-07-09 16:24:49.831875563 +0000
++++ libvirt-4.5.0/tests/qemuxml2argvtest.c     2018-07-09 16:25:07.313874521 +0000
+@@ -1190,7 +1190,7 @@ mymain(void)
  
      driver.config->vncSASL = 1;
      VIR_FREE(driver.config->vncSASLdir);
@@ -248,7 +224,7 @@ diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvtest.c libvirt-3.2.0/tests/qemuxm
      DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->vncTLS = 1;
      driver.config->vncTLSx509verify = 1;
-@@ -1056,7 +1056,7 @@ mymain(void)
+@@ -1210,7 +1210,7 @@ mymain(void)
      DO_TEST("graphics-spice-no-args",
              QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->spiceSASL = 1;
@@ -257,9 +233,9 @@ diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvtest.c libvirt-3.2.0/tests/qemuxm
      DO_TEST("graphics-spice-sasl",
              QEMU_CAPS_SPICE,
              QEMU_CAPS_DEVICE_QXL);
-diff -urp libvirt-3.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-3.2.0/tests/virconfdata/libvirtd.conf
---- libvirt-3.2.0.orig/tests/virconfdata/libvirtd.conf 2016-04-26 02:20:09.322242995 +0000
-+++ libvirt-3.2.0/tests/virconfdata/libvirtd.conf      2017-04-11 12:47:00.916285869 +0000
+diff -urp libvirt-4.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.5.0/tests/virconfdata/libvirtd.conf
+--- libvirt-4.5.0.orig/tests/virconfdata/libvirtd.conf 2018-07-09 16:24:49.818875564 +0000
++++ libvirt-4.5.0/tests/virconfdata/libvirtd.conf      2018-07-09 16:25:07.313874521 +0000
 @@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -278,9 +254,9 @@ diff -urp libvirt-3.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-3.2.0/tests
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -urp libvirt-3.2.0.orig/tests/virconfdata/libvirtd.out libvirt-3.2.0/tests/virconfdata/libvirtd.out
---- libvirt-3.2.0.orig/tests/virconfdata/libvirtd.out  2016-04-26 02:20:09.322242995 +0000
-+++ libvirt-3.2.0/tests/virconfdata/libvirtd.out       2017-04-11 12:46:58.300285682 +0000
+diff -urp libvirt-4.5.0.orig/tests/virconfdata/libvirtd.out libvirt-4.5.0/tests/virconfdata/libvirtd.out
+--- libvirt-4.5.0.orig/tests/virconfdata/libvirtd.out  2018-07-09 16:24:49.818875564 +0000
++++ libvirt-4.5.0/tests/virconfdata/libvirtd.out       2018-07-09 16:25:07.313874521 +0000
 @@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700"
  #          the network providing auth (eg, TLS/x509 certificates)
  #