]> TLD Linux GIT Repositories - packages/libvirt.git/blobdiff - libvirt-sasl.patch
TLD / packages / libvirt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- updated to 5.8.0
[packages/libvirt.git] / libvirt-sasl.patch
diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index a33de1c9b6a4a1f42001964b52e9250cc02fefb8..bf92ef0491841dcb18e14a29cd5319010a783603 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,7 +1,7 @@
-diff -ur libvirt-5.6.0.orig/docs/auth.html libvirt-5.6.0/docs/auth.html
---- libvirt-5.6.0.orig/docs/auth.html  2019-08-18 18:13:34.004000000 +0200
-+++ libvirt-5.6.0/docs/auth.html       2019-08-18 18:13:49.483000000 +0200
-@@ -318,7 +318,7 @@
+diff -ur libvirt-5.8.0.orig/docs/auth.html libvirt-5.8.0/docs/auth.html
+--- libvirt-5.8.0.orig/docs/auth.html  2019-10-20 16:04:35.546000000 +0200
++++ libvirt-5.8.0/docs/auth.html       2019-10-20 16:04:56.339000000 +0200
+@@ -316,7 +316,7 @@
          <p>
  Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
  config change is rquired to enable plain password auth. This is done by
@@ -10,10 +10,10 @@ diff -ur libvirt-5.6.0.orig/docs/auth.html libvirt-5.6.0/docs/auth.html
  parameter to <code>scram-sha-1</code>.
      </p>
          <p>
-diff -ur libvirt-5.6.0.orig/docs/auth.html.in libvirt-5.6.0/docs/auth.html.in
---- libvirt-5.6.0.orig/docs/auth.html.in       2019-08-18 18:13:34.038000000 +0200
-+++ libvirt-5.6.0/docs/auth.html.in    2019-08-18 18:13:49.483000000 +0200
-@@ -277,7 +277,7 @@
+diff -ur libvirt-5.8.0.orig/docs/auth.html.in libvirt-5.8.0/docs/auth.html.in
+--- libvirt-5.8.0.orig/docs/auth.html.in       2019-10-20 16:04:35.553000000 +0200
++++ libvirt-5.8.0/docs/auth.html.in    2019-10-20 16:04:56.339000000 +0200
+@@ -275,7 +275,7 @@
      <p>
  Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
  config change is rquired to enable plain password auth. This is done by
@@ -22,21 +22,21 @@ diff -ur libvirt-5.6.0.orig/docs/auth.html.in libvirt-5.6.0/docs/auth.html.in
  parameter to <code>scram-sha-1</code>.
      </p>
      <p>
-diff -ur libvirt-5.6.0.orig/src/Makefile.in libvirt-5.6.0/src/Makefile.in
---- libvirt-5.6.0.orig/src/Makefile.in 2019-08-18 18:13:33.904000000 +0200
-+++ libvirt-5.6.0/src/Makefile.in      2019-08-18 18:13:49.485000000 +0200
-@@ -6729,7 +6729,7 @@
+diff -ur libvirt-5.8.0.orig/src/Makefile.in libvirt-5.8.0/src/Makefile.in
+--- libvirt-5.8.0.orig/src/Makefile.in 2019-10-20 16:04:35.325000000 +0200
++++ libvirt-5.8.0/src/Makefile.in      2019-10-20 16:05:47.662000000 +0200
+@@ -7325,7 +7325,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
- THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD)
- SECDRIVER_CFLAGS = $(am__append_191) $(am__append_193)
- SECDRIVER_LIBS = $(am__append_192) $(am__append_194)
-diff -ur libvirt-5.6.0.orig/src/qemu/qemu.conf libvirt-5.6.0/src/qemu/qemu.conf
---- libvirt-5.6.0.orig/src/qemu/qemu.conf      2019-08-18 18:13:33.918000000 +0200
-+++ libvirt-5.6.0/src/qemu/qemu.conf   2019-08-18 18:13:49.486000000 +0200
+ LIBVIRTD_UNIT_VARS = \
+       $(COMMON_UNIT_VARS) \
+       -e 's|[@]name[@]|Libvirt|g' \
+diff -ur libvirt-5.8.0.orig/src/qemu/qemu.conf libvirt-5.8.0/src/qemu/qemu.conf
+--- libvirt-5.8.0.orig/src/qemu/qemu.conf      2019-10-20 16:04:35.385000000 +0200
++++ libvirt-5.8.0/src/qemu/qemu.conf   2019-10-20 16:04:56.343000000 +0200
 @@ -135,18 +135,18 @@
  # Examples include vinagre, virt-viewer and virt-manager
  # itself. UltraVNC, RealVNC, TightVNC do not support this
