X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-sasl.patch;h=58b86d89fddcffb51f98f87a6c4504e8a996bacc;hp=0181fa1e6c58de4f6f57d6f5722b3beb9241ec22;hb=77fa38b0152ac1eb78b8ef467bc4eb8bf1fc6875;hpb=7470b860cfb9847023a18a90d640e4ed229e6310

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 0181fa1..58b86d8 100644
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-5.1.0.orig/docs/auth.html libvirt-5.1.0/docs/auth.html
---- libvirt-5.1.0.orig/docs/auth.html	2019-03-23 11:37:08.293000000 +0100
-+++ libvirt-5.1.0/docs/auth.html	2019-03-23 11:37:35.451000000 +0100
-@@ -347,7 +347,7 @@ to turn on SASL auth in these listeners.
+diff -urp libvirt-5.3.0.orig/docs/auth.html libvirt-5.3.0/docs/auth.html
+--- libvirt-5.3.0.orig/docs/auth.html	2019-04-27 12:38:48.466109972 +0200
++++ libvirt-5.3.0/docs/auth.html	2019-05-06 14:07:53.494000000 +0200
+@@ -318,7 +318,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
@@ -10,9 +10,9 @@ diff -urp libvirt-5.1.0.orig/docs/auth.html libvirt-5.1.0/docs/auth.html
  parameter to <code>scram-sha-1</code>.
      </p>
          <p>
-diff -urp libvirt-5.1.0.orig/docs/auth.html.in libvirt-5.1.0/docs/auth.html.in
---- libvirt-5.1.0.orig/docs/auth.html.in	2019-03-23 11:37:08.296000000 +0100
-+++ libvirt-5.1.0/docs/auth.html.in	2019-03-23 11:37:35.451000000 +0100
+diff -urp libvirt-5.3.0.orig/docs/auth.html.in libvirt-5.3.0/docs/auth.html.in
+--- libvirt-5.3.0.orig/docs/auth.html.in	2019-02-26 00:24:58.954183786 +0100
++++ libvirt-5.3.0/docs/auth.html.in	2019-05-06 14:07:53.494000000 +0200
 @@ -277,7 +277,7 @@ to turn on SASL auth in these listeners.
      <p>
  Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
@@ -22,21 +22,21 @@ diff -urp libvirt-5.1.0.orig/docs/auth.html.in libvirt-5.1.0/docs/auth.html.in
  parameter to <code>scram-sha-1</code>.
      </p>
      <p>
-diff -urp libvirt-5.1.0.orig/src/Makefile.in libvirt-5.1.0/src/Makefile.in
---- libvirt-5.1.0.orig/src/Makefile.in	2019-03-23 11:37:08.372000000 +0100
-+++ libvirt-5.1.0/src/Makefile.in	2019-03-23 11:38:49.722000000 +0100
-@@ -6226,7 +6226,7 @@ REMOTE_DRIVER_PROTOCOL = \
+diff -urp libvirt-5.3.0.orig/src/Makefile.in libvirt-5.3.0/src/Makefile.in
+--- libvirt-5.3.0.orig/src/Makefile.in	2019-05-04 19:53:42.037199636 +0200
++++ libvirt-5.3.0/src/Makefile.in	2019-05-06 14:07:53.497000000 +0200
+@@ -6271,7 +6271,7 @@ REMOTE_DRIVER_PROTOCOL = \
  
  # 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_185) $(am__append_187)
- SECDRIVER_LIBS = $(am__append_186) $(am__append_188)
-diff -urp libvirt-5.1.0.orig/src/qemu/qemu.conf libvirt-5.1.0/src/qemu/qemu.conf
---- libvirt-5.1.0.orig/src/qemu/qemu.conf	2019-03-23 11:37:08.358000000 +0100
-+++ libvirt-5.1.0/src/qemu/qemu.conf	2019-03-23 11:37:35.455000000 +0100
+ SECDRIVER_CFLAGS = $(am__append_191) $(am__append_193)
+ SECDRIVER_LIBS = $(am__append_192) $(am__append_194)
+diff -urp libvirt-5.3.0.orig/src/qemu/qemu.conf libvirt-5.3.0/src/qemu/qemu.conf
+--- libvirt-5.3.0.orig/src/qemu/qemu.conf	2019-05-04 19:50:45.015543968 +0200
++++ libvirt-5.3.0/src/qemu/qemu.conf	2019-05-06 14:07:53.498000000 +0200
 @@ -135,18 +135,18 @@
  # Examples include vinagre, virt-viewer and virt-manager
  # itself. UltraVNC, RealVNC, TightVNC do not support this
