]> 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 4.5.0
[packages/libvirt.git] / libvirt-sasl.patch
diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 94c0698da640bd55a2b383c61d39f8cb733a6cfb..0a8ad520ecf42b6db4ce6cd98c714c3e78059cb2 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,6 +1,6 @@
-diff -urp libvirt-4.2.0.orig/docs/auth.html libvirt-4.2.0/docs/auth.html
---- libvirt-4.2.0.orig/docs/auth.html  2018-04-12 12:41:58.327580941 +0000
-+++ libvirt-4.2.0/docs/auth.html       2018-04-12 12:42:15.267580750 +0000
+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.
          <p>
  Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
@@ -10,9 +10,9 @@ diff -urp libvirt-4.2.0.orig/docs/auth.html libvirt-4.2.0/docs/auth.html
  parameter to <code>scram-sha-1</code>.
      </p>
          <p>
-diff -urp libvirt-4.2.0.orig/docs/auth.html.in libvirt-4.2.0/docs/auth.html.in
---- libvirt-4.2.0.orig/docs/auth.html.in       2018-04-12 12:41:58.331580941 +0000
-+++ libvirt-4.2.0/docs/auth.html.in    2018-04-12 12:42:15.268580750 +0000
+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.
      <p>
  Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
@@ -22,34 +22,10 @@ diff -urp libvirt-4.2.0.orig/docs/auth.html.in libvirt-4.2.0/docs/auth.html.in
  parameter to <code>scram-sha-1</code>.
      </p>
      <p>
-diff -urp libvirt-4.2.0.orig/libvirt.spec libvirt-4.2.0/libvirt.spec
---- libvirt-4.2.0.orig/libvirt.spec    2018-04-12 12:41:58.347580941 +0000
-+++ libvirt-4.2.0/libvirt.spec 2018-04-12 12:42:15.268580750 +0000
-@@ -2124,7 +2124,7 @@ exit 0
- 
- %{_datadir}/libvirt/test-screenshot.png
- 
--%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
-+%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
- 
- %files admin
- %{_mandir}/man1/virt-admin.1*
-diff -urp libvirt-4.2.0.orig/libvirt.spec.in libvirt-4.2.0/libvirt.spec.in
---- libvirt-4.2.0.orig/libvirt.spec.in 2018-04-12 12:41:58.346580941 +0000
-+++ libvirt-4.2.0/libvirt.spec.in      2018-04-12 12:42:15.268580750 +0000
-@@ -2124,7 +2124,7 @@ exit 0
- 
- %{_datadir}/libvirt/test-screenshot.png
- 
--%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
-+%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
- 
- %files admin
- %{_mandir}/man1/virt-admin.1*
-diff -urp libvirt-4.2.0.orig/src/Makefile.in libvirt-4.2.0/src/Makefile.in
---- libvirt-4.2.0.orig/src/Makefile.in 2018-04-12 12:41:58.401580940 +0000
-+++ libvirt-4.2.0/src/Makefile.in      2018-04-12 12:42:15.272580750 +0000
-@@ -13098,13 +13098,13 @@ lxc/lxc_controller_dispatch.h: $(srcdir)
+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)
  # This is needed for clients too, so can't wrap in
  # the WITH_LIBVIRTD conditional
  @WITH_SASL_TRUE@install-sasl:
@@ -67,9 +43,9 @@ diff -urp libvirt-4.2.0.orig/src/Makefile.in libvirt-4.2.0/src/Makefile.in
  @WITH_SASL_FALSE@install-sasl:
  @WITH_SASL_FALSE@uninstall-sasl:
  
-diff -urp libvirt-4.2.0.orig/src/qemu/qemu.conf libvirt-4.2.0/src/qemu/qemu.conf
---- libvirt-4.2.0.orig/src/qemu/qemu.conf      2018-04-12 12:41:58.380580940 +0000
-+++ libvirt-4.2.0/src/qemu/qemu.conf   2018-04-12 12:42:15.272580750 +0000
+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 @@
  # Examples include vinagre, virt-viewer and virt-manager
  # itself. UltraVNC, RealVNC, TightVNC do not support this
