]> 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.1.0
[packages/libvirt.git] / libvirt-sasl.patch
diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 0a8ad520ecf42b6db4ce6cd98c714c3e78059cb2..0181fa1e6c58de4f6f57d6f5722b3beb9241ec22 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-4.5.0.orig/docs/auth.html libvirt-4.5.0/docs/auth.html
---- libvirt-4.5.0.orig/docs/auth.html  2018-07-09 16:24:49.467875585 +0000
-+++ libvirt-4.5.0/docs/auth.html       2018-07-09 16:25:07.306874521 +0000
-@@ -338,7 +338,7 @@ to turn on SASL auth in these listeners.
+diff -urp libvirt-5.1.0.orig/docs/auth.html libvirt-5.1.0/docs/auth.html
+--- libvirt-5.1.0.orig/docs/auth.html  2019-03-23 11:37:08.293000000 +0100
++++ libvirt-5.1.0/docs/auth.html       2019-03-23 11:37:35.451000000 +0100
+@@ -347,7 +347,7 @@ to turn on SASL auth in these listeners.
          <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 -urp libvirt-4.5.0.orig/docs/auth.html libvirt-4.5.0/docs/auth.html
  parameter to <code>scram-sha-1</code>.
      </p>
          <p>
-diff -urp libvirt-4.5.0.orig/docs/auth.html.in libvirt-4.5.0/docs/auth.html.in
---- libvirt-4.5.0.orig/docs/auth.html.in       2018-07-09 16:24:49.471875584 +0000
-+++ libvirt-4.5.0/docs/auth.html.in    2018-07-09 16:25:07.307874521 +0000
-@@ -267,7 +267,7 @@ to turn on SASL auth in these listeners.
+diff -urp libvirt-5.1.0.orig/docs/auth.html.in libvirt-5.1.0/docs/auth.html.in
+--- libvirt-5.1.0.orig/docs/auth.html.in       2019-03-23 11:37:08.296000000 +0100
++++ libvirt-5.1.0/docs/auth.html.in    2019-03-23 11:37:35.451000000 +0100
+@@ -277,7 +277,7 @@ to turn on SASL auth in these listeners.
      <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,31 +22,22 @@ diff -urp libvirt-4.5.0.orig/docs/auth.html.in libvirt-4.5.0/docs/auth.html.in
  parameter to <code>scram-sha-1</code>.
      </p>
      <p>
-diff -urp libvirt-4.5.0.orig/src/Makefile.in libvirt-4.5.0/src/Makefile.in
---- libvirt-4.5.0.orig/src/Makefile.in 2018-07-09 16:24:49.542875580 +0000
-+++ libvirt-4.5.0/src/Makefile.in      2018-07-09 16:25:07.311874521 +0000
-@@ -13166,13 +13166,13 @@ lxc/lxc_controller_dispatch.h: $(srcdir)
+diff -urp libvirt-5.1.0.orig/src/Makefile.in libvirt-5.1.0/src/Makefile.in
+--- libvirt-5.1.0.orig/src/Makefile.in 2019-03-23 11:37:08.372000000 +0100
++++ libvirt-5.1.0/src/Makefile.in      2019-03-23 11:38:49.722000000 +0100
+@@ -6226,7 +6226,7 @@ REMOTE_DRIVER_PROTOCOL = \
+ 
  # This is needed for clients too, so can't wrap in
  # the WITH_LIBVIRTD conditional
- @WITH_SASL_TRUE@install-sasl:
--@WITH_SASL_TRUE@      $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
-+@WITH_SASL_TRUE@      $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
- @WITH_SASL_TRUE@      $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \
--@WITH_SASL_TRUE@              $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-+@WITH_SASL_TRUE@              $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
- 
- @WITH_SASL_TRUE@uninstall-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-sasl:
- @WITH_SASL_FALSE@uninstall-sasl:
- 
-diff -urp libvirt-4.5.0.orig/src/qemu/qemu.conf libvirt-4.5.0/src/qemu/qemu.conf
---- libvirt-4.5.0.orig/src/qemu/qemu.conf      2018-07-09 16:24:49.520875581 +0000
-+++ libvirt-4.5.0/src/qemu/qemu.conf   2018-07-09 16:25:07.311874521 +0000
-@@ -129,18 +129,18 @@
+-@WITH_SASL_TRUE@sasldir = $(sysconfdir)/sasl2
++@WITH_SASL_TRUE@sasldir = $(sysconfdir)/sasl
+ THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD)
+ SECDRIVER_CFLAGS = $(am__append_185) $(am__append_187)
+ SECDRIVER_LIBS = $(am__append_186) $(am__append_188)
+diff -urp libvirt-5.1.0.orig/src/qemu/qemu.conf libvirt-5.1.0/src/qemu/qemu.conf
+--- libvirt-5.1.0.orig/src/qemu/qemu.conf      2019-03-23 11:37:08.358000000 +0100
++++ libvirt-5.1.0/src/qemu/qemu.conf   2019-03-23 11:37:35.455000000 +0100
+@@ -135,18 +135,18 @@
  # Examples include vinagre, virt-viewer and virt-manager
  # itself. UltraVNC, RealVNC, TightVNC do not support this
  #
@@ -68,7 +59,7 @@ diff -urp libvirt-4.5.0.orig/src/qemu/qemu.conf libvirt-4.5.0/src/qemu/qemu.conf
  
  
  # QEMU implements an extension for providing audio over a VNC connection,
-@@ -205,17 +205,17 @@
+@@ -211,17 +211,17 @@
  # Enable use of SASL encryption on the SPICE server. This requires
  # a SPICE client which supports the SASL protocol extension.
  #
@@ -89,10 +80,10 @@ diff -urp libvirt-4.5.0.orig/src/qemu/qemu.conf libvirt-4.5.0/src/qemu/qemu.conf
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-diff -urp libvirt-4.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.5.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-4.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2018-07-09 16:24:49.520875581 +0000
-+++ libvirt-4.5.0/src/qemu/test_libvirtd_qemu.aug.in   2018-07-09 16:25:07.312874521 +0000
-@@ -12,7 +12,7 @@ module Test_libvirtd_qemu =
+diff -urp libvirt-5.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.1.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-5.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2019-03-23 11:37:08.358000000 +0100
++++ libvirt-5.1.0/src/qemu/test_libvirtd_qemu.aug.in   2019-03-23 11:37:35.455000000 +0100
+@@ -13,7 +13,7 @@ module Test_libvirtd_qemu =
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
  { "vnc_sasl" = "1" }
@@ -101,7 +92,7 @@ diff -urp libvirt-4.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.5.0/sr
  { "vnc_allow_host_audio" = "0" }
  { "spice_listen" = "0.0.0.0" }
  { "spice_tls" = "1" }
-@@ -20,7 +20,7 @@ module Test_libvirtd_qemu =
+@@ -21,7 +21,7 @@ module Test_libvirtd_qemu =
  { "spice_auto_unix_socket" = "1" }
  { "spice_password" = "XYZ12345" }
  { "spice_sasl" = "1" }
@@ -110,9 +101,9 @@ diff -urp libvirt-4.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.5.0/sr
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-diff -urp libvirt-4.5.0.orig/src/remote/libvirtd.conf libvirt-4.5.0/src/remote/libvirtd.conf
---- libvirt-4.5.0.orig/src/remote/libvirtd.conf        2018-07-09 16:24:49.523875581 +0000
-+++ libvirt-4.5.0/src/remote/libvirtd.conf     2018-07-09 16:25:07.312874521 +0000
+diff -urp libvirt-5.1.0.orig/src/remote/libvirtd.conf libvirt-5.1.0/src/remote/libvirtd.conf
+--- libvirt-5.1.0.orig/src/remote/libvirtd.conf        2019-03-23 11:37:08.359000000 +0100
++++ libvirt-5.1.0/src/remote/libvirtd.conf     2019-03-23 11:37:35.455000000 +0100
 @@ -123,7 +123,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -131,30 +122,21 @@ diff -urp libvirt-4.5.0.orig/src/remote/libvirtd.conf libvirt-4.5.0/src/remote/l
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -urp libvirt-4.5.0.orig/src/remote/Makefile.inc.am libvirt-4.5.0/src/remote/Makefile.inc.am
---- libvirt-4.5.0.orig/src/remote/Makefile.inc.am      2018-07-09 16:24:49.520875581 +0000
-+++ libvirt-4.5.0/src/remote/Makefile.inc.am   2018-07-09 16:25:07.312874521 +0000
-@@ -248,13 +248,13 @@ endif ! WITH_LIBVIRTD
+diff -urp libvirt-5.1.0.orig/src/remote/Makefile.inc.am libvirt-5.1.0/src/remote/Makefile.inc.am
+--- libvirt-5.1.0.orig/src/remote/Makefile.inc.am      2019-03-23 11:37:08.358000000 +0100
++++ libvirt-5.1.0/src/remote/Makefile.inc.am   2019-03-23 11:39:17.701000000 +0100
+@@ -242,7 +242,7 @@ endif WITH_LIBVIRTD
+ # This is needed for clients too, so can't wrap in
  # the WITH_LIBVIRTD conditional
  if WITH_SASL
- install-sasl:
--      $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
-+      $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
-       $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \
--              $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-+              $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
+-sasldir = $(sysconfdir)/sasl2
++sasldir = $(sysconfdir)/sasl
  
