X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-sasl.patch;h=b85055f787aa8c611089cac25b23737be2983e84;hp=52b0355c022310940f69e7aa9c4b174a7ecaf47f;hb=30488cfe547d889829f5d135761237330412fd07;hpb=02549a4031fa34133809e51ad102a37c04e37672

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 52b0355..b85055f 100644
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,6 +1,6 @@
-diff -ur libvirt-7.5.0.orig/docs/auth.rst libvirt-7.5.0/docs/auth.rst
---- libvirt-7.5.0.orig/docs/auth.rst	2021-07-10 01:12:46.853677568 +0200
-+++ libvirt-7.5.0/docs/auth.rst	2021-07-10 01:16:24.992677568 +0200
+diff -ur libvirt-8.0.0.orig/docs/auth.rst libvirt-8.0.0/docs/auth.rst
+--- libvirt-8.0.0.orig/docs/auth.rst	2022-01-23 12:13:11.662032954 +0100
++++ libvirt-8.0.0/docs/auth.rst	2022-01-23 12:13:54.286119215 +0100
 @@ -225,7 +225,7 @@
  
  Since the libvirt SASL config file defaults to using ``GSSAPI`` (Kerberos), a
@@ -10,9 +10,9 @@ diff -ur libvirt-7.5.0.orig/docs/auth.rst libvirt-7.5.0/docs/auth.rst
  parameter to ``scram-sha-256``.
  
  **Note:** previous versions of libvirt suggested ``DIGEST-MD5`` and
-diff -ur libvirt-7.5.0.orig/src/qemu/qemu.conf libvirt-7.5.0/src/qemu/qemu.conf
---- libvirt-7.5.0.orig/src/qemu/qemu.conf	2021-07-10 01:12:46.952677568 +0200
-+++ libvirt-7.5.0/src/qemu/qemu.conf	2021-07-10 01:13:10.078677568 +0200
+diff -ur libvirt-8.0.0.orig/src/qemu/qemu.conf libvirt-8.0.0/src/qemu/qemu.conf
+--- libvirt-8.0.0.orig/src/qemu/qemu.conf	2022-01-23 12:13:11.768033168 +0100
++++ libvirt-8.0.0/src/qemu/qemu.conf	2022-01-23 12:13:54.287119217 +0100
 @@ -141,18 +141,18 @@
  # Examples include vinagre, virt-viewer and virt-manager
  # itself. UltraVNC, RealVNC, TightVNC do not support this
@@ -56,9 +56,9 @@ diff -ur libvirt-7.5.0.orig/src/qemu/qemu.conf libvirt-7.5.0/src/qemu/qemu.conf
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-diff -ur libvirt-7.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-7.5.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-7.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in	2021-07-10 01:12:46.959677568 +0200
-+++ libvirt-7.5.0/src/qemu/test_libvirtd_qemu.aug.in	2021-07-10 01:13:10.078677568 +0200
+diff -ur libvirt-8.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-8.0.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-8.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in	2022-01-23 12:13:11.775033183 +0100
++++ libvirt-8.0.0/src/qemu/test_libvirtd_qemu.aug.in	2022-01-23 12:13:54.287119217 +0100
 @@ -13,7 +13,7 @@
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
@@ -77,9 +77,9 @@ diff -ur libvirt-7.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-7.5.0/src
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-diff -ur libvirt-7.5.0.orig/src/remote/libvirtd.conf.in libvirt-7.5.0/src/remote/libvirtd.conf.in
---- libvirt-7.5.0.orig/src/remote/libvirtd.conf.in	2021-07-10 01:12:46.960677568 +0200
-+++ libvirt-7.5.0/src/remote/libvirtd.conf.in	2021-07-10 01:13:10.079677568 +0200
+diff -ur libvirt-8.0.0.orig/src/remote/libvirtd.conf.in libvirt-8.0.0/src/remote/libvirtd.conf.in
+--- libvirt-8.0.0.orig/src/remote/libvirtd.conf.in	2022-01-23 12:13:11.775033183 +0100
++++ libvirt-8.0.0/src/remote/libvirtd.conf.in	2022-01-23 12:13:54.287119217 +0100
 @@ -136,7 +136,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -98,9 +98,9 @@ diff -ur libvirt-7.5.0.orig/src/remote/libvirtd.conf.in libvirt-7.5.0/src/remote
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-7.5.0.orig/src/remote/meson.build libvirt-7.5.0/src/remote/meson.build
---- libvirt-7.5.0.orig/src/remote/meson.build	2021-07-10 01:12:46.960677568 +0200
-+++ libvirt-7.5.0/src/remote/meson.build	2021-07-10 01:13:10.079677568 +0200
+diff -ur libvirt-8.0.0.orig/src/remote/meson.build libvirt-8.0.0/src/remote/meson.build
+--- libvirt-8.0.0.orig/src/remote/meson.build	2022-01-23 12:13:11.776033185 +0100
++++ libvirt-8.0.0/src/remote/meson.build	2022-01-23 12:13:54.288119219 +0100
 @@ -309,7 +309,7 @@
  if conf.has('WITH_SASL')
    install_data(
@@ -110,102 +110,114 @@ diff -ur libvirt-7.5.0.orig/src/remote/meson.build libvirt-7.5.0/src/remote/meso
      rename: [ 'libvirt.conf' ],
    )
  endif
-diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-7.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args	2021-07-10 01:12:47.150677568 +0200
-+++ libvirt-7.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args	2021-07-10 01:14:29.481677568 +0200
-@@ -7,7 +7,7 @@
+diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args
+--- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args	2022-01-23 12:13:11.959033556 +0100
++++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args	2022-01-23 12:15:32.706318406 +0100
+@@ -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 \
- QEMU_AUDIO_DRV=spice \
 -SASL_CONF_PATH=/root/.sasl2 \
 +SASL_CONF_PATH=/root/.sasl \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
+ /usr/bin/qemu-system-x86_64 \
+ -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args	2021-07-10 01:12:47.151677568 +0200
-+++ libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args	2021-07-10 01:13:56.615677568 +0200
+diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args
+--- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args	2022-01-23 12:13:11.960033558 +0100
++++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args	2022-01-23 12:15:44.141341542 +0100
 @@ -7,7 +7,7 @@
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
  XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
  QEMU_AUDIO_DRV=none \
 -SASL_CONF_PATH=/root/.sasl2 \
 +SASL_CONF_PATH=/root/.sasl \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
+ /usr/bin/qemu-system-x86_64 \
+ -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args	2021-07-10 01:12:47.152677568 +0200
-+++ libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args	2021-07-10 01:14:19.077677568 +0200
-@@ -7,7 +7,7 @@
+diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args
+--- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args	2022-01-23 12:13:11.960033558 +0100
++++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args	2022-01-23 12:15:47.578348507 +0100
+@@ -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 \
- QEMU_AUDIO_DRV=none \
 -SASL_CONF_PATH=/root/.sasl2 \
 +SASL_CONF_PATH=/root/.sasl \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
+ /usr/bin/qemu-system-x86_64 \
+ -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
---- libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args	2021-07-10 01:12:47.151677568 +0200
-+++ libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args	2021-07-10 01:16:03.483677568 +0200
+diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
+--- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args	2022-01-23 12:13:11.960033558 +0100
++++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args	2022-01-23 12:15:37.354327814 +0100
 @@ -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 \
- /usr/bin/qemu-system-i386 \
+ /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
---- libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args	2021-07-10 01:12:47.152677568 +0200
-+++ libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args	2021-07-10 01:14:04.510677568 +0200
+diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+--- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args	2022-01-23 12:13:11.960033558 +0100
++++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args	2022-01-23 12:15:20.475293652 +0100
 @@ -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 \
