- updated to 5.1.0

diff --git a/bashisms.patch b/bashisms.patch
index 4dc6dbe7354b21457edfcdedffcc34a925c14690..7b34d3c4e9c156a7bbed98766fa2d9cfe2ae6321 100644 (file)
--- a/bashisms.patch
+++ b/bashisms.patch
@@ -1,15 +1,15 @@
-diff -urp libvirt-3.0.0.orig/src/locking/virtlockd.init.in libvirt-3.0.0/src/locking/virtlockd.init.in
---- libvirt-3.0.0.orig/src/locking/virtlockd.init.in   2017-02-11 16:02:11.117361199 +0000
-+++ libvirt-3.0.0/src/locking/virtlockd.init.in        2017-02-11 16:02:28.856360999 +0000
+diff -urp libvirt-5.1.0.orig/src/locking/virtlockd.init.in libvirt-5.1.0/src/locking/virtlockd.init.in
+--- libvirt-5.1.0.orig/src/locking/virtlockd.init.in   2019-03-23 11:50:28.414000000 +0100
++++ libvirt-5.1.0/src/locking/virtlockd.init.in        2019-03-23 11:50:53.670000000 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  
  # the following is the LSB init header see
  # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html
-diff -urp libvirt-3.0.0.orig/tools/libvirt-guests.sh.in libvirt-3.0.0/tools/libvirt-guests.sh.in
---- libvirt-3.0.0.orig/tools/libvirt-guests.sh.in      2017-02-11 16:02:11.138361199 +0000
-+++ libvirt-3.0.0/tools/libvirt-guests.sh.in   2017-02-11 16:02:28.857360999 +0000
+diff -urp libvirt-5.1.0.orig/tools/libvirt-guests.sh.in libvirt-5.1.0/tools/libvirt-guests.sh.in
+--- libvirt-5.1.0.orig/tools/libvirt-guests.sh.in      2019-03-23 11:50:28.435000000 +0100
++++ libvirt-5.1.0/tools/libvirt-guests.sh.in   2019-03-23 11:50:53.671000000 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash

diff --git a/libvirt-guests.init.patch b/libvirt-guests.init.patch
index 596bac618e4faaec1eb70c719f6c3f881fd26f1b..c7e53c28ebc9f446586e52f906ad5f594597efc7 100644 (file)
--- a/libvirt-guests.init.patch
+++ b/libvirt-guests.init.patch
@@ -1,6 +1,6 @@
-diff -urp libvirt-3.0.0.orig/tools/libvirt-guests.init.in libvirt-3.0.0/tools/libvirt-guests.init.in
---- libvirt-3.0.0.orig/tools/libvirt-guests.init.in    2017-02-11 16:02:42.551360845 +0000
-+++ libvirt-3.0.0/tools/libvirt-guests.init.in 2017-02-11 16:03:05.756360584 +0000
+diff -urp libvirt-5.1.0.orig/tools/libvirt-guests.init.in libvirt-5.1.0/tools/libvirt-guests.init.in
+--- libvirt-5.1.0.orig/tools/libvirt-guests.init.in    2019-03-23 11:51:07.699000000 +0100
++++ libvirt-5.1.0/tools/libvirt-guests.init.in 2019-03-23 11:51:31.901000000 +0100
 @@ -28,3 +28,6 @@
  #
  

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index e05d5dfa4aa1ddad0383852ab5edd3daff439894..c31da453600910c9ad34df44c1de47531008e47f 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-4.5.0.orig/src/qemu/qemu_command.c libvirt-4.5.0/src/qemu/qemu_command.c
---- libvirt-4.5.0.orig/src/qemu/qemu_command.c 2018-07-09 16:27:53.841864595 +0000
-+++ libvirt-4.5.0/src/qemu/qemu_command.c      2018-07-09 16:28:11.860863521 +0000
-@@ -7859,6 +7859,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+diff -urp libvirt-5.1.0.orig/src/qemu/qemu_command.c libvirt-5.1.0/src/qemu/qemu_command.c
+--- libvirt-5.1.0.orig/src/qemu/qemu_command.c 2019-03-23 11:41:18.269000000 +0100
++++ libvirt-5.1.0/src/qemu/qemu_command.c      2019-03-23 11:41:44.602000000 +0100
+@@ -8155,6 +8155,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,10 +12,10 @@ diff -urp libvirt-4.5.0.orig/src/qemu/qemu_command.c libvirt-4.5.0/src/qemu/qemu
      }
  
      virCommandAddArg(cmd, "-vnc");
-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:27:53.844864595 +0000
-+++ libvirt-4.5.0/src/qemu/qemu.conf   2018-07-09 16:28:11.861863521 +0000
-@@ -135,6 +135,15 @@
+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:41:18.271000000 +0100
++++ libvirt-5.1.0/src/qemu/qemu.conf   2019-03-23 11:41:44.602000000 +0100
+@@ -141,6 +141,15 @@
  #vnc_sasl = 1
  
  
@@ -31,26 +31,26 @@ diff -urp libvirt-4.5.0.orig/src/qemu/qemu.conf libvirt-4.5.0/src/qemu/qemu.conf
  # The default SASL configuration file is located in /etc/sasl/
  # When running libvirtd unprivileged, it may be desirable to
  # override the configs in this location. Set this parameter to
-diff -urp libvirt-4.5.0.orig/src/qemu/qemu_conf.c libvirt-4.5.0/src/qemu/qemu_conf.c
---- libvirt-4.5.0.orig/src/qemu/qemu_conf.c    2018-07-09 16:27:53.842864595 +0000
-+++ libvirt-4.5.0/src/qemu/qemu_conf.c 2018-07-09 16:28:11.861863521 +0000
-@@ -555,6 +555,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
-         goto cleanup;
-     if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
-         goto cleanup;
+diff -urp libvirt-5.1.0.orig/src/qemu/qemu_conf.c libvirt-5.1.0/src/qemu/qemu_conf.c
+--- libvirt-5.1.0.orig/src/qemu/qemu_conf.c    2019-03-23 11:41:18.270000000 +0100
++++ libvirt-5.1.0/src/qemu/qemu_conf.c 2019-03-23 11:47:01.904000000 +0100
+@@ -471,6 +471,8 @@ virQEMUDriverConfigLoadVNCEntry(virQEMUD
+         return -1;
+     if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
+         return -1;
 +    if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0)
-+        goto cleanup;
++        return -1;
  
- 
-     if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
-diff -urp libvirt-4.5.0.orig/src/qemu/qemu_conf.h libvirt-4.5.0/src/qemu/qemu_conf.h
---- libvirt-4.5.0.orig/src/qemu/qemu_conf.h    2018-07-09 16:27:53.842864595 +0000
-+++ libvirt-4.5.0/src/qemu/qemu_conf.h 2018-07-09 16:28:11.861863521 +0000
+     return 0;
+ }
+diff -urp libvirt-5.1.0.orig/src/qemu/qemu_conf.h libvirt-5.1.0/src/qemu/qemu_conf.h
+--- libvirt-5.1.0.orig/src/qemu/qemu_conf.h    2019-03-23 11:41:18.270000000 +0100
++++ libvirt-5.1.0/src/qemu/qemu_conf.h 2019-03-23 11:41:44.603000000 +0100
 @@ -124,6 +124,7 @@ struct _virQEMUDriverConfig {
-     bool vncTLS;
      bool vncTLSx509verify;
+     bool vncTLSx509verifyPresent;
      bool vncSASL;
 +    bool vncACL;
      char *vncTLSx509certdir;
+     char *vncTLSx509secretUUID;
      char *vncListen;
-     char *vncPassword;

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)
  #

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index 4834b1441bef78794d86f12b53de5f6f2984581a..bf8fd3955374934a513487efb4e4fc54c18a81aa 100644 (file)
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,38 +1,24 @@
-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:30:47.099854268 +0000
-+++ libvirt-4.5.0/src/Makefile.in      2018-07-09 16:31:05.422853176 +0000
-@@ -13125,13 +13125,11 @@ 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:51:54.916000000 +0100
++++ libvirt-5.1.0/src/Makefile.in      2019-03-23 11:54:04.581000000 +0100
+@@ -6219,7 +6219,7 @@ REMOTE_DRIVER_PROTOCOL = \
+ 
  # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
  # /usr/lib/sysctl.d/ even when libdir is /usr/lib64
- @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@install-sysctl:
--@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@        $(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d
- @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@        $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sysctl \
--@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@          $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
-+@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@          $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
- 
- @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@uninstall-sysctl:
--@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@        rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
--@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@        rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || :
-+@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@        rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
- @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_FALSE@install-sysctl:
- @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_FALSE@uninstall-sysctl:
- 
-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:30:47.115854267 +0000
-+++ libvirt-4.5.0/src/remote/Makefile.inc.am   2018-07-09 16:31:05.423853176 +0000
-@@ -199,13 +199,11 @@ if WITH_SYSCTL
+-@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@sysctldir = $(prefix)/lib/sysctl.d
++@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@sysctldir = $(sysconfdir)/sysctl.d
+ @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@polkitdir = $(datadir)/polkit-1
+ @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@polkitactionsdir = $(polkitdir)/actions
+ @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@polkitrulesdir = $(polkitdir)/rules.d
+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:51:54.904000000 +0100
++++ libvirt-5.1.0/src/remote/Makefile.inc.am   2019-03-23 11:55:06.720000000 +0100
+@@ -193,7 +193,7 @@ check-augeas-remote: test_libvirtd.aug
+ if WITH_SYSCTL
  # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
  # /usr/lib/sysctl.d/ even when libdir is /usr/lib64
- install-sysctl:
--      $(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d
-       $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sysctl \
--        $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
-+        $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
+-sysctldir = $(prefix)/lib/sysctl.d
++sysctldir = $(sysconfdir)/sysctl.d
  
- uninstall-sysctl:
--      rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
--      rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || :
-+      rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
- else ! WITH_SYSCTL
  install-sysctl:
- uninstall-sysctl:
+       $(MKDIR_P) $(DESTDIR)$(sysctldir)

diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch
index e48dcdd88b314213a25b8f850c532679439994d7..85f955a24aa89a8a1efbb56c2d4f2b1e60310fda 100644 (file)
--- a/libvirt-udevadm-settle.patch
+++ b/libvirt-udevadm-settle.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-4.5.0.orig/src/util/virutil.c libvirt-4.5.0/src/util/virutil.c
---- libvirt-4.5.0.orig/src/util/virutil.c      2018-07-09 16:29:11.910859942 +0000
-+++ libvirt-4.5.0/src/util/virutil.c   2018-07-09 16:29:30.389858840 +0000
-@@ -1598,7 +1598,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gi
+diff -urp libvirt-5.1.0.orig/src/util/virutil.c libvirt-5.1.0/src/util/virutil.c
+--- libvirt-5.1.0.orig/src/util/virutil.c      2019-03-23 11:49:17.807000000 +0100
++++ libvirt-5.1.0/src/util/virutil.c   2019-03-23 11:49:42.522000000 +0100
+@@ -1655,7 +1655,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gi
  void virWaitForDevices(void)
  {
  # ifdef UDEVADM

diff --git a/libvirt.spec b/libvirt.spec
index 0a7d72652de4b951a753a0d6d6c69f643527998b..7b7de1733868508d04d71f0e18d12e35f675b9a3 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -11,7 +11,6 @@
 %bcond_without openvz          # OpenVZ support
 %bcond_without phyp            # PHYP support
 %bcond_without qemu            # Qemu support
-%bcond_without uml             # UML support
 %bcond_without vbox            # VirtualBox support
 %bcond_without vmware          # VMware Workstation/Player support
 %bcond_without xenapi          # Xen API (Citrix XenServer) support
@@ -41,12 +40,12 @@
 Summary:       Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):     Narzędzia współpracujące z funkcjami wirtualizacji
 Name:          libvirt
-Version:       4.10.0
+Version:       5.1.0
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5: f85067e830bd89db08b7b7ffa75db6ef
+# Source0-md5: 74c6c2e90ca9c94d9255eec338615a0c
 Source1:       libvirtd.init
 Source2:       virtlockd.init
 Source3:       virtlogd.init
@@ -120,6 +119,7 @@ Obsoletes:  libvirt-daemon-esx
 Obsoletes:     libvirt-daemon-hyperv
 Obsoletes:     libvirt-daemon-openvz
 Obsoletes:     libvirt-daemon-phyp
+Obsoletes:     libvirt-daemon-uml
 Obsoletes:     libvirt-daemon-vbox
 Obsoletes:     libvirt-daemon-vmware
 Obsoletes:     libvirt-daemon-xen
@@ -358,21 +358,6 @@ of the QEMU emulators.
 Sterownik wymagany po stronie serwera do zarządzania funkcjami
 wirtualizacji emulatora QEMU.
 
-%package daemon-uml
-Summary:       Server side driver required to run UML guests
-Summary(pl.UTF-8):     Sterownik wymagany po stronie serwera do uruchamiania gości UML
-Group:         Libraries
-Requires:      %{name}-daemon = %{version}-%{release}
-Provides:      libvirt(hypervisor)
-
-%description daemon-uml
-Server side driver required to manage the virtualization capabilities
-of UML.
-
-%description daemon-uml -l pl.UTF-8
-Sterownik wymagany po stronie serwera do zarządzania funkcjami
-wirtualizacji UML.
-
 %package client
 Summary:       Client side utilities of the libvirt library
 Summary(pl.UTF-8):     Narzędzia klienckie do biblioteki libvirt
@@ -401,7 +386,6 @@ Requires:   %{name}-daemon = %{version}-%{release}
 %{?with_libxl:Requires:        %{name}-daemon-libxl = %{version}-%{release}}
 Requires:      %{name}-daemon-lxc = %{version}-%{release}
 Requires:      %{name}-daemon-qemu = %{version}-%{release}
-%{?with_uml:Requires:  %{name}-daemon-uml = %{version}-%{release}}
 
 %description utils
 Libvirt is a C toolkit to interact with the virtualization
@@ -536,7 +520,6 @@ Moduł sekcji Wiresharka do pakietów libvirt.
        --with-sasl \
        --with-selinux \
        --with-udev \
-       %{__with_without uml} \
        %{__with_without vbox vbox %{_libdir}/VirtualBox} \
        --with-virtualport \
        %{__with_without vmware} \
@@ -572,8 +555,8 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlogd
        %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.a}
 %endif
 %if %{with wireshark}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la \
-       %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.a} \
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/epan/libvirt.la \
+       %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/epan/libvirt.a} \
 %endif
 
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale/{bal,ilo,kw@kkcor,kw@uccor,kw_GB,tw,wba}
@@ -819,16 +802,6 @@ fi
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_qemu.so
 %endif
 
-%if %{with uml}
-%files daemon-uml
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_uml.so
-%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.uml
-%attr(700,root,root) %dir /var/lib/libvirt/uml
-%attr(700,root,root) %dir /var/run/libvirt/uml
-%attr(700,root,root) %dir /var/log/libvirt/uml
-%endif
-
 %files client
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/libvirt-guests
@@ -883,5 +856,5 @@ fi
 %if %{with wireshark}
 %files -n wireshark-libvirt
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/wireshark/plugins/*/libvirt.so
+%attr(755,root,root) %{_libdir}/wireshark/plugins/*/epan/libvirt.so
 %endif