@@ -80,9 +80,9 @@ diff -urp libvirt-5.1.0.orig/src/qemu/qemu.conf libvirt-5.1.0/src/qemu/qemu.conf
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-diff -urp libvirt-5.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.1.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-5.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in	2019-03-23 11:37:08.358000000 +0100
-+++ libvirt-5.1.0/src/qemu/test_libvirtd_qemu.aug.in	2019-03-23 11:37:35.455000000 +0100
+diff -urp libvirt-5.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.3.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-5.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in	2019-02-26 00:24:59.030183057 +0100
++++ libvirt-5.3.0/src/qemu/test_libvirtd_qemu.aug.in	2019-05-06 14:07:53.498000000 +0200
 @@ -13,7 +13,7 @@ module Test_libvirtd_qemu =
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
@@ -101,9 +101,9 @@ diff -urp libvirt-5.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.1.0/sr
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-diff -urp libvirt-5.1.0.orig/src/remote/libvirtd.conf libvirt-5.1.0/src/remote/libvirtd.conf
---- libvirt-5.1.0.orig/src/remote/libvirtd.conf	2019-03-23 11:37:08.359000000 +0100
-+++ libvirt-5.1.0/src/remote/libvirtd.conf	2019-03-23 11:37:35.455000000 +0100
+diff -urp libvirt-5.3.0.orig/src/remote/libvirtd.conf libvirt-5.3.0/src/remote/libvirtd.conf
+--- libvirt-5.3.0.orig/src/remote/libvirtd.conf	2019-04-27 12:31:34.943092025 +0200
++++ libvirt-5.3.0/src/remote/libvirtd.conf	2019-05-06 14:07:53.498000000 +0200
 @@ -123,7 +123,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -122,10 +122,10 @@ diff -urp libvirt-5.1.0.orig/src/remote/libvirtd.conf libvirt-5.1.0/src/remote/l
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -urp libvirt-5.1.0.orig/src/remote/Makefile.inc.am libvirt-5.1.0/src/remote/Makefile.inc.am
---- libvirt-5.1.0.orig/src/remote/Makefile.inc.am	2019-03-23 11:37:08.358000000 +0100
-+++ libvirt-5.1.0/src/remote/Makefile.inc.am	2019-03-23 11:39:17.701000000 +0100
-@@ -242,7 +242,7 @@ endif WITH_LIBVIRTD
+diff -urp libvirt-5.3.0.orig/src/remote/Makefile.inc.am libvirt-5.3.0/src/remote/Makefile.inc.am
+--- libvirt-5.3.0.orig/src/remote/Makefile.inc.am	2019-04-27 12:31:34.942092034 +0200
++++ libvirt-5.3.0/src/remote/Makefile.inc.am	2019-05-06 14:07:53.498000000 +0200
+@@ -244,7 +244,7 @@ endif WITH_LIBVIRTD
  # This is needed for clients too, so can't wrap in
  # the WITH_LIBVIRTD conditional
  if WITH_SASL
@@ -134,9 +134,9 @@ diff -urp libvirt-5.1.0.orig/src/remote/Makefile.inc.am libvirt-5.1.0/src/remote
  
  install-sasl:
  	$(MKDIR_P) $(DESTDIR)$(sasldir)