@@ -113,9 +89,9 @@ diff -urp libvirt-4.2.0.orig/src/qemu/qemu.conf libvirt-4.2.0/src/qemu/qemu.conf
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-diff -urp libvirt-4.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.2.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-4.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2018-04-12 12:41:58.380580940 +0000
-+++ libvirt-4.2.0/src/qemu/test_libvirtd_qemu.aug.in   2018-04-12 12:42:15.273580750 +0000
+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 =
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
@@ -134,9 +110,9 @@ diff -urp libvirt-4.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.2.0/sr
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-diff -urp libvirt-4.2.0.orig/src/remote/libvirtd.conf libvirt-4.2.0/src/remote/libvirtd.conf
---- libvirt-4.2.0.orig/src/remote/libvirtd.conf        2018-04-12 12:41:58.382580940 +0000
-+++ libvirt-4.2.0/src/remote/libvirtd.conf     2018-04-12 12:42:15.273580750 +0000
+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
 @@ -123,7 +123,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -155,10 +131,10 @@ diff -urp libvirt-4.2.0.orig/src/remote/libvirtd.conf libvirt-4.2.0/src/remote/l
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -urp libvirt-4.2.0.orig/src/remote/Makefile.inc.am libvirt-4.2.0/src/remote/Makefile.inc.am
---- libvirt-4.2.0.orig/src/remote/Makefile.inc.am      2018-04-12 12:41:58.380580940 +0000
-+++ libvirt-4.2.0/src/remote/Makefile.inc.am   2018-04-12 12:43:43.861579753 +0000
-@@ -243,13 +243,13 @@ endif ! WITH_LIBVIRTD
+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
  # the WITH_LIBVIRTD conditional
  if WITH_SASL
  install-sasl:
@@ -176,9 +152,9 @@ diff -urp libvirt-4.2.0.orig/src/remote/Makefile.inc.am libvirt-4.2.0/src/remote
  else ! WITH_SASL
  install-sasl:
  uninstall-sasl:
-diff -urp libvirt-4.2.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-4.2.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
---- libvirt-4.2.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args   2018-04-12 12:41:58.691580937 +0000
-+++ libvirt-4.2.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args        2018-04-12 12:42:15.273580750 +0000
+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
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -188,9 +164,9 @@ diff -urp libvirt-4.2.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvi
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-4.2.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-4.2.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
---- libvirt-4.2.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args    2018-04-12 12:41:58.691580937 +0000
-+++ libvirt-4.2.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-04-12 12:42:15.273580750 +0000
+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
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -200,9 +176,9 @@ diff -urp libvirt-4.2.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvir
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-4.2.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-04-12 12:41:58.722580936 +0000
-+++ libvirt-4.2.0/tests/qemuxml2argvdata/graphics-spice-sasl.args      2018-04-12 12:42:15.273580750 +0000
+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
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -212,9 +188,9 @@ diff -urp libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args lib
  QEMU_AUDIO_DRV=spice \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-4.2.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args   2018-04-12 12:41:58.722580936 +0000
-+++ libvirt-4.2.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args        2018-04-12 12:42:15.273580750 +0000
+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
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -224,9 +200,9 @@ diff -urp libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvi
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-4.2.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args    2018-04-12 12:41:58.722580936 +0000
-+++ libvirt-4.2.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-04-12 12:42:15.273580750 +0000
+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
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -236,10 +212,10 @@ diff -urp libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvir
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-4.2.0.orig/tests/qemuxml2argvtest.c libvirt-4.2.0/tests/qemuxml2argvtest.c
---- libvirt-4.2.0.orig/tests/qemuxml2argvtest.c        2018-04-12 12:41:58.410580940 +0000
-+++ libvirt-4.2.0/tests/qemuxml2argvtest.c     2018-04-12 12:42:15.274580750 +0000
-@@ -1098,7 +1098,7 @@ mymain(void)
+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)
  
      driver.config->vncSASL = 1;
      VIR_FREE(driver.config->vncSASLdir);
@@ -248,7 +224,7 @@ diff -urp libvirt-4.2.0.orig/tests/qemuxml2argvtest.c libvirt-4.2.0/tests/qemuxm
      DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->vncTLS = 1;
      driver.config->vncTLSx509verify = 1;
-@@ -1122,7 +1122,7 @@ mymain(void)
+@@ -1210,7 +1210,7 @@ mymain(void)
      DO_TEST("graphics-spice-no-args",
              QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->spiceSASL = 1;
@@ -257,9 +233,9 @@ diff -urp libvirt-4.2.0.orig/tests/qemuxml2argvtest.c libvirt-4.2.0/tests/qemuxm
      DO_TEST("graphics-spice-sasl",
              QEMU_CAPS_SPICE,
              QEMU_CAPS_DEVICE_QXL);
-diff -urp libvirt-4.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.2.0/tests/virconfdata/libvirtd.conf
---- libvirt-4.2.0.orig/tests/virconfdata/libvirtd.conf 2018-04-12 12:41:58.827580935 +0000
-+++ libvirt-4.2.0/tests/virconfdata/libvirtd.conf      2018-04-12 12:42:15.274580750 +0000
+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
 @@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -278,9 +254,9 @@ diff -urp libvirt-4.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.2.0/tests
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -urp libvirt-4.2.0.orig/tests/virconfdata/libvirtd.out libvirt-4.2.0/tests/virconfdata/libvirtd.out
---- libvirt-4.2.0.orig/tests/virconfdata/libvirtd.out  2018-04-12 12:41:58.827580935 +0000
-+++ libvirt-4.2.0/tests/virconfdata/libvirtd.out       2018-04-12 12:42:15.274580750 +0000
+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
 @@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700"
  #          the network providing auth (eg, TLS/x509 certificates)
  #
Toolkit to interact with virtualization capabilities