X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-sasl.patch;fp=libvirt-sasl.patch;h=1ebc932fb2bfcff9a7fc33045bb556007b44d8ff;hb=fb9ba66439cd633004f1975095e9ddb1b47a0234;hp=913e1dd7e915b8cefdc4e00190666544adf8e976;hpb=71a5e15c242981328418b3378f76793bf4661c39;p=packages%2Flibvirt.git

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 913e1dd..1ebc932 100644
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,19 +1,19 @@
-diff -ur libvirt-5.10.0.orig/docs/auth.html.in libvirt-5.10.0/docs/auth.html.in
---- libvirt-5.10.0.orig/docs/auth.html.in	2019-12-08 00:42:43.765000000 +0100
-+++ libvirt-5.10.0/docs/auth.html.in	2019-12-08 00:43:02.262000000 +0100
+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.10.0.orig/src/Makefile.in libvirt-5.10.0/src/Makefile.in
---- libvirt-5.10.0.orig/src/Makefile.in	2019-12-08 00:42:43.668000000 +0100
-+++ libvirt-5.10.0/src/Makefile.in	2019-12-08 00:43:02.265000000 +0100
-@@ -7409,7 +7409,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
@@ -22,9 +22,9 @@ diff -ur libvirt-5.10.0.orig/src/Makefile.in libvirt-5.10.0/src/Makefile.in
  LIBVIRTD_UNIT_VARS = \
  	$(COMMON_UNIT_VARS) \
  	-e 's|[@]name[@]|Libvirt|g' \
-diff -ur libvirt-5.10.0.orig/src/qemu/qemu.conf libvirt-5.10.0/src/qemu/qemu.conf
---- libvirt-5.10.0.orig/src/qemu/qemu.conf	2019-12-08 00:42:43.698000000 +0100
-+++ libvirt-5.10.0/src/qemu/qemu.conf	2019-12-08 00:43:02.265000000 +0100
+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
@@ -68,9 +68,9 @@ diff -ur libvirt-5.10.0.orig/src/qemu/qemu.conf libvirt-5.10.0/src/qemu/qemu.con
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-diff -ur libvirt-5.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.10.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-5.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in	2019-12-08 00:42:43.697000000 +0100
-+++ libvirt-5.10.0/src/qemu/test_libvirtd_qemu.aug.in	2019-12-08 00:43:02.265000000 +0100
+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" }
@@ -89,10 +89,10 @@ diff -ur libvirt-5.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.10.0/s
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-diff -ur libvirt-5.10.0.orig/src/remote/Makefile.inc.am libvirt-5.10.0/src/remote/Makefile.inc.am
---- libvirt-5.10.0.orig/src/remote/Makefile.inc.am	2019-12-08 00:42:43.683000000 +0100
-+++ libvirt-5.10.0/src/remote/Makefile.inc.am	2019-12-08 00:43:02.266000000 +0100
-@@ -375,7 +375,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
@@ -101,9 +101,9 @@ diff -ur libvirt-5.10.0.orig/src/remote/Makefile.inc.am libvirt-5.10.0/src/remot
  
  install-sasl:
  	$(MKDIR_P) $(DESTDIR)$(sasldir)
-diff -ur libvirt-5.10.0.orig/src/remote/libvirtd.conf.in libvirt-5.10.0/src/remote/libvirtd.conf.in
---- libvirt-5.10.0.orig/src/remote/libvirtd.conf.in	2019-12-08 00:42:43.683000000 +0100
-+++ libvirt-5.10.0/src/remote/libvirtd.conf.in	2019-12-08 00:43:02.266000000 +0100
+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)
  #
@@ -122,9 +122,9 @@ diff -ur libvirt-5.10.0.orig/src/remote/libvirtd.conf.in libvirt-5.10.0/src/remo
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args	2019-12-08 00:42:43.289000000 +0100
-+++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-spice-sasl.args	2019-12-08 00:43:02.266000000 +0100
+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 \
@@ -132,11 +132,11 @@ diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args lib
 -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.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args	2019-12-08 00:42:43.303000000 +0100
-+++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args	2019-12-08 00:43:02.266000000 +0100
+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 \
@@ -144,11 +144,11 @@ diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvi
 -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.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
---- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args	2019-12-08 00:42:43.303000000 +0100
-+++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args	2019-12-08 00:43:02.266000000 +0100
+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 \
@@ -156,11 +156,11 @@ diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_
 -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.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args	2019-12-08 00:42:43.289000000 +0100
-+++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.args	2019-12-08 00:43:02.266000000 +0100
+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 \
@@ -168,11 +168,11 @@ diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.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.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
---- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args	2019-12-08 00:42:43.297000000 +0100
-+++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args	2019-12-08 00:43:02.267000000 +0100
+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 \
@@ -180,11 +180,11 @@ diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.
 -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.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
---- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args	2019-12-08 00:42:43.299000000 +0100
-+++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args	2019-12-08 00:43:02.298000000 +0100
+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 \
@@ -192,12 +192,12 @@ diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-late
 -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.10.0.orig/tests/qemuxml2argvtest.c libvirt-5.10.0/tests/qemuxml2argvtest.c
---- libvirt-5.10.0.orig/tests/qemuxml2argvtest.c	2019-12-08 00:42:43.258000000 +0100
-+++ libvirt-5.10.0/tests/qemuxml2argvtest.c	2019-12-08 00:43:42.225000000 +0100
-@@ -1188,7 +1188,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);
@@ -206,7 +206,7 @@ diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvtest.c libvirt-5.10.0/tests/qemux
      DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->vncTLS = 1;
      driver.config->vncTLSx509verify = 1;
-@@ -1218,7 +1218,7 @@
+@@ -1227,7 +1227,7 @@
      DO_TEST("graphics-spice-no-args",
              QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->spiceSASL = 1;
@@ -215,9 +215,9 @@ diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvtest.c libvirt-5.10.0/tests/qemux
      DO_TEST("graphics-spice-sasl",
              QEMU_CAPS_SPICE,
              QEMU_CAPS_DEVICE_QXL);
-diff -ur libvirt-5.10.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.10.0/tests/virconfdata/libvirtd.conf
---- libvirt-5.10.0.orig/tests/virconfdata/libvirtd.conf	2019-12-08 00:42:43.506000000 +0100
-+++ libvirt-5.10.0/tests/virconfdata/libvirtd.conf	2019-12-08 00:43:02.300000000 +0100
+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)
  #
@@ -236,9 +236,9 @@ diff -ur libvirt-5.10.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.10.0/test
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-5.10.0.orig/tests/virconfdata/libvirtd.out libvirt-5.10.0/tests/virconfdata/libvirtd.out
---- libvirt-5.10.0.orig/tests/virconfdata/libvirtd.out	2019-12-08 00:42:43.506000000 +0100
-+++ libvirt-5.10.0/tests/virconfdata/libvirtd.out	2019-12-08 00:43:02.300000000 +0100
+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)
  #