- /usr/bin/qemu-system-i386 \
+ /usr/bin/qemu-system-x86_64 \
+ -name guest=QEMUGuest1,debug-threads=on \
+ -S \
+diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args
+--- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args	2022-01-23 12:13:11.960033558 +0100
++++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args	2022-01-23 12:15:28.153309190 +0100
+@@ -7,7 +7,7 @@
+ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+ QEMU_AUDIO_DRV=none \
+-SASL_CONF_PATH=/root/.sasl2 \
++SASL_CONF_PATH=/root/.sasl \
+ /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
---- libvirt-7.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args	2021-07-10 01:12:47.152677568 +0200
-+++ libvirt-7.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args	2021-07-10 01:14:09.866677568 +0200
+diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+--- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args	2022-01-23 12:13:11.960033558 +0100
++++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args	2022-01-23 12:15:40.112333398 +0100
 @@ -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 \
- /usr/bin/qemu-system-i386 \
+ /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-7.5.0.orig/tests/qemuxml2argvtest.c libvirt-7.5.0/tests/qemuxml2argvtest.c
---- libvirt-7.5.0.orig/tests/qemuxml2argvtest.c	2021-07-10 01:12:47.108677568 +0200
-+++ libvirt-7.5.0/tests/qemuxml2argvtest.c	2021-07-10 01:13:11.819677568 +0200
-@@ -1525,7 +1525,7 @@
+diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvtest.c libvirt-8.0.0/tests/qemuxml2argvtest.c
+--- libvirt-8.0.0.orig/tests/qemuxml2argvtest.c	2022-01-23 12:13:12.005033649 +0100
++++ libvirt-8.0.0/tests/qemuxml2argvtest.c	2022-01-23 12:15:08.509269432 +0100
+@@ -1552,7 +1552,7 @@
  
      driver.config->vncSASL = 1;
      VIR_FREE(driver.config->vncSASLdir);
 -    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);
+     DO_TEST_CAPS_VER("graphics-vnc-sasl", "2.11.0");
+     DO_TEST_CAPS_LATEST("graphics-vnc-sasl");
      driver.config->vncTLS = 1;
-     driver.config->vncTLSx509verify = 1;
-@@ -1555,7 +1555,7 @@
-     DO_TEST("graphics-spice-no-args",
-             QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
+@@ -1577,7 +1577,7 @@
+     DO_TEST_CAPS_LATEST("graphics-spice");
+     DO_TEST_CAPS_LATEST("graphics-spice-no-args");
      driver.config->spiceSASL = 1;
 -    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-7.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-7.5.0/tests/virconfdata/libvirtd.conf
---- libvirt-7.5.0.orig/tests/virconfdata/libvirtd.conf	2021-07-10 01:12:47.331677568 +0200
-+++ libvirt-7.5.0/tests/virconfdata/libvirtd.conf	2021-07-10 01:13:11.819677568 +0200
+     DO_TEST_CAPS_LATEST("graphics-spice-sasl");
+     VIR_FREE(driver.config->spiceSASLdir);
+     driver.config->spiceSASL = 0;
+diff -ur libvirt-8.0.0.orig/tests/virconfdata/libvirtd.conf libvirt-8.0.0/tests/virconfdata/libvirtd.conf
+--- libvirt-8.0.0.orig/tests/virconfdata/libvirtd.conf	2022-01-23 12:13:12.112033865 +0100
++++ libvirt-8.0.0/tests/virconfdata/libvirtd.conf	2022-01-23 12:14:04.741140369 +0100
 @@ -91,7 +91,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -224,9 +236,9 @@ diff -ur libvirt-7.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-7.5.0/tests/
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-7.5.0.orig/tests/virconfdata/libvirtd.out libvirt-7.5.0/tests/virconfdata/libvirtd.out
---- libvirt-7.5.0.orig/tests/virconfdata/libvirtd.out	2021-07-10 01:12:47.331677568 +0200
-+++ libvirt-7.5.0/tests/virconfdata/libvirtd.out	2021-07-10 01:13:11.819677568 +0200
+diff -ur libvirt-8.0.0.orig/tests/virconfdata/libvirtd.out libvirt-8.0.0/tests/virconfdata/libvirtd.out
+--- libvirt-8.0.0.orig/tests/virconfdata/libvirtd.out	2022-01-23 12:13:12.112033865 +0100
++++ libvirt-8.0.0/tests/virconfdata/libvirtd.out	2022-01-23 12:14:04.741140369 +0100
 @@ -73,7 +73,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #