X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-sasl.patch;h=88ef7aa64698413e39cd149ff0b028c4b383ff57;hp=d9f1675c6ccb66c3d5fd6feb9b4bb4c13be97191;hb=HEAD;hpb=dd619b7ec6ce3f6e0ccaaf63698d61d39a66398f diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch index d9f1675..2f23a6b 100644 --- a/libvirt-sasl.patch +++ b/libvirt-sasl.patch @@ -1,118 +1,19 @@ -diff -urp libvirt-1.3.2.orig/daemon/libvirtd.conf libvirt-1.3.2/daemon/libvirtd.conf ---- libvirt-1.3.2.orig/daemon/libvirtd.conf 2016-01-10 01:57:37.000000000 +0000 -+++ libvirt-1.3.2/daemon/libvirtd.conf 2016-03-18 06:57:24.113768000 +0000 -@@ -128,7 +128,7 @@ - # the network providing auth (eg, TLS/x509 certificates) - # - # - sasl: use SASL infrastructure. The actual auth scheme is then --# controlled from /etc/sasl2/libvirt.conf. For the TCP -+# controlled from /etc/sasl/libvirt.conf. For the TCP - # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. - # For non-TCP or TLS sockets, any scheme is allowed. - # -@@ -159,7 +159,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 --# mechanism in /etc/sasl2/libvirt.conf -+# mechanism in /etc/sasl/libvirt.conf - #auth_tcp = "sasl" - - # Change the authentication scheme for TLS sockets. -diff -urp libvirt-1.3.2.orig/daemon/Makefile.am libvirt-1.3.2/daemon/Makefile.am ---- libvirt-1.3.2.orig/daemon/Makefile.am 2016-02-24 01:55:16.000000000 +0000 -+++ libvirt-1.3.2/daemon/Makefile.am 2016-03-18 06:57:24.114768000 +0000 -@@ -521,13 +521,13 @@ $(srcdir)/libvirtd.8.in: libvirtd.pod.in - # the WITH_LIBVIRTD conditional - if WITH_SASL - install-data-sasl: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/ -+ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/ - $(INSTALL_DATA) $(srcdir)/libvirtd.sasl \ -- $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf -+ $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf - - uninstall-data-sasl: -- rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf -- rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || : -+ rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf -+ rmdir $(DESTDIR)$(sysconfdir)/sasl/ || : - else ! WITH_SASL - install-data-sasl: - uninstall-data-sasl: -diff -urp libvirt-1.3.2.orig/daemon/Makefile.in libvirt-1.3.2/daemon/Makefile.in ---- libvirt-1.3.2.orig/daemon/Makefile.in 2016-03-01 03:19:22.000000000 +0000 -+++ libvirt-1.3.2/daemon/Makefile.in 2016-03-18 12:16:33.415768000 +0000 -@@ -2832,13 +2832,13 @@ $(srcdir)/libvirtd.8.in: libvirtd.pod.in - # This is needed for clients too, so can't wrap in - # the WITH_LIBVIRTD conditional - @WITH_SASL_TRUE@install-data-sasl: --@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/ -+@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/ - @WITH_SASL_TRUE@ $(INSTALL_DATA) $(srcdir)/libvirtd.sasl \ --@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf -+@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf - - @WITH_SASL_TRUE@uninstall-data-sasl: --@WITH_SASL_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf --@WITH_SASL_TRUE@ rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || : -+@WITH_SASL_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf -+@WITH_SASL_TRUE@ rmdir $(DESTDIR)$(sysconfdir)/sasl/ || : - @WITH_SASL_FALSE@install-data-sasl: - @WITH_SASL_FALSE@uninstall-data-sasl: - -diff -urp libvirt-1.3.2.orig/docs/auth.html libvirt-1.3.2/docs/auth.html ---- libvirt-1.3.2.orig/docs/auth.html 2016-02-24 01:58:13.000000000 +0000 -+++ libvirt-1.3.2/docs/auth.html 2016-03-18 06:57:24.115768000 +0000 -@@ -400,7 +400,7 @@ again: - The plain TCP socket of the libvirt daemon defaults to using SASL for authentication. - The SASL mechanism configured by default is DIGEST-MD5, which provides a basic - username+password style authentication. To enable Kerberos single-sign-on instead, --the libvirt SASL configuration file must be changed. This is /etc/sasl2/libvirt.conf. -+the libvirt SASL configuration file must be changed. This is /etc/sasl/libvirt.conf. - The mech_list parameter must first be changed to gssapi - instead of the default digest-md5, and keytab should be set to - /etc/libvirt/krb5.tab . If SASL is enabled on the UNIX -diff -urp libvirt-1.3.2.orig/docs/auth.html.in libvirt-1.3.2/docs/auth.html.in ---- libvirt-1.3.2.orig/docs/auth.html.in 2015-01-23 11:44:53.000000000 +0000 -+++ libvirt-1.3.2/docs/auth.html.in 2016-03-18 06:57:24.116768000 +0000 -@@ -234,7 +234,7 @@ again: - The plain TCP socket of the libvirt daemon defaults to using SASL for authentication. - The SASL mechanism configured by default is DIGEST-MD5, which provides a basic - username+password style authentication. To enable Kerberos single-sign-on instead, --the libvirt SASL configuration file must be changed. This is /etc/sasl2/libvirt.conf. -+the libvirt SASL configuration file must be changed. This is /etc/sasl/libvirt.conf. - The mech_list parameter must first be changed to gssapi - instead of the default digest-md5, and keytab should be set to - /etc/libvirt/krb5.tab . If SASL is enabled on the UNIX -diff -urp libvirt-1.3.2.orig/libvirt.spec libvirt-1.3.2/libvirt.spec ---- libvirt-1.3.2.orig/libvirt.spec 2016-03-01 03:20:27.000000000 +0000 -+++ libvirt-1.3.2/libvirt.spec 2016-03-18 06:57:24.118768000 +0000 -@@ -2316,7 +2316,7 @@ exit 0 - %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ - - %if %{with_sasl} --%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf -+%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf - %endif - - %if %{with_wireshark} -diff -urp libvirt-1.3.2.orig/libvirt.spec.in libvirt-1.3.2/libvirt.spec.in ---- libvirt-1.3.2.orig/libvirt.spec.in 2016-03-01 03:18:39.000000000 +0000 -+++ libvirt-1.3.2/libvirt.spec.in 2016-03-18 06:57:24.119768000 +0000 -@@ -2316,7 +2316,7 @@ exit 0 - %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ - - %if %{with_sasl} --%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf -+%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf - %endif - - %if %{with_wireshark} -diff -urp libvirt-1.3.2.orig/src/qemu/qemu.conf libvirt-1.3.2/src/qemu/qemu.conf ---- libvirt-1.3.2.orig/src/qemu/qemu.conf 2015-11-27 12:43:23.000000000 +0000 -+++ libvirt-1.3.2/src/qemu/qemu.conf 2016-03-18 12:16:11.751768000 +0000 -@@ -74,18 +74,18 @@ +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 + config change is required to enable plain password auth. This is done by +-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-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 # @@ -134,7 +35,7 @@ diff -urp libvirt-1.3.2.orig/src/qemu/qemu.conf libvirt-1.3.2/src/qemu/qemu.conf # QEMU implements an extension for providing audio over a VNC connection, -@@ -143,17 +143,17 @@ +@@ -217,17 +217,17 @@ # Enable use of SASL encryption on the SPICE server. This requires # a SPICE client which supports the SASL protocol extension. # @@ -153,12 +54,12 @@ diff -urp libvirt-1.3.2.orig/src/qemu/qemu.conf libvirt-1.3.2/src/qemu/qemu.conf -#spice_sasl_dir = "/some/directory/sasl2" +#spice_sasl_dir = "/some/directory/sasl" - - # By default, if no graphical front end is configured, libvirt will disable -diff -urp libvirt-1.3.2.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-1.3.2/src/qemu/test_libvirtd_qemu.aug.in ---- libvirt-1.3.2.orig/src/qemu/test_libvirtd_qemu.aug.in 2015-11-27 12:43:23.000000000 +0000 -+++ libvirt-1.3.2/src/qemu/test_libvirtd_qemu.aug.in 2016-03-18 12:16:00.319768000 +0000 -@@ -9,14 +9,14 @@ module Test_libvirtd_qemu = + # Enable use of TLS encryption on the chardev TCP transports. + # +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" } { "vnc_sasl" = "1" } @@ -167,18 +68,127 @@ diff -urp libvirt-1.3.2.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-1.3.2/sr { "vnc_allow_host_audio" = "0" } { "spice_listen" = "0.0.0.0" } { "spice_tls" = "1" } - { "spice_tls_x509_cert_dir" = "/etc/pki/libvirt-spice" } +@@ -21,7 +21,7 @@ + { "spice_auto_unix_socket" = "1" } { "spice_password" = "XYZ12345" } { "spice_sasl" = "1" } -{ "spice_sasl_dir" = "/some/directory/sasl2" } +{ "spice_sasl_dir" = "/some/directory/sasl" } - { "nographics_allow_host_audio" = "1" } - { "remote_display_port_min" = "5900" } - { "remote_display_port_max" = "65535" } -diff -urp libvirt-1.3.2.orig/tests/confdata/libvirtd.conf libvirt-1.3.2/tests/confdata/libvirtd.conf ---- libvirt-1.3.2.orig/tests/confdata/libvirtd.conf 2015-06-28 03:29:13.000000000 +0000 -+++ libvirt-1.3.2/tests/confdata/libvirtd.conf 2016-03-18 06:57:24.120768000 +0000 -@@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700" + { "chardev_tls" = "1" } + { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" } + { "chardev_tls_x509_verify" = "1" } +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 +-# controlled from @sysconfdir@/sasl2/libvirt.conf. For the TCP ++# controlled from @sysconfdir@/sasl/libvirt.conf. For the TCP + # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. + # For non-TCP or TLS sockets, any scheme is allowed. + # +@@ -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 +-# mechanism in @sysconfdir@/sasl2/libvirt.conf ++# mechanism in @sysconfdir@/sasl/libvirt.conf + #auth_tcp = "sasl" + + # Change the authentication scheme for TLS sockets. +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', +- install_dir: sysconfdir / 'sasl2', ++ install_dir: sysconfdir / 'sasl', + rename: [ 'libvirt.conf' ], + ) + endif +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 \ + 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-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 \ + 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-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 \ + 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-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 \ + 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-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 \ + 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-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); +- 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) # # - sasl: use SASL infrastructure. The actual auth scheme is then @@ -187,7 +197,7 @@ diff -urp libvirt-1.3.2.orig/tests/confdata/libvirtd.conf libvirt-1.3.2/tests/co # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. # For non-TCP or TLS sockets, any scheme is allowed. # -@@ -139,7 +139,7 @@ auth_unix_rw = "none" +@@ -122,7 +122,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 @@ -196,10 +206,10 @@ diff -urp libvirt-1.3.2.orig/tests/confdata/libvirtd.conf libvirt-1.3.2/tests/co auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -urp libvirt-1.3.2.orig/tests/confdata/libvirtd.out libvirt-1.3.2/tests/confdata/libvirtd.out ---- libvirt-1.3.2.orig/tests/confdata/libvirtd.out 2015-06-28 03:29:13.000000000 +0000 -+++ libvirt-1.3.2/tests/confdata/libvirtd.out 2016-03-18 06:57:24.121768000 +0000 -@@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700" +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) # # - sasl: use SASL infrastructure. The actual auth scheme is then @@ -208,7 +218,7 @@ diff -urp libvirt-1.3.2.orig/tests/confdata/libvirtd.out libvirt-1.3.2/tests/con # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. # For non-TCP or TLS sockets, any scheme is allowed. # -@@ -116,7 +116,7 @@ auth_unix_rw = "none" +@@ -102,7 +102,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 @@ -217,84 +227,3 @@ diff -urp libvirt-1.3.2.orig/tests/confdata/libvirtd.out libvirt-1.3.2/tests/con auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. # -diff -urp libvirt-1.3.2.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-1.3.2/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args ---- libvirt-1.3.2.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-02-16 14:25:07.000000000 +0000 -+++ libvirt-1.3.2/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-03-18 12:15:39.783768000 +0000 -@@ -3,7 +3,7 @@ PATH=/bin \ - HOME=/home/test \ - USER=test \ - LOGNAME=test \ --SASL_CONF_PATH=/root/.sasl2 \ -+SASL_CONF_PATH=/root/.sasl \ - QEMU_AUDIO_DRV=none \ - /usr/bin/qemu \ - -name QEMUGuest1 \ -diff -urp libvirt-1.3.2.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-1.3.2/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args ---- libvirt-1.3.2.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-02-16 14:25:07.000000000 +0000 -+++ libvirt-1.3.2/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-03-18 12:15:42.431768000 +0000 -@@ -3,7 +3,7 @@ PATH=/bin \ - HOME=/home/test \ - USER=test \ - LOGNAME=test \ --SASL_CONF_PATH=/root/.sasl2 \ -+SASL_CONF_PATH=/root/.sasl \ - QEMU_AUDIO_DRV=none \ - /usr/bin/qemu \ - -name QEMUGuest1 \ -diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-1.3.2/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args ---- libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-01-10 01:57:37.000000000 +0000 -+++ libvirt-1.3.2/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-03-18 12:13:04.244768000 +0000 -@@ -3,7 +3,7 @@ PATH=/bin \ - HOME=/home/test \ - USER=test \ - LOGNAME=test \ --SASL_CONF_PATH=/root/.sasl2 \ -+SASL_CONF_PATH=/root/.sasl \ - QEMU_AUDIO_DRV=spice \ - /usr/bin/qemu \ - -name QEMUGuest1 \ -diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-1.3.2/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args ---- libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-02-16 14:25:07.000000000 +0000 -+++ libvirt-1.3.2/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-03-18 12:12:18.798768000 +0000 -@@ -3,7 +3,7 @@ PATH=/bin \ - HOME=/home/test \ - USER=test \ - LOGNAME=test \ --SASL_CONF_PATH=/root/.sasl2 \ -+SASL_CONF_PATH=/root/.sasl \ - QEMU_AUDIO_DRV=none \ - /usr/bin/qemu \ - -name QEMUGuest1 \ -diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-1.3.2/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args ---- libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-02-16 14:25:07.000000000 +0000 -+++ libvirt-1.3.2/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-03-18 12:12:35.964768000 +0000 -@@ -3,7 +3,7 @@ PATH=/bin \ - HOME=/home/test \ - USER=test \ - LOGNAME=test \ --SASL_CONF_PATH=/root/.sasl2 \ -+SASL_CONF_PATH=/root/.sasl \ - QEMU_AUDIO_DRV=none \ - /usr/bin/qemu \ - -name QEMUGuest1 \ -diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvtest.c libvirt-1.3.2/tests/qemuxml2argvtest.c ---- libvirt-1.3.2.orig/tests/qemuxml2argvtest.c 2016-02-27 03:16:01.000000000 +0000 -+++ libvirt-1.3.2/tests/qemuxml2argvtest.c 2016-03-18 12:11:24.793768000 +0000 -@@ -921,7 +921,7 @@ mymain(void) - - driver.config->vncSASL = 1; - VIR_FREE(driver.config->vncSASLdir); -- ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl2")); -+ ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl")); - DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC); - driver.config->vncTLS = 1; - driver.config->vncTLSx509verify = 1; -@@ -941,7 +941,7 @@ mymain(void) - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_SPICE_FILE_XFER_DISABLE); - driver.config->spiceSASL = 1; -- ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl2")); -+ ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl")); - DO_TEST("graphics-spice-sasl", - QEMU_CAPS_VGA_QXL, - QEMU_CAPS_SPICE,