X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-sasl.patch;h=88ef7aa64698413e39cd149ff0b028c4b383ff57;hp=1626d1d3bde2545b9c63bc957ecddee92a567280;hb=HEAD;hpb=69c354bc3e587972c43559ff76dfe363a23f26cb

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 1626d1d..2f23a6b 100644
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,6 +1,6 @@
-diff -ur libvirt-8.4.0.orig/docs/auth.rst libvirt-8.4.0/docs/auth.rst
---- libvirt-8.4.0.orig/docs/auth.rst	2022-06-02 23:58:08.077490237 +0200
-+++ libvirt-8.4.0/docs/auth.rst	2022-06-02 23:58:27.936533169 +0200
+diff -ur libvirt-10.2.0.orig/docs/auth.rst libvirt-10.2.0/docs/auth.rst
+--- libvirt-10.2.0.orig/docs/auth.rst	2024-04-03 17:45:03.261111129 +0200
++++ libvirt-10.2.0/docs/auth.rst	2024-04-03 17:45:24.393393683 +0200
 @@ -225,7 +225,7 @@
  
  Since the libvirt SASL config file defaults to using ``GSSAPI`` (Kerberos), a
@@ -10,9 +10,9 @@ diff -ur libvirt-8.4.0.orig/docs/auth.rst libvirt-8.4.0/docs/auth.rst
  parameter to ``scram-sha-256``.
  
  **Note:** previous versions of libvirt suggested ``DIGEST-MD5`` and
-diff -ur libvirt-8.4.0.orig/src/qemu/qemu.conf.in libvirt-8.4.0/src/qemu/qemu.conf.in
---- libvirt-8.4.0.orig/src/qemu/qemu.conf.in	2022-06-02 23:58:08.164490425 +0200
-+++ libvirt-8.4.0/src/qemu/qemu.conf.in	2022-06-03 00:01:05.398849381 +0200
+diff -ur libvirt-10.2.0.orig/src/qemu/qemu.conf.in libvirt-10.2.0/src/qemu/qemu.conf.in
+--- libvirt-10.2.0.orig/src/qemu/qemu.conf.in	2024-04-03 17:45:03.365112520 +0200
++++ libvirt-10.2.0/src/qemu/qemu.conf.in	2024-04-03 17:45:24.457394538 +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-8.4.0.orig/src/qemu/qemu.conf.in libvirt-8.4.0/src/qemu/qemu.co
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-diff -ur libvirt-8.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-8.4.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-8.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in	2022-06-02 23:58:08.170490438 +0200
-+++ libvirt-8.4.0/src/qemu/test_libvirtd_qemu.aug.in	2022-06-02 23:58:30.521538761 +0200
+diff -ur libvirt-10.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-10.2.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-10.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in	2024-04-03 17:45:03.369112573 +0200
++++ libvirt-10.2.0/src/qemu/test_libvirtd_qemu.aug.in	2024-04-03 17:45:24.457394538 +0200
 @@ -13,7 +13,7 @@
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
@@ -77,10 +77,10 @@ diff -ur libvirt-8.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-8.4.0/src
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-diff -ur libvirt-8.4.0.orig/src/remote/libvirtd.conf.in libvirt-8.4.0/src/remote/libvirtd.conf.in
---- libvirt-8.4.0.orig/src/remote/libvirtd.conf.in	2022-06-02 23:58:08.171490440 +0200
-+++ libvirt-8.4.0/src/remote/libvirtd.conf.in	2022-06-02 23:58:30.521538761 +0200
-@@ -136,7 +136,7 @@
+diff -ur libvirt-10.2.0.orig/src/remote/libvirtd.conf.in libvirt-10.2.0/src/remote/libvirtd.conf.in
+--- libvirt-10.2.0.orig/src/remote/libvirtd.conf.in	2024-04-03 17:45:03.369112573 +0200
++++ libvirt-10.2.0/src/remote/libvirtd.conf.in	2024-04-03 17:45:24.457394538 +0200
+@@ -140,7 +140,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
  #  - sasl: use SASL infrastructure. The actual auth scheme is then
@@ -89,7 +89,7 @@ diff -ur libvirt-8.4.0.orig/src/remote/libvirtd.conf.in libvirt-8.4.0/src/remote
  #          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
  #          For non-TCP or TLS sockets, any scheme is allowed.
  #
-@@ -186,7 +186,7 @@
+@@ -190,7 +190,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
@@ -98,10 +98,10 @@ diff -ur libvirt-8.4.0.orig/src/remote/libvirtd.conf.in libvirt-8.4.0/src/remote
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-8.4.0.orig/src/remote/meson.build libvirt-8.4.0/src/remote/meson.build
---- libvirt-8.4.0.orig/src/remote/meson.build	2022-06-02 23:58:08.171490440 +0200
-+++ libvirt-8.4.0/src/remote/meson.build	2022-06-02 23:58:30.522538764 +0200
-@@ -302,7 +302,7 @@
+diff -ur libvirt-10.2.0.orig/src/remote/meson.build libvirt-10.2.0/src/remote/meson.build
+--- libvirt-10.2.0.orig/src/remote/meson.build	2024-04-03 17:45:03.369112573 +0200
++++ libvirt-10.2.0/src/remote/meson.build	2024-04-03 17:45:24.457394538 +0200
+@@ -328,7 +328,7 @@
  if conf.has('WITH_SASL')
    install_data(
      'libvirtd.sasl',
@@ -110,90 +110,84 @@ diff -ur libvirt-8.4.0.orig/src/remote/meson.build libvirt-8.4.0/src/remote/meso
      rename: [ 'libvirt.conf' ],
    )
  endif
-diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args
---- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args	2022-06-02 23:58:08.323490769 +0200
-+++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args	2022-06-02 23:58:30.522538764 +0200
+diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args
+--- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args	2024-04-03 17:45:03.593115568 +0200
++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args	2024-04-03 17:47:10.346810356 +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 \
+ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+-SASL_CONF_PATH=/etc/sasl2 \
++SASL_CONF_PATH=/etc/sasl \
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args
---- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args	2022-06-02 23:58:08.324490771 +0200
-+++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args	2022-06-02 23:58:31.535540952 +0200
+diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args
+--- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args	2024-04-03 17:45:03.597115621 +0200
++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args	2024-04-03 17:47:02.230701838 +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 \
+ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+-SASL_CONF_PATH=/etc/sasl2 \
++SASL_CONF_PATH=/etc/sasl \
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
---- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args	2022-06-02 23:58:08.324490771 +0200
-+++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args	2022-06-02 23:58:31.535540952 +0200
+diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
+--- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args	2024-04-03 17:45:03.597115621 +0200
++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args	2024-04-03 17:47:06.658761044 +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 \
+ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+-SASL_CONF_PATH=/etc/sasl2 \
++SASL_CONF_PATH=/etc/sasl \
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
---- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args	2022-06-02 23:58:08.324490771 +0200
-+++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args	2022-06-02 23:58:31.536540954 +0200
+diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args
+--- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args	2024-04-03 17:45:03.597115621 +0200
++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args	2024-04-03 17:47:16.594893897 +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 \
+ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+-SASL_CONF_PATH=/etc/sasl2 \
++SASL_CONF_PATH=/etc/sasl \
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
---- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args	2022-06-02 23:58:08.324490771 +0200
-+++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args	2022-06-02 23:58:32.239542466 +0200
+diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args
+--- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args	2024-04-03 17:45:03.597115621 +0200
++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args	2024-04-03 17:47:13.522852821 +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 \
+ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+-SASL_CONF_PATH=/etc/sasl2 \
++SASL_CONF_PATH=/etc/sasl \
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvtest.c libvirt-8.4.0/tests/qemuxml2argvtest.c
---- libvirt-8.4.0.orig/tests/qemuxml2argvtest.c	2022-06-02 23:58:08.469491084 +0200
-+++ libvirt-8.4.0/tests/qemuxml2argvtest.c	2022-06-02 23:59:10.540619907 +0200
-@@ -1509,7 +1509,7 @@
+diff -ur libvirt-10.2.0.orig/tests/testutilsqemu.c libvirt-10.2.0/tests/testutilsqemu.c
+--- libvirt-10.2.0.orig/tests/testutilsqemu.c	2024-04-03 17:45:03.705117066 +0200
++++ libvirt-10.2.0/tests/testutilsqemu.c	2024-04-03 17:45:28.901453959 +0200
+@@ -387,9 +387,9 @@
+     cfg->backupTLSx509certdir = g_strdup("/etc/pki/libvirt-backup");
  
-     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_CAPS_LATEST("graphics-vnc-sasl");
-     driver.config->vncTLS = 1;
-     driver.config->vncTLSx509verify = 1;
-@@ -1531,7 +1531,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_CAPS_LATEST("graphics-spice-sasl");
-     VIR_FREE(driver.config->spiceSASLdir);
-     driver.config->spiceSASL = 0;
-diff -ur libvirt-8.4.0.orig/tests/virconfdata/libvirtd.conf libvirt-8.4.0/tests/virconfdata/libvirtd.conf
---- libvirt-8.4.0.orig/tests/virconfdata/libvirtd.conf	2022-06-02 23:58:08.555491270 +0200
-+++ libvirt-8.4.0/tests/virconfdata/libvirtd.conf	2022-06-02 23:58:32.240542468 +0200
+     VIR_FREE(cfg->vncSASLdir);
+-    cfg->vncSASLdir = g_strdup("/etc/sasl2");
++    cfg->vncSASLdir = g_strdup("/etc/sasl");
+     VIR_FREE(cfg->spiceSASLdir);
+-    cfg->spiceSASLdir = g_strdup("/etc/sasl2");
++    cfg->spiceSASLdir = g_strdup("/etc/sasl");
+ 
+     VIR_FREE(cfg->spicePassword);
+     cfg->spicePassword = g_strdup("123456");
+diff -ur libvirt-10.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-10.2.0/tests/virconfdata/libvirtd.conf
+--- libvirt-10.2.0.orig/tests/virconfdata/libvirtd.conf	2024-04-03 17:45:03.905119740 +0200
++++ libvirt-10.2.0/tests/virconfdata/libvirtd.conf	2024-04-03 17:45:28.929454333 +0200
 @@ -91,7 +91,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -212,9 +206,9 @@ diff -ur libvirt-8.4.0.orig/tests/virconfdata/libvirtd.conf libvirt-8.4.0/tests/
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-8.4.0.orig/tests/virconfdata/libvirtd.out libvirt-8.4.0/tests/virconfdata/libvirtd.out
---- libvirt-8.4.0.orig/tests/virconfdata/libvirtd.out	2022-06-02 23:58:08.555491270 +0200
-+++ libvirt-8.4.0/tests/virconfdata/libvirtd.out	2022-06-02 23:58:32.240542468 +0200
+diff -ur libvirt-10.2.0.orig/tests/virconfdata/libvirtd.out libvirt-10.2.0/tests/virconfdata/libvirtd.out
+--- libvirt-10.2.0.orig/tests/virconfdata/libvirtd.out	2024-04-03 17:45:03.905119740 +0200
++++ libvirt-10.2.0/tests/virconfdata/libvirtd.out	2024-04-03 17:45:28.929454333 +0200
 @@ -73,7 +73,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #