X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-sasl.patch;h=7823a6085f5e1ea67065e608dbf5aeac867599bf;hp=d9f1675c6ccb66c3d5fd6feb9b4bb4c13be97191;hb=270ab3676a03a7dea28909130a6edfc9a8c68651;hpb=10fd93515eee97f296ed51ae7ab63490f05d2f50

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index d9f1675..7823a60 100644
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,6 +1,6 @@
-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
+diff -urp libvirt-1.3.3.orig/daemon/libvirtd.conf libvirt-1.3.3/daemon/libvirtd.conf
+--- libvirt-1.3.3.orig/daemon/libvirtd.conf	2016-04-14 10:15:59.438170000 +0000
++++ libvirt-1.3.3/daemon/libvirtd.conf	2016-04-14 10:16:21.849170000 +0000
 @@ -128,7 +128,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -19,9 +19,9 @@ diff -urp libvirt-1.3.2.orig/daemon/libvirtd.conf libvirt-1.3.2/daemon/libvirtd.
  #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
+diff -urp libvirt-1.3.3.orig/daemon/Makefile.am libvirt-1.3.3/daemon/Makefile.am
+--- libvirt-1.3.3.orig/daemon/Makefile.am	2016-04-14 10:15:59.438170000 +0000
++++ libvirt-1.3.3/daemon/Makefile.am	2016-04-14 10:16:21.849170000 +0000
 @@ -521,13 +521,13 @@ $(srcdir)/libvirtd.8.in: libvirtd.pod.in
  # the WITH_LIBVIRTD conditional
  if WITH_SASL
@@ -40,9 +40,9 @@ diff -urp libvirt-1.3.2.orig/daemon/Makefile.am libvirt-1.3.2/daemon/Makefile.am
  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
+diff -urp libvirt-1.3.3.orig/daemon/Makefile.in libvirt-1.3.3/daemon/Makefile.in
+--- libvirt-1.3.3.orig/daemon/Makefile.in	2016-04-14 10:15:59.436170000 +0000
++++ libvirt-1.3.3/daemon/Makefile.in	2016-04-14 10:16:21.852170000 +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
@@ -61,10 +61,10 @@ diff -urp libvirt-1.3.2.orig/daemon/Makefile.in libvirt-1.3.2/daemon/Makefile.in
  @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:
+diff -urp libvirt-1.3.3.orig/docs/auth.html libvirt-1.3.3/docs/auth.html
+--- libvirt-1.3.3.orig/docs/auth.html	2016-04-14 10:15:59.421170000 +0000
++++ libvirt-1.3.3/docs/auth.html	2016-04-14 10:16:21.852170000 +0000
+@@ -404,7 +404,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,
@@ -73,9 +73,9 @@ diff -urp libvirt-1.3.2.orig/docs/auth.html libvirt-1.3.2/docs/auth.html
  The <code>mech_list</code> parameter must first be changed to <code>gssapi</code>
  instead of the default <code>digest-md5</code>, and keytab should be set to
  <code>/etc/libvirt/krb5.tab</code> . 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
+diff -urp libvirt-1.3.3.orig/docs/auth.html.in libvirt-1.3.3/docs/auth.html.in
+--- libvirt-1.3.3.orig/docs/auth.html.in	2016-04-14 10:15:59.414170000 +0000
++++ libvirt-1.3.3/docs/auth.html.in	2016-04-14 10:16:21.853170000 +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
@@ -85,10 +85,10 @@ diff -urp libvirt-1.3.2.orig/docs/auth.html.in libvirt-1.3.2/docs/auth.html.in
  The <code>mech_list</code> parameter must first be changed to <code>gssapi</code>
  instead of the default <code>digest-md5</code>, and keytab should be set to
  <code>/etc/libvirt/krb5.tab</code> . 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
+diff -urp libvirt-1.3.3.orig/libvirt.spec libvirt-1.3.3/libvirt.spec
+--- libvirt-1.3.3.orig/libvirt.spec	2016-04-14 10:15:59.436170000 +0000
++++ libvirt-1.3.3/libvirt.spec	2016-04-14 10:16:21.860170000 +0000
+@@ -2332,7 +2332,7 @@ exit 0
  %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/
  
  %if %{with_sasl}
@@ -97,10 +97,10 @@ diff -urp libvirt-1.3.2.orig/libvirt.spec libvirt-1.3.2/libvirt.spec
  %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
+diff -urp libvirt-1.3.3.orig/libvirt.spec.in libvirt-1.3.3/libvirt.spec.in
+--- libvirt-1.3.3.orig/libvirt.spec.in	2016-04-14 10:16:00.591170000 +0000
++++ libvirt-1.3.3/libvirt.spec.in	2016-04-14 10:16:21.872170000 +0000
+@@ -2332,7 +2332,7 @@ exit 0
  %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/
  
  %if %{with_sasl}