@@ -80,9 +80,9 @@ diff -ur libvirt-5.6.0.orig/src/qemu/qemu.conf libvirt-5.6.0/src/qemu/qemu.conf
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-diff -ur libvirt-5.6.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.6.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-5.6.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2019-08-18 18:13:33.917000000 +0200
-+++ libvirt-5.6.0/src/qemu/test_libvirtd_qemu.aug.in   2019-08-18 18:13:49.486000000 +0200
+diff -ur libvirt-5.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.8.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-5.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2019-10-20 16:04:35.351000000 +0200
++++ libvirt-5.8.0/src/qemu/test_libvirtd_qemu.aug.in   2019-10-20 16:04:56.343000000 +0200
 @@ -13,7 +13,7 @@
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
@@ -101,31 +101,31 @@ diff -ur libvirt-5.6.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.6.0/src
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-diff -ur libvirt-5.6.0.orig/src/remote/libvirtd.conf libvirt-5.6.0/src/remote/libvirtd.conf
---- libvirt-5.6.0.orig/src/remote/libvirtd.conf        2019-08-18 18:13:33.899000000 +0200
-+++ libvirt-5.6.0/src/remote/libvirtd.conf     2019-08-18 18:13:49.486000000 +0200
-@@ -132,7 +132,7 @@
+diff -ur libvirt-5.8.0.orig/src/remote/libvirtd.conf.in libvirt-5.8.0/src/remote/libvirtd.conf.in
+--- libvirt-5.8.0.orig/src/remote/libvirtd.conf.in     2019-10-20 16:04:35.339000000 +0200
++++ libvirt-5.8.0/src/remote/libvirtd.conf.in  2019-10-20 16:06:12.441000000 +0200
+@@ -134,7 +134,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
+-#          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.
  #
-@@ -163,7 +163,7 @@
+@@ -166,7 +166,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
+-# 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-5.6.0.orig/src/remote/Makefile.inc.am libvirt-5.6.0/src/remote/Makefile.inc.am
---- libvirt-5.6.0.orig/src/remote/Makefile.inc.am      2019-08-18 18:13:33.901000000 +0200
-+++ libvirt-5.6.0/src/remote/Makefile.inc.am   2019-08-18 18:13:49.486000000 +0200
-@@ -249,7 +249,7 @@
+diff -ur libvirt-5.8.0.orig/src/remote/Makefile.inc.am libvirt-5.8.0/src/remote/Makefile.inc.am
+--- libvirt-5.8.0.orig/src/remote/Makefile.inc.am      2019-10-20 16:04:35.339000000 +0200
++++ libvirt-5.8.0/src/remote/Makefile.inc.am   2019-10-20 16:04:58.545000000 +0200
+@@ -360,7 +360,7 @@
  # This is needed for clients too, so can't wrap in
  # the WITH_LIBVIRTD conditional
  if WITH_SASL
@@ -134,9 +134,9 @@ diff -ur libvirt-5.6.0.orig/src/remote/Makefile.inc.am libvirt-5.6.0/src/remote/
  
  install-sasl:
        $(MKDIR_P) $(DESTDIR)$(sasldir)
-diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.6.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-08-18 18:13:33.381000000 +0200
-+++ libvirt-5.6.0/tests/qemuxml2argvdata/graphics-spice-sasl.args      2019-08-18 18:13:49.486000000 +0200
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.8.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
+--- libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-10-20 16:04:35.069000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvdata/graphics-spice-sasl.args      2019-10-20 16:04:58.545000000 +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 +146,9 @@ diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libv
  QEMU_AUDIO_DRV=spice \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args   2019-08-18 18:13:33.390000000 +0200
-+++ libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args        2019-08-18 18:13:49.486000000 +0200
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+--- libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args   2019-10-20 16:04:35.078000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args        2019-10-20 16:04:58.546000000 +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 +158,9 @@ diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvir
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args    2019-08-18 18:13:33.380000000 +0200
-+++ libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-08-18 18:13:49.486000000 +0200
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
+--- libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args    2019-10-20 16:04:35.069000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-10-20 16:04:58.546000000 +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,9 +170,9 @@ diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
---- libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args       2019-08-18 18:13:33.390000000 +0200
-+++ libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args    2019-08-18 18:13:49.486000000 +0200
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+--- libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args       2019-10-20 16:04:35.078000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args    2019-10-20 16:04:58.546000000 +0200
 @@ -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 +182,9 @@ diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_6
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name guest=QEMUGuest1,debug-threads=on \
-diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
---- libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args       2019-08-18 18:13:33.385000000 +0200
-+++ libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args    2019-08-18 18:13:49.487000000 +0200
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
+--- libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args       2019-10-20 16:04:35.073000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args    2019-10-20 16:04:58.546000000 +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,9 +194,9 @@ diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name guest=QEMUGuest1,debug-threads=on \
-diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
---- libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args      2019-08-18 18:13:33.386000000 +0200
-+++ libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args   2019-08-18 18:13:49.487000000 +0200
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+--- libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args      2019-10-20 16:04:35.075000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args   2019-10-20 16:04:58.546000000 +0200
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -206,10 +206,10 @@ diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-lates
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name guest=QEMUGuest1,debug-threads=on \
-diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvtest.c libvirt-5.6.0/tests/qemuxml2argvtest.c
---- libvirt-5.6.0.orig/tests/qemuxml2argvtest.c        2019-08-18 18:13:33.406000000 +0200
-+++ libvirt-5.6.0/tests/qemuxml2argvtest.c     2019-08-18 18:13:49.487000000 +0200
-@@ -1177,7 +1177,7 @@
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvtest.c libvirt-5.8.0/tests/qemuxml2argvtest.c
+--- libvirt-5.8.0.orig/tests/qemuxml2argvtest.c        2019-10-20 16:04:35.085000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvtest.c     2019-10-20 16:04:58.547000000 +0200
+@@ -1215,7 +1215,7 @@
  
      driver.config->vncSASL = 1;
      VIR_FREE(driver.config->vncSASLdir);
@@ -218,7 +218,7 @@ diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvtest.c libvirt-5.6.0/tests/qemuxml
      DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->vncTLS = 1;
      driver.config->vncTLSx509verify = 1;
-@@ -1209,7 +1209,7 @@
+@@ -1247,7 +1247,7 @@
      DO_TEST("graphics-spice-no-args",
              QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->spiceSASL = 1;
@@ -227,9 +227,9 @@ diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvtest.c libvirt-5.6.0/tests/qemuxml
      DO_TEST("graphics-spice-sasl",
              QEMU_CAPS_SPICE,
              QEMU_CAPS_DEVICE_QXL);
-diff -ur libvirt-5.6.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.6.0/tests/virconfdata/libvirtd.conf
---- libvirt-5.6.0.orig/tests/virconfdata/libvirtd.conf 2019-08-18 18:13:33.812000000 +0200
-+++ libvirt-5.6.0/tests/virconfdata/libvirtd.conf      2019-08-18 18:13:49.487000000 +0200
+diff -ur libvirt-5.8.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.8.0/tests/virconfdata/libvirtd.conf
+--- libvirt-5.8.0.orig/tests/virconfdata/libvirtd.conf 2019-10-20 16:04:35.211000000 +0200
++++ libvirt-5.8.0/tests/virconfdata/libvirtd.conf      2019-10-20 16:04:58.547000000 +0200
 @@ -91,7 +91,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -248,9 +248,9 @@ diff -ur libvirt-5.6.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.6.0/tests/
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-5.6.0.orig/tests/virconfdata/libvirtd.out libvirt-5.6.0/tests/virconfdata/libvirtd.out
---- libvirt-5.6.0.orig/tests/virconfdata/libvirtd.out  2019-08-18 18:13:33.812000000 +0200
-+++ libvirt-5.6.0/tests/virconfdata/libvirtd.out       2019-08-18 18:13:49.487000000 +0200
+diff -ur libvirt-5.8.0.orig/tests/virconfdata/libvirtd.out libvirt-5.8.0/tests/virconfdata/libvirtd.out
+--- libvirt-5.8.0.orig/tests/virconfdata/libvirtd.out  2019-10-20 16:04:35.211000000 +0200
++++ libvirt-5.8.0/tests/virconfdata/libvirtd.out       2019-10-20 16:04:58.547000000 +0200
 @@ -73,7 +73,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
Toolkit to interact with virtualization capabilities