- uninstall-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-sasl:
- uninstall-sasl:
-diff -urp libvirt-4.5.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-4.5.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
---- libvirt-4.5.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args   2018-07-09 16:24:50.006875552 +0000
-+++ libvirt-4.5.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args        2018-07-09 16:25:07.312874521 +0000
+       $(MKDIR_P) $(DESTDIR)$(sasldir)
+diff -urp libvirt-5.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-5.1.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
+--- libvirt-5.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args   2019-03-23 11:37:08.489000000 +0100
++++ libvirt-5.1.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args        2019-03-23 11:37:35.455000000 +0100
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -164,9 +146,9 @@ diff -urp libvirt-4.5.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvi
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-4.5.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-4.5.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
---- libvirt-4.5.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args    2018-07-09 16:24:50.006875552 +0000
-+++ libvirt-4.5.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-07-09 16:25:07.312874521 +0000
+diff -urp libvirt-5.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-5.1.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
+--- libvirt-5.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args    2019-03-23 11:37:08.489000000 +0100
++++ libvirt-5.1.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2019-03-23 11:37:35.456000000 +0100
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -176,9 +158,9 @@ diff -urp libvirt-4.5.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvir
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-4.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-07-09 16:24:49.567875579 +0000
-+++ libvirt-4.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args      2018-07-09 16:25:07.312874521 +0000
+diff -urp libvirt-5.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
+--- libvirt-5.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-03-23 11:37:08.535000000 +0100
++++ libvirt-5.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args      2019-03-23 11:37:35.456000000 +0100
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -188,9 +170,9 @@ diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args lib
  QEMU_AUDIO_DRV=spice \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-4.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args   2018-07-09 16:24:49.567875579 +0000
-+++ libvirt-4.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args        2018-07-09 16:25:07.312874521 +0000
+diff -urp libvirt-5.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+--- libvirt-5.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args   2019-03-23 11:37:08.535000000 +0100
++++ libvirt-5.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args        2019-03-23 11:37:35.456000000 +0100
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -200,9 +182,9 @@ diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvi
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-4.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args    2018-07-09 16:24:49.567875579 +0000
-+++ libvirt-4.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-07-09 16:25:07.313874521 +0000
+diff -urp libvirt-5.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
+--- libvirt-5.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args    2019-03-23 11:37:08.536000000 +0100
++++ libvirt-5.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-03-23 11:37:35.456000000 +0100
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -212,10 +194,10 @@ diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvir
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvtest.c libvirt-4.5.0/tests/qemuxml2argvtest.c
---- libvirt-4.5.0.orig/tests/qemuxml2argvtest.c        2018-07-09 16:24:49.831875563 +0000
-+++ libvirt-4.5.0/tests/qemuxml2argvtest.c     2018-07-09 16:25:07.313874521 +0000
-@@ -1190,7 +1190,7 @@ mymain(void)
+diff -urp libvirt-5.1.0.orig/tests/qemuxml2argvtest.c libvirt-5.1.0/tests/qemuxml2argvtest.c
+--- libvirt-5.1.0.orig/tests/qemuxml2argvtest.c        2019-03-23 11:37:08.378000000 +0100
++++ libvirt-5.1.0/tests/qemuxml2argvtest.c     2019-03-23 11:37:35.456000000 +0100
+@@ -1212,7 +1212,7 @@ mymain(void)
  
      driver.config->vncSASL = 1;
      VIR_FREE(driver.config->vncSASLdir);
@@ -224,7 +206,7 @@ diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvtest.c libvirt-4.5.0/tests/qemuxm
      DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->vncTLS = 1;
      driver.config->vncTLSx509verify = 1;
-@@ -1210,7 +1210,7 @@ mymain(void)
+@@ -1244,7 +1244,7 @@ mymain(void)
      DO_TEST("graphics-spice-no-args",
              QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->spiceSASL = 1;
@@ -233,9 +215,9 @@ diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvtest.c libvirt-4.5.0/tests/qemuxm
      DO_TEST("graphics-spice-sasl",
              QEMU_CAPS_SPICE,
              QEMU_CAPS_DEVICE_QXL);
-diff -urp libvirt-4.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.5.0/tests/virconfdata/libvirtd.conf
---- libvirt-4.5.0.orig/tests/virconfdata/libvirtd.conf 2018-07-09 16:24:49.818875564 +0000
-+++ libvirt-4.5.0/tests/virconfdata/libvirtd.conf      2018-07-09 16:25:07.313874521 +0000
+diff -urp libvirt-5.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.1.0/tests/virconfdata/libvirtd.conf
+--- libvirt-5.1.0.orig/tests/virconfdata/libvirtd.conf 2019-03-23 11:37:09.290000000 +0100
++++ libvirt-5.1.0/tests/virconfdata/libvirtd.conf      2019-03-23 11:37:35.456000000 +0100
 @@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -254,9 +236,9 @@ diff -urp libvirt-4.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.5.0/tests
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -urp libvirt-4.5.0.orig/tests/virconfdata/libvirtd.out libvirt-4.5.0/tests/virconfdata/libvirtd.out
---- libvirt-4.5.0.orig/tests/virconfdata/libvirtd.out  2018-07-09 16:24:49.818875564 +0000
-+++ libvirt-4.5.0/tests/virconfdata/libvirtd.out       2018-07-09 16:25:07.313874521 +0000
+diff -urp libvirt-5.1.0.orig/tests/virconfdata/libvirtd.out libvirt-5.1.0/tests/virconfdata/libvirtd.out
+--- libvirt-5.1.0.orig/tests/virconfdata/libvirtd.out  2019-03-23 11:37:09.290000000 +0100
++++ libvirt-5.1.0/tests/virconfdata/libvirtd.out       2019-03-23 11:37:35.456000000 +0100
 @@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700"
  #          the network providing auth (eg, TLS/x509 certificates)
  #
Toolkit to interact with virtualization capabilities