X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-sasl.patch;fp=libvirt-sasl.patch;h=52b0355c022310940f69e7aa9c4b174a7ecaf47f;hp=88ef7aa64698413e39cd149ff0b028c4b383ff57;hb=f4409f183b9d6353317a5acd4e8f74fc03d34db4;hpb=1e2e166a5fe79ff5fdc3b7f143248f46d4dcee05

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 88ef7aa..52b0355 100644
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,18 +1,18 @@
-diff -ur libvirt-6.10.0.orig/docs/auth.html.in libvirt-6.10.0/docs/auth.html.in
---- libvirt-6.10.0.orig/docs/auth.html.in	2021-01-02 12:52:25.742090801 +0100
-+++ libvirt-6.10.0/docs/auth.html.in	2021-01-02 12:52:59.973090801 +0100
-@@ -277,7 +277,7 @@
-     <p>
- Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
+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
+@@ -225,7 +225,7 @@
+ 
+ Since the libvirt SASL config file defaults to using ``GSSAPI`` (Kerberos), a
  config change is required to enable plain password auth. This is done by
--editing <code>/etc/sasl2/libvirt.conf</code> to set the <code>mech_list</code>
-+editing <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-6.10.0.orig/src/qemu/qemu.conf libvirt-6.10.0/src/qemu/qemu.conf
---- libvirt-6.10.0.orig/src/qemu/qemu.conf	2021-01-02 12:52:25.824090801 +0100
-+++ libvirt-6.10.0/src/qemu/qemu.conf	2021-01-02 12:52:59.974090801 +0100
+-editing ``/etc/sasl2/libvirt.conf`` to set the ``mech_list``
++editing ``/etc/sasl/libvirt.conf`` to set the ``mech_list``
+ 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
 @@ -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-6.10.0.orig/src/qemu/qemu.conf libvirt-6.10.0/src/qemu/qemu.con
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-diff -ur libvirt-6.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-6.10.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-6.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in	2021-01-02 12:52:25.830090801 +0100
-+++ libvirt-6.10.0/src/qemu/test_libvirtd_qemu.aug.in	2021-01-02 12:52:59.974090801 +0100
+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
 @@ -13,7 +13,7 @@
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
@@ -77,9 +77,9 @@ diff -ur libvirt-6.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-6.10.0/s
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-diff -ur libvirt-6.10.0.orig/src/remote/libvirtd.conf.in libvirt-6.10.0/src/remote/libvirtd.conf.in
---- libvirt-6.10.0.orig/src/remote/libvirtd.conf.in	2021-01-02 12:52:25.830090801 +0100
-+++ libvirt-6.10.0/src/remote/libvirtd.conf.in	2021-01-02 12:52:59.975090801 +0100
+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
 @@ -136,7 +136,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -98,9 +98,9 @@ diff -ur libvirt-6.10.0.orig/src/remote/libvirtd.conf.in libvirt-6.10.0/src/remo
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-6.10.0.orig/src/remote/meson.build libvirt-6.10.0/src/remote/meson.build
---- libvirt-6.10.0.orig/src/remote/meson.build	2021-01-02 12:52:25.831090801 +0100
-+++ libvirt-6.10.0/src/remote/meson.build	2021-01-02 12:53:19.602090801 +0100
+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
 @@ -309,7 +309,7 @@
  if conf.has('WITH_SASL')
    install_data(
@@ -110,82 +110,82 @@ diff -ur libvirt-6.10.0.orig/src/remote/meson.build libvirt-6.10.0/src/remote/me
      rename: [ 'libvirt.conf' ],
    )
  endif
-diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-6.10.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args	2021-01-02 12:52:25.975090801 +0100
-+++ libvirt-6.10.0/tests/qemuxml2argvdata/graphics-spice-sasl.args	2021-01-02 12:52:59.975090801 +0100
-@@ -6,7 +6,7 @@
- XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+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 @@
  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 \
- QEMU_AUDIO_DRV=spice \
  /usr/bin/qemu-system-i386 \
  -name QEMUGuest1 \
-diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args	2021-01-02 12:52:25.976090801 +0100
-+++ libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args	2021-01-02 12:52:59.975090801 +0100
-@@ -6,7 +6,7 @@
- XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+ -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
+@@ -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 \
- QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i386 \
  -name QEMUGuest1 \
-diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
---- libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args	2021-01-02 12:52:25.976090801 +0100
-+++ libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args	2021-01-02 12:52:59.975090801 +0100
-@@ -6,7 +6,7 @@
- XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+ -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 @@
  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 \
- QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i386 \
- -name guest=QEMUGuest1,debug-threads=on \
-diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args	2021-01-02 12:52:25.976090801 +0100
-+++ libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.args	2021-01-02 12:52:59.975090801 +0100
+ -name QEMUGuest1 \
+ -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
 @@ -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-i386 \
- -name QEMUGuest1 \
-diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
---- libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args	2021-01-02 12:52:25.976090801 +0100
-+++ libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args	2021-01-02 12:52:59.976090801 +0100
+ -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
 @@ -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-i386 \
  -name guest=QEMUGuest1,debug-threads=on \
-diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
---- libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args	2021-01-02 12:52:25.976090801 +0100
-+++ libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args	2021-01-02 12:52:59.976090801 +0100
+ -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
 @@ -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-i386 \
  -name guest=QEMUGuest1,debug-threads=on \
-diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvtest.c libvirt-6.10.0/tests/qemuxml2argvtest.c
---- libvirt-6.10.0.orig/tests/qemuxml2argvtest.c	2021-01-02 12:52:26.020090801 +0100
-+++ libvirt-6.10.0/tests/qemuxml2argvtest.c	2021-01-02 12:52:59.976090801 +0100
-@@ -1365,7 +1365,7 @@
+ -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 @@
  
      driver.config->vncSASL = 1;
      VIR_FREE(driver.config->vncSASLdir);
@@ -194,7 +194,7 @@ diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvtest.c libvirt-6.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;
-@@ -1395,7 +1395,7 @@
+@@ -1555,7 +1555,7 @@
      DO_TEST("graphics-spice-no-args",
              QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->spiceSASL = 1;
@@ -203,9 +203,9 @@ diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvtest.c libvirt-6.10.0/tests/qemux
      DO_TEST("graphics-spice-sasl",
              QEMU_CAPS_SPICE,
              QEMU_CAPS_DEVICE_QXL);
-diff -ur libvirt-6.10.0.orig/tests/virconfdata/libvirtd.conf libvirt-6.10.0/tests/virconfdata/libvirtd.conf
---- libvirt-6.10.0.orig/tests/virconfdata/libvirtd.conf	2021-01-02 12:52:26.083090801 +0100
-+++ libvirt-6.10.0/tests/virconfdata/libvirtd.conf	2021-01-02 12:52:59.977090801 +0100
+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
 @@ -91,7 +91,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -224,9 +224,9 @@ diff -ur libvirt-6.10.0.orig/tests/virconfdata/libvirtd.conf libvirt-6.10.0/test
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-6.10.0.orig/tests/virconfdata/libvirtd.out libvirt-6.10.0/tests/virconfdata/libvirtd.out
---- libvirt-6.10.0.orig/tests/virconfdata/libvirtd.out	2021-01-02 12:52:26.083090801 +0100
-+++ libvirt-6.10.0/tests/virconfdata/libvirtd.out	2021-01-02 12:52:59.977090801 +0100
+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
 @@ -73,7 +73,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #