X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-sasl.patch;h=1626d1d3bde2545b9c63bc957ecddee92a567280;hp=b85055f787aa8c611089cac25b23737be2983e84;hb=69c354bc3e587972c43559ff76dfe363a23f26cb;hpb=30488cfe547d889829f5d135761237330412fd07 diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch index b85055f..1626d1d 100644 --- a/libvirt-sasl.patch +++ b/libvirt-sasl.patch @@ -1,6 +1,6 @@ -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 +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 @@ -225,7 +225,7 @@ Since the libvirt SASL config file defaults to using ``GSSAPI`` (Kerberos), a @@ -10,9 +10,9 @@ diff -ur libvirt-8.0.0.orig/docs/auth.rst libvirt-8.0.0/docs/auth.rst parameter to ``scram-sha-256``. **Note:** previous versions of libvirt suggested ``DIGEST-MD5`` and -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 +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 @@ -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.0.0.orig/src/qemu/qemu.conf libvirt-8.0.0/src/qemu/qemu.conf # Enable use of TLS encryption on the chardev TCP transports. # -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 +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 @@ -13,7 +13,7 @@ { "vnc_tls_x509_verify" = "1" } { "vnc_password" = "XYZ12345" } @@ -77,9 +77,9 @@ diff -ur libvirt-8.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-8.0.0/src { "chardev_tls" = "1" } { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" } { "chardev_tls_x509_verify" = "1" } -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 +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 @@ # the network providing auth (eg, TLS/x509 certificates) # @@ -98,10 +98,10 @@ diff -ur libvirt-8.0.0.orig/src/remote/libvirtd.conf.in libvirt-8.0.0/src/remote #auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -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 @@ +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 @@ if conf.has('WITH_SASL') install_data( 'libvirtd.sasl', @@ -110,9 +110,9 @@ diff -ur libvirt-8.0.0.orig/src/remote/meson.build libvirt-8.0.0/src/remote/meso rename: [ 'libvirt.conf' ], ) endif -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 +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 @@ -6,7 +6,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ @@ -122,21 +122,9 @@ diff -ur libvirt-8.0.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-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-x86_64 \ - -name guest=QEMUGuest1,debug-threads=on \ - -S \ -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 +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 @@ -6,7 +6,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ @@ -146,9 +134,9 @@ diff -ur libvirt-8.0.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-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 +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 @@ -6,7 +6,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ @@ -158,9 +146,9 @@ diff -ur libvirt-8.0.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-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 +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 @@ -6,7 +6,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ @@ -170,21 +158,9 @@ diff -ur libvirt-8.0.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-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-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 +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 @@ -6,7 +6,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ @@ -194,19 +170,19 @@ diff -ur libvirt-8.0.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-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 @@ +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 @@ 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_VER("graphics-vnc-sasl", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc-sasl"); driver.config->vncTLS = 1; -@@ -1577,7 +1577,7 @@ + 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; @@ -215,9 +191,9 @@ diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvtest.c libvirt-8.0.0/tests/qemuxml 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 +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 @@ -91,7 +91,7 @@ # the network providing auth (eg, TLS/x509 certificates) # @@ -236,9 +212,9 @@ diff -ur libvirt-8.0.0.orig/tests/virconfdata/libvirtd.conf libvirt-8.0.0/tests/ auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -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 +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 @@ -73,7 +73,7 @@ # the network providing auth (eg, TLS/x509 certificates) #