-diff -urp libvirt-5.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-5.1.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
---- libvirt-5.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args	2019-03-23 11:37:08.489000000 +0100
-+++ libvirt-5.1.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args	2019-03-23 11:37:35.455000000 +0100
+diff -urp libvirt-5.3.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-5.3.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
+--- libvirt-5.3.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args	2018-01-12 15:48:37.072414510 +0100
++++ libvirt-5.3.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args	2019-05-06 14:07:53.499000000 +0200
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -146,9 +146,9 @@ diff -urp libvirt-5.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvi
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-5.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-5.1.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
---- libvirt-5.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args	2019-03-23 11:37:08.489000000 +0100
-+++ libvirt-5.1.0/tests/qemuargv2xmldata/graphics-vnc-tls.args	2019-03-23 11:37:35.456000000 +0100
+diff -urp libvirt-5.3.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-5.3.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
+--- libvirt-5.3.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args	2018-01-12 15:48:37.073414500 +0100
++++ libvirt-5.3.0/tests/qemuargv2xmldata/graphics-vnc-tls.args	2019-05-06 14:07:53.499000000 +0200
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -158,46 +158,46 @@ diff -urp libvirt-5.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvir
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-5.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-5.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args	2019-03-23 11:37:08.535000000 +0100
-+++ libvirt-5.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args	2019-03-23 11:37:35.456000000 +0100
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.3.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
+--- libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args	2019-04-27 12:31:35.106090528 +0200
++++ libvirt-5.3.0/tests/qemuxml2argvdata/graphics-spice-sasl.args	2019-05-06 14:08:46.241000000 +0200
+@@ -6,7 +6,7 @@ LOGNAME=test \
+ 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 \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-5.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-5.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args	2019-03-23 11:37:08.535000000 +0100
-+++ libvirt-5.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args	2019-03-23 11:37:35.456000000 +0100
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.3.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+--- libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args	2019-04-27 12:31:35.108090510 +0200
++++ libvirt-5.3.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args	2019-05-06 14:08:24.446000000 +0200
+@@ -6,7 +6,7 @@ LOGNAME=test \
+ 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.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-5.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args	2019-03-23 11:37:08.536000000 +0100
-+++ libvirt-5.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args	2019-03-23 11:37:35.456000000 +0100
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.3.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
+--- libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args	2019-04-27 12:31:35.109090500 +0200
++++ libvirt-5.3.0/tests/qemuxml2argvdata/graphics-vnc-tls.args	2019-05-06 14:08:33.926000000 +0200
+@@ -6,7 +6,7 @@ LOGNAME=test \
+ 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.1.0.orig/tests/qemuxml2argvtest.c libvirt-5.1.0/tests/qemuxml2argvtest.c
---- libvirt-5.1.0.orig/tests/qemuxml2argvtest.c	2019-03-23 11:37:08.378000000 +0100
-+++ libvirt-5.1.0/tests/qemuxml2argvtest.c	2019-03-23 11:37:35.456000000 +0100
-@@ -1212,7 +1212,7 @@ mymain(void)
+diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvtest.c libvirt-5.3.0/tests/qemuxml2argvtest.c
+--- libvirt-5.3.0.orig/tests/qemuxml2argvtest.c	2019-04-27 12:31:35.156090069 +0200
++++ libvirt-5.3.0/tests/qemuxml2argvtest.c	2019-05-06 14:07:53.502000000 +0200
+@@ -1145,7 +1145,7 @@ mymain(void)
  
      driver.config->vncSASL = 1;
      VIR_FREE(driver.config->vncSASLdir);
@@ -206,7 +206,7 @@ diff -urp libvirt-5.1.0.orig/tests/qemuxml2argvtest.c libvirt-5.1.0/tests/qemuxm
      DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->vncTLS = 1;
      driver.config->vncTLSx509verify = 1;
-@@ -1244,7 +1244,7 @@ mymain(void)
+@@ -1177,7 +1177,7 @@ mymain(void)
      DO_TEST("graphics-spice-no-args",
              QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->spiceSASL = 1;
@@ -215,9 +215,9 @@ diff -urp libvirt-5.1.0.orig/tests/qemuxml2argvtest.c libvirt-5.1.0/tests/qemuxm
      DO_TEST("graphics-spice-sasl",
              QEMU_CAPS_SPICE,
              QEMU_CAPS_DEVICE_QXL);
-diff -urp libvirt-5.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.1.0/tests/virconfdata/libvirtd.conf
---- libvirt-5.1.0.orig/tests/virconfdata/libvirtd.conf	2019-03-23 11:37:09.290000000 +0100
-+++ libvirt-5.1.0/tests/virconfdata/libvirtd.conf	2019-03-23 11:37:35.456000000 +0100
+diff -urp libvirt-5.3.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.3.0/tests/virconfdata/libvirtd.conf
+--- libvirt-5.3.0.orig/tests/virconfdata/libvirtd.conf	2017-10-30 08:32:36.772365929 +0100
++++ libvirt-5.3.0/tests/virconfdata/libvirtd.conf	2019-05-06 14:07:53.502000000 +0200
 @@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -236,9 +236,9 @@ diff -urp libvirt-5.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.1.0/tests
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -urp libvirt-5.1.0.orig/tests/virconfdata/libvirtd.out libvirt-5.1.0/tests/virconfdata/libvirtd.out
---- libvirt-5.1.0.orig/tests/virconfdata/libvirtd.out	2019-03-23 11:37:09.290000000 +0100
-+++ libvirt-5.1.0/tests/virconfdata/libvirtd.out	2019-03-23 11:37:35.456000000 +0100
+diff -urp libvirt-5.3.0.orig/tests/virconfdata/libvirtd.out libvirt-5.3.0/tests/virconfdata/libvirtd.out
+--- libvirt-5.3.0.orig/tests/virconfdata/libvirtd.out	2017-10-30 08:32:36.772365929 +0100
++++ libvirt-5.3.0/tests/virconfdata/libvirtd.out	2019-05-06 14:07:53.502000000 +0200
 @@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700"
  #          the network providing auth (eg, TLS/x509 certificates)
  #