X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-sasl.patch;h=88ef7aa64698413e39cd149ff0b028c4b383ff57;hp=1ebc932fb2bfcff9a7fc33045bb556007b44d8ff;hb=3e36cfaeb430c9abf7b9a6b93d92661d49120ce4;hpb=60d0909aad60cee96ddf2119563f92fe778f2269

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 1ebc932..88ef7aa 100644
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,31 +1,19 @@
-diff -ur libvirt-6.1.0.orig/docs/auth.html.in libvirt-6.1.0/docs/auth.html.in
---- libvirt-6.1.0.orig/docs/auth.html.in	2020-03-06 09:47:34.102000000 +0100
-+++ libvirt-6.1.0/docs/auth.html.in	2020-03-06 09:48:38.900000000 +0100
-@@ -275,7 +275,7 @@
+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
  config change is required to enable plain password auth. This is done by
--editting <code>/etc/sasl2/libvirt.conf</code> to set the <code>mech_list</code>
-+editting <code>/etc/sasl/libvirt.conf</code> to set the <code>mech_list</code>
+-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.1.0.orig/src/Makefile.in libvirt-6.1.0/src/Makefile.in
---- libvirt-6.1.0.orig/src/Makefile.in	2020-03-06 09:47:34.051000000 +0100
-+++ libvirt-6.1.0/src/Makefile.in	2020-03-06 09:47:52.660000000 +0100
-@@ -6273,7 +6273,7 @@
- 
- # This is needed for clients too, so can't wrap in
- # the WITH_LIBVIRTD conditional
--@WITH_SASL_TRUE@sasldir = $(sysconfdir)/sasl2
-+@WITH_SASL_TRUE@sasldir = $(sysconfdir)/sasl
- LIBVIRTD_UNIT_VARS = \
- 	$(COMMON_UNIT_VARS) \
- 	-e 's|[@]name[@]|Libvirt|g' \
-diff -ur libvirt-6.1.0.orig/src/qemu/qemu.conf libvirt-6.1.0/src/qemu/qemu.conf
---- libvirt-6.1.0.orig/src/qemu/qemu.conf	2020-03-06 09:47:34.078000000 +0100
-+++ libvirt-6.1.0/src/qemu/qemu.conf	2020-03-06 09:47:52.660000000 +0100
-@@ -135,18 +135,18 @@
+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
+@@ -141,18 +141,18 @@
  # Examples include vinagre, virt-viewer and virt-manager
  # itself. UltraVNC, RealVNC, TightVNC do not support this
  #
@@ -47,7 +35,7 @@ diff -ur libvirt-6.1.0.orig/src/qemu/qemu.conf libvirt-6.1.0/src/qemu/qemu.conf
  
  
  # QEMU implements an extension for providing audio over a VNC connection,
-@@ -211,17 +211,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.
  #
@@ -68,9 +56,9 @@ diff -ur libvirt-6.1.0.orig/src/qemu/qemu.conf libvirt-6.1.0/src/qemu/qemu.conf
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-diff -ur libvirt-6.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-6.1.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-6.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in	2020-03-06 09:47:34.077000000 +0100
-+++ libvirt-6.1.0/src/qemu/test_libvirtd_qemu.aug.in	2020-03-06 09:47:52.661000000 +0100
+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
 @@ -13,7 +13,7 @@
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
@@ -89,22 +77,10 @@ diff -ur libvirt-6.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-6.1.0/src
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-diff -ur libvirt-6.1.0.orig/src/remote/Makefile.inc.am libvirt-6.1.0/src/remote/Makefile.inc.am
---- libvirt-6.1.0.orig/src/remote/Makefile.inc.am	2020-03-06 09:47:34.063000000 +0100
-+++ libvirt-6.1.0/src/remote/Makefile.inc.am	2020-03-06 09:47:52.661000000 +0100
-@@ -382,7 +382,7 @@
- # This is needed for clients too, so can't wrap in
- # the WITH_LIBVIRTD conditional
- if WITH_SASL
--sasldir = $(sysconfdir)/sasl2
-+sasldir = $(sysconfdir)/sasl
- 
- install-sasl:
- 	$(MKDIR_P) $(DESTDIR)$(sasldir)
-diff -ur libvirt-6.1.0.orig/src/remote/libvirtd.conf.in libvirt-6.1.0/src/remote/libvirtd.conf.in
---- libvirt-6.1.0.orig/src/remote/libvirtd.conf.in	2020-03-06 09:47:34.063000000 +0100
-+++ libvirt-6.1.0/src/remote/libvirtd.conf.in	2020-03-06 09:47:52.661000000 +0100
-@@ -134,7 +134,7 @@
+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
+@@ -136,7 +136,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
  #  - sasl: use SASL infrastructure. The actual auth scheme is then
@@ -113,7 +89,7 @@ diff -ur libvirt-6.1.0.orig/src/remote/libvirtd.conf.in libvirt-6.1.0/src/remote
  #          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
  #          For non-TCP or TLS sockets, any scheme is allowed.
  #
-@@ -166,7 +166,7 @@
+@@ -186,7 +186,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
@@ -122,9 +98,21 @@ diff -ur libvirt-6.1.0.orig/src/remote/libvirtd.conf.in libvirt-6.1.0/src/remote
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args	2020-03-06 09:47:33.713000000 +0100
-+++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args	2020-03-06 09:47:52.661000000 +0100
+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
+@@ -309,7 +309,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-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 \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -134,9 +122,9 @@ diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libv
  QEMU_AUDIO_DRV=spice \
  /usr/bin/qemu-system-i386 \
  -name QEMUGuest1 \
-diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args	2020-03-06 09:47:33.722000000 +0100
-+++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args	2020-03-06 09:47:52.662000000 +0100
+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 \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -146,9 +134,9 @@ diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvir
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i386 \
  -name QEMUGuest1 \
-diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
---- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args	2020-03-06 09:47:33.722000000 +0100
-+++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args	2020-03-06 09:47:52.662000000 +0100
+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 \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -158,9 +146,9 @@ diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_6
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i386 \
  -name guest=QEMUGuest1,debug-threads=on \
-diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args	2020-03-06 09:47:33.713000000 +0100
-+++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args	2020-03-06 09:47:52.663000000 +0100
+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
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -170,9 +158,9 @@ diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i386 \
  -name QEMUGuest1 \
-diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
---- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args	2020-03-06 09:47:33.718000000 +0100
-+++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args	2020-03-06 09:47:52.663000000 +0100
+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
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -182,9 +170,9 @@ diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i386 \
  -name guest=QEMUGuest1,debug-threads=on \
-diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
---- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args	2020-03-06 09:47:33.719000000 +0100
-+++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args	2020-03-06 09:47:52.664000000 +0100
+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
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -194,10 +182,10 @@ diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-lates
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i386 \
  -name guest=QEMUGuest1,debug-threads=on \
-diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvtest.c libvirt-6.1.0/tests/qemuxml2argvtest.c
---- libvirt-6.1.0.orig/tests/qemuxml2argvtest.c	2020-03-06 09:47:33.741000000 +0100
-+++ libvirt-6.1.0/tests/qemuxml2argvtest.c	2020-03-06 09:47:52.665000000 +0100
-@@ -1197,7 +1197,7 @@
+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 @@
  
      driver.config->vncSASL = 1;
      VIR_FREE(driver.config->vncSASLdir);
@@ -206,7 +194,7 @@ diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvtest.c libvirt-6.1.0/tests/qemuxml
      DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->vncTLS = 1;
      driver.config->vncTLSx509verify = 1;
-@@ -1227,7 +1227,7 @@
+@@ -1395,7 +1395,7 @@
      DO_TEST("graphics-spice-no-args",
              QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->spiceSASL = 1;
@@ -215,9 +203,9 @@ diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvtest.c libvirt-6.1.0/tests/qemuxml
      DO_TEST("graphics-spice-sasl",
              QEMU_CAPS_SPICE,
              QEMU_CAPS_DEVICE_QXL);
-diff -ur libvirt-6.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-6.1.0/tests/virconfdata/libvirtd.conf
---- libvirt-6.1.0.orig/tests/virconfdata/libvirtd.conf	2020-03-06 09:47:33.909000000 +0100
-+++ libvirt-6.1.0/tests/virconfdata/libvirtd.conf	2020-03-06 09:47:52.665000000 +0100
+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
 @@ -91,7 +91,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -236,9 +224,9 @@ diff -ur libvirt-6.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-6.1.0/tests/
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-6.1.0.orig/tests/virconfdata/libvirtd.out libvirt-6.1.0/tests/virconfdata/libvirtd.out
---- libvirt-6.1.0.orig/tests/virconfdata/libvirtd.out	2020-03-06 09:47:33.909000000 +0100
-+++ libvirt-6.1.0/tests/virconfdata/libvirtd.out	2020-03-06 09:47:52.665000000 +0100
+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
 @@ -73,7 +73,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #