X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-sasl.patch;h=2f23a6b4f60b0e64266c1b0138e6f404e8320020;hp=178b7eec07f8e53559257774ca2c49c0fdbc950c;hb=HEAD;hpb=24ff76366882ece31d30aa936e7a510abccbceba

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 178b7ee..2f23a6b 100644
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,6 +1,6 @@
-diff -ur libvirt-9.5.0.orig/docs/auth.rst libvirt-9.5.0/docs/auth.rst
---- libvirt-9.5.0.orig/docs/auth.rst	2023-07-20 17:12:02.016734095 +0200
-+++ libvirt-9.5.0/docs/auth.rst	2023-07-20 17:12:35.936219809 +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-9.5.0.orig/docs/auth.rst libvirt-9.5.0/docs/auth.rst
  parameter to ``scram-sha-256``.
  
  **Note:** previous versions of libvirt suggested ``DIGEST-MD5`` and
-diff -ur libvirt-9.5.0.orig/src/qemu/qemu.conf.in libvirt-9.5.0/src/qemu/qemu.conf.in
---- libvirt-9.5.0.orig/src/qemu/qemu.conf.in	2023-07-20 17:12:02.114735498 +0200
-+++ libvirt-9.5.0/src/qemu/qemu.conf.in	2023-07-20 17:12:35.937219824 +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-9.5.0.orig/src/qemu/qemu.conf.in libvirt-9.5.0/src/qemu/qemu.co
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-diff -ur libvirt-9.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-9.5.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-9.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in	2023-07-20 17:12:02.121735598 +0200
-+++ libvirt-9.5.0/src/qemu/test_libvirtd_qemu.aug.in	2023-07-20 17:12:35.937219824 +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,9 +77,9 @@ diff -ur libvirt-9.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-9.5.0/src
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-diff -ur libvirt-9.5.0.orig/src/remote/libvirtd.conf.in libvirt-9.5.0/src/remote/libvirtd.conf.in
---- libvirt-9.5.0.orig/src/remote/libvirtd.conf.in	2023-07-20 17:12:02.121735598 +0200
-+++ libvirt-9.5.0/src/remote/libvirtd.conf.in	2023-07-20 17:12:35.937219824 +0200
+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)
  #
@@ -98,10 +98,10 @@ diff -ur libvirt-9.5.0.orig/src/remote/libvirtd.conf.in libvirt-9.5.0/src/remote
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-9.5.0.orig/src/remote/meson.build libvirt-9.5.0/src/remote/meson.build
---- libvirt-9.5.0.orig/src/remote/meson.build	2023-07-20 17:12:02.122735613 +0200
-+++ libvirt-9.5.0/src/remote/meson.build	2023-07-20 17:12:35.937219824 +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,9 +110,9 @@ diff -ur libvirt-9.5.0.orig/src/remote/meson.build libvirt-9.5.0/src/remote/meso
      rename: [ 'libvirt.conf' ],
    )
  endif
-diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args libvirt-9.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args
---- libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args	2023-07-20 17:12:02.331738606 +0200
-+++ libvirt-9.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args	2023-07-20 17:14:44.862065962 +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=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
@@ -122,9 +122,9 @@ diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-la
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args
---- libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args	2023-07-20 17:12:02.332738620 +0200
-+++ libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args	2023-07-20 17:14:33.814907772 +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=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
@@ -134,9 +134,9 @@ diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-late
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
---- libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args	2023-07-20 17:12:02.333738634 +0200
-+++ libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args	2023-07-20 17:14:05.149497298 +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=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
@@ -146,9 +146,9 @@ diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_6
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
---- libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args	2023-07-20 17:12:02.333738634 +0200
-+++ libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args	2023-07-20 17:14:21.221727445 +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=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
@@ -158,9 +158,9 @@ diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_6
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
---- libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args	2023-07-20 17:12:02.333738634 +0200
-+++ libvirt-9.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args	2023-07-20 17:14:26.220799030 +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=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
@@ -170,10 +170,10 @@ diff -ur libvirt-9.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-lates
  /usr/bin/qemu-system-x86_64 \
  -name guest=QEMUGuest1,debug-threads=on \
  -S \
-diff -ur libvirt-9.5.0.orig/tests/testutilsqemu.c libvirt-9.5.0/tests/testutilsqemu.c
---- libvirt-9.5.0.orig/tests/testutilsqemu.c	2023-07-20 17:12:02.426739966 +0200
-+++ libvirt-9.5.0/tests/testutilsqemu.c	2023-07-20 17:15:07.460389561 +0200
-@@ -528,9 +528,9 @@
+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");
  
      VIR_FREE(cfg->vncSASLdir);
@@ -185,9 +185,9 @@ diff -ur libvirt-9.5.0.orig/tests/testutilsqemu.c libvirt-9.5.0/tests/testutilsq
  
      VIR_FREE(cfg->spicePassword);
      cfg->spicePassword = g_strdup("123456");
-diff -ur libvirt-9.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-9.5.0/tests/virconfdata/libvirtd.conf
---- libvirt-9.5.0.orig/tests/virconfdata/libvirtd.conf	2023-07-20 17:12:02.518741283 +0200
-+++ libvirt-9.5.0/tests/virconfdata/libvirtd.conf	2023-07-20 17:12:35.944219924 +0200
+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)
  #
@@ -206,9 +206,9 @@ diff -ur libvirt-9.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-9.5.0/tests/
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-9.5.0.orig/tests/virconfdata/libvirtd.out libvirt-9.5.0/tests/virconfdata/libvirtd.out
---- libvirt-9.5.0.orig/tests/virconfdata/libvirtd.out	2023-07-20 17:12:02.518741283 +0200
-+++ libvirt-9.5.0/tests/virconfdata/libvirtd.out	2023-07-20 17:12:35.945219938 +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)
  #