@@ -109,9 +109,9 @@ diff -urp libvirt-1.3.2.orig/libvirt.spec.in libvirt-1.3.2/libvirt.spec.in
  %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
+diff -urp libvirt-1.3.3.orig/src/qemu/qemu.conf libvirt-1.3.3/src/qemu/qemu.conf
+--- libvirt-1.3.3.orig/src/qemu/qemu.conf	2016-04-14 10:16:00.616170000 +0000
++++ libvirt-1.3.3/src/qemu/qemu.conf	2016-04-14 10:16:21.872170000 +0000
 @@ -74,18 +74,18 @@
  # Examples include vinagre, virt-viewer and virt-manager
  # itself. UltraVNC, RealVNC, TightVNC do not support this
@@ -155,9 +155,9 @@ diff -urp libvirt-1.3.2.orig/src/qemu/qemu.conf libvirt-1.3.2/src/qemu/qemu.conf
  
  
  # 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
+diff -urp libvirt-1.3.3.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-1.3.3/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-1.3.3.orig/src/qemu/test_libvirtd_qemu.aug.in	2016-04-14 10:16:00.617170000 +0000
++++ libvirt-1.3.3/src/qemu/test_libvirtd_qemu.aug.in	2016-04-14 10:16:21.872170000 +0000
 @@ -9,14 +9,14 @@ module Test_libvirtd_qemu =
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
@@ -175,9 +175,9 @@ diff -urp libvirt-1.3.2.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-1.3.2/sr
  { "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
+diff -urp libvirt-1.3.3.orig/tests/confdata/libvirtd.conf libvirt-1.3.3/tests/confdata/libvirtd.conf
+--- libvirt-1.3.3.orig/tests/confdata/libvirtd.conf	2016-04-14 10:16:00.575170000 +0000
++++ libvirt-1.3.3/tests/confdata/libvirtd.conf	2016-04-14 10:16:21.872170000 +0000
 @@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -196,9 +196,9 @@ 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
+diff -urp libvirt-1.3.3.orig/tests/confdata/libvirtd.out libvirt-1.3.3/tests/confdata/libvirtd.out
+--- libvirt-1.3.3.orig/tests/confdata/libvirtd.out	2016-04-14 10:16:00.575170000 +0000
++++ libvirt-1.3.3/tests/confdata/libvirtd.out	2016-04-14 10:16:21.872170000 +0000
 @@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700"
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -217,9 +217,9 @@ 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
+diff -urp libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args
+--- libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args	2016-04-14 10:15:59.729170000 +0000
++++ libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args	2016-04-14 10:16:21.873170000 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -229,9 +229,9 @@ diff -urp libvirt-1.3.2.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sa
  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
+diff -urp libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args
+--- libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args	2016-04-14 10:15:59.730170000 +0000
++++ libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args	2016-04-14 10:16:21.873170000 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -241,9 +241,9 @@ diff -urp libvirt-1.3.2.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tl
  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
+diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
+--- libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args	2016-04-14 10:15:59.691170000 +0000
++++ libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args	2016-04-14 10:16:21.873170000 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -253,9 +253,9 @@ diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-
  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
+diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
+--- libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args	2016-04-14 10:15:59.692170000 +0000
++++ libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args	2016-04-14 10:16:21.874170000 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -265,9 +265,9 @@ diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sa
  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
+diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
+--- libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args	2016-04-14 10:15:59.672170000 +0000
++++ libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args	2016-04-14 10:16:21.874170000 +0000
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -277,10 +277,10 @@ diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tl
  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)
+diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvtest.c libvirt-1.3.3/tests/qemuxml2argvtest.c
+--- libvirt-1.3.3.orig/tests/qemuxml2argvtest.c	2016-04-14 10:15:59.666170000 +0000
++++ libvirt-1.3.3/tests/qemuxml2argvtest.c	2016-04-14 10:16:21.875170000 +0000
+@@ -897,7 +897,7 @@ mymain(void)
  
      driver.config->vncSASL = 1;
      VIR_FREE(driver.config->vncSASLdir);
@@ -289,9 +289,9 @@ diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvtest.c libvirt-1.3.2/tests/qemuxm
      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);
+@@ -919,7 +919,7 @@ mymain(void)
+     DO_TEST("graphics-spice-no-args",
+             QEMU_CAPS_SPICE);
      driver.config->spiceSASL = 1;
 -    ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl2"));
 +    ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl"));