- updateed to 5.4.0

diff --git a/bashisms.patch b/bashisms.patch
index 964c2c55e03247af258826365759cdfb7d8aa1eb..92c129135c35f6fa8d866fb32cc0a2144879a831 100644 (file)
--- a/bashisms.patch
+++ b/bashisms.patch
@@ -1,6 +1,6 @@
-diff -urp libvirt-5.3.0.orig/tools/libvirt-guests.sh.in libvirt-5.3.0/tools/libvirt-guests.sh.in
---- libvirt-5.3.0.orig/tools/libvirt-guests.sh.in      2019-05-06 14:13:11.699000000 +0200
-+++ libvirt-5.3.0/tools/libvirt-guests.sh.in   2019-05-06 14:13:31.049000000 +0200
+diff -urp libvirt-5.4.0.orig/tools/libvirt-guests.sh.in libvirt-5.4.0/tools/libvirt-guests.sh.in
+--- libvirt-5.4.0.orig/tools/libvirt-guests.sh.in      2019-06-17 20:21:30.615000000 +0200
++++ libvirt-5.4.0/tools/libvirt-guests.sh.in   2019-06-17 20:21:46.981000000 +0200
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index d6d2c60bd342a9e7470db9c6ed93e98b803b160d..44b93a1439d4444d4b3cd111e0fe846ebfba249d 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-5.3.0.orig/src/qemu/qemu_command.c libvirt-5.3.0/src/qemu/qemu_command.c
---- libvirt-5.3.0.orig/src/qemu/qemu_command.c 2019-05-06 14:10:01.332000000 +0200
-+++ libvirt-5.3.0/src/qemu/qemu_command.c      2019-05-06 14:10:36.653000000 +0200
-@@ -8306,6 +8306,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+diff -urp libvirt-5.4.0.orig/src/qemu/qemu_command.c libvirt-5.4.0/src/qemu/qemu_command.c
+--- libvirt-5.4.0.orig/src/qemu/qemu_command.c 2019-06-17 20:19:15.321000000 +0200
++++ libvirt-5.4.0/src/qemu/qemu_command.c      2019-06-17 20:19:33.942000000 +0200
+@@ -8280,6 +8280,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,9 +12,9 @@ diff -urp libvirt-5.3.0.orig/src/qemu/qemu_command.c libvirt-5.3.0/src/qemu/qemu
      }
  
      virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-5.3.0.orig/src/qemu/qemu.conf libvirt-5.3.0/src/qemu/qemu.conf
---- libvirt-5.3.0.orig/src/qemu/qemu.conf      2019-05-06 14:10:01.334000000 +0200
-+++ libvirt-5.3.0/src/qemu/qemu.conf   2019-05-06 14:10:36.653000000 +0200
+diff -urp libvirt-5.4.0.orig/src/qemu/qemu.conf libvirt-5.4.0/src/qemu/qemu.conf
+--- libvirt-5.4.0.orig/src/qemu/qemu.conf      2019-06-17 20:19:15.325000000 +0200
++++ libvirt-5.4.0/src/qemu/qemu.conf   2019-06-17 20:19:33.943000000 +0200
 @@ -141,6 +141,15 @@
  #vnc_sasl = 1
  
@@ -31,9 +31,9 @@ diff -urp libvirt-5.3.0.orig/src/qemu/qemu.conf libvirt-5.3.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-5.3.0.orig/src/qemu/qemu_conf.c libvirt-5.3.0/src/qemu/qemu_conf.c
---- libvirt-5.3.0.orig/src/qemu/qemu_conf.c    2019-05-06 14:10:01.332000000 +0200
-+++ libvirt-5.3.0/src/qemu/qemu_conf.c 2019-05-06 14:10:36.654000000 +0200
+diff -urp libvirt-5.4.0.orig/src/qemu/qemu_conf.c libvirt-5.4.0/src/qemu/qemu_conf.c
+--- libvirt-5.4.0.orig/src/qemu/qemu_conf.c    2019-06-17 20:19:15.323000000 +0200
++++ libvirt-5.4.0/src/qemu/qemu_conf.c 2019-06-17 20:19:33.943000000 +0200
 @@ -471,6 +471,8 @@ virQEMUDriverConfigLoadVNCEntry(virQEMUD
          return -1;
      if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
@@ -43,9 +43,9 @@ diff -urp libvirt-5.3.0.orig/src/qemu/qemu_conf.c libvirt-5.3.0/src/qemu/qemu_co
  
      return 0;
  }
-diff -urp libvirt-5.3.0.orig/src/qemu/qemu_conf.h libvirt-5.3.0/src/qemu/qemu_conf.h
---- libvirt-5.3.0.orig/src/qemu/qemu_conf.h    2019-05-06 14:10:01.332000000 +0200
-+++ libvirt-5.3.0/src/qemu/qemu_conf.h 2019-05-06 14:10:36.654000000 +0200
+diff -urp libvirt-5.4.0.orig/src/qemu/qemu_conf.h libvirt-5.4.0/src/qemu/qemu_conf.h
+--- libvirt-5.4.0.orig/src/qemu/qemu_conf.h    2019-06-17 20:19:15.323000000 +0200
++++ libvirt-5.4.0/src/qemu/qemu_conf.h 2019-06-17 20:19:33.944000000 +0200
 @@ -124,6 +124,7 @@ struct _virQEMUDriverConfig {
      bool vncTLSx509verify;
      bool vncTLSx509verifyPresent;

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 58b86d89fddcffb51f98f87a6c4504e8a996bacc..f1f6e5f8848885e5689b15beb701b82cc1fb79ac 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,6 +1,6 @@
-diff -urp libvirt-5.3.0.orig/docs/auth.html libvirt-5.3.0/docs/auth.html
---- libvirt-5.3.0.orig/docs/auth.html  2019-04-27 12:38:48.466109972 +0200
-+++ libvirt-5.3.0/docs/auth.html       2019-05-06 14:07:53.494000000 +0200
+diff -urp libvirt-5.4.0.orig/docs/auth.html libvirt-5.4.0/docs/auth.html
+--- libvirt-5.4.0.orig/docs/auth.html  2019-06-17 20:17:53.120000000 +0200
++++ libvirt-5.4.0/docs/auth.html       2019-06-17 20:18:17.708000000 +0200
 @@ -318,7 +318,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-5.3.0.orig/docs/auth.html libvirt-5.3.0/docs/auth.html
  parameter to <code>scram-sha-1</code>.
      </p>
          <p>
-diff -urp libvirt-5.3.0.orig/docs/auth.html.in libvirt-5.3.0/docs/auth.html.in
---- libvirt-5.3.0.orig/docs/auth.html.in       2019-02-26 00:24:58.954183786 +0100
-+++ libvirt-5.3.0/docs/auth.html.in    2019-05-06 14:07:53.494000000 +0200
+diff -urp libvirt-5.4.0.orig/docs/auth.html.in libvirt-5.4.0/docs/auth.html.in
+--- libvirt-5.4.0.orig/docs/auth.html.in       2019-06-17 20:17:53.125000000 +0200
++++ libvirt-5.4.0/docs/auth.html.in    2019-06-17 20:18:17.709000000 +0200
 @@ -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
@@ -22,10 +22,10 @@ diff -urp libvirt-5.3.0.orig/docs/auth.html.in libvirt-5.3.0/docs/auth.html.in
  parameter to <code>scram-sha-1</code>.
      </p>
      <p>
-diff -urp libvirt-5.3.0.orig/src/Makefile.in libvirt-5.3.0/src/Makefile.in
---- libvirt-5.3.0.orig/src/Makefile.in 2019-05-04 19:53:42.037199636 +0200
-+++ libvirt-5.3.0/src/Makefile.in      2019-05-06 14:07:53.497000000 +0200
-@@ -6271,7 +6271,7 @@ REMOTE_DRIVER_PROTOCOL = \
+diff -urp libvirt-5.4.0.orig/src/Makefile.in libvirt-5.4.0/src/Makefile.in
+--- libvirt-5.4.0.orig/src/Makefile.in 2019-06-17 20:17:53.264000000 +0200
++++ libvirt-5.4.0/src/Makefile.in      2019-06-17 20:18:17.713000000 +0200
+@@ -6257,7 +6257,7 @@ REMOTE_DRIVER_PROTOCOL = \
  
  # This is needed for clients too, so can't wrap in
  # the WITH_LIBVIRTD conditional
@@ -34,9 +34,9 @@ diff -urp libvirt-5.3.0.orig/src/Makefile.in libvirt-5.3.0/src/Makefile.in
  THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD)
  SECDRIVER_CFLAGS = $(am__append_191) $(am__append_193)
  SECDRIVER_LIBS = $(am__append_192) $(am__append_194)
-diff -urp libvirt-5.3.0.orig/src/qemu/qemu.conf libvirt-5.3.0/src/qemu/qemu.conf
---- libvirt-5.3.0.orig/src/qemu/qemu.conf      2019-05-04 19:50:45.015543968 +0200
-+++ libvirt-5.3.0/src/qemu/qemu.conf   2019-05-06 14:07:53.498000000 +0200
+diff -urp libvirt-5.4.0.orig/src/qemu/qemu.conf libvirt-5.4.0/src/qemu/qemu.conf
+--- libvirt-5.4.0.orig/src/qemu/qemu.conf      2019-06-17 20:17:53.240000000 +0200
++++ libvirt-5.4.0/src/qemu/qemu.conf   2019-06-17 20:18:17.713000000 +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 -urp libvirt-5.3.0.orig/src/qemu/qemu.conf libvirt-5.3.0/src/qemu/qemu.conf
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-diff -urp libvirt-5.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.3.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-5.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2019-02-26 00:24:59.030183057 +0100
-+++ libvirt-5.3.0/src/qemu/test_libvirtd_qemu.aug.in   2019-05-06 14:07:53.498000000 +0200
+diff -urp libvirt-5.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.4.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-5.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2019-06-17 20:17:53.240000000 +0200
++++ libvirt-5.4.0/src/qemu/test_libvirtd_qemu.aug.in   2019-06-17 20:18:17.713000000 +0200
 @@ -13,7 +13,7 @@ module Test_libvirtd_qemu =
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
@@ -101,9 +101,9 @@ diff -urp libvirt-5.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.3.0/sr
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-diff -urp libvirt-5.3.0.orig/src/remote/libvirtd.conf libvirt-5.3.0/src/remote/libvirtd.conf
---- libvirt-5.3.0.orig/src/remote/libvirtd.conf        2019-04-27 12:31:34.943092025 +0200
-+++ libvirt-5.3.0/src/remote/libvirtd.conf     2019-05-06 14:07:53.498000000 +0200
+diff -urp libvirt-5.4.0.orig/src/remote/libvirtd.conf libvirt-5.4.0/src/remote/libvirtd.conf
+--- libvirt-5.4.0.orig/src/remote/libvirtd.conf        2019-06-17 20:17:53.242000000 +0200
++++ libvirt-5.4.0/src/remote/libvirtd.conf     2019-06-17 20:18:17.713000000 +0200
 @@ -123,7 +123,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -122,9 +122,9 @@ diff -urp libvirt-5.3.0.orig/src/remote/libvirtd.conf libvirt-5.3.0/src/remote/l
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -urp libvirt-5.3.0.orig/src/remote/Makefile.inc.am libvirt-5.3.0/src/remote/Makefile.inc.am
---- libvirt-5.3.0.orig/src/remote/Makefile.inc.am      2019-04-27 12:31:34.942092034 +0200
-+++ libvirt-5.3.0/src/remote/Makefile.inc.am   2019-05-06 14:07:53.498000000 +0200
+diff -urp libvirt-5.4.0.orig/src/remote/Makefile.inc.am libvirt-5.4.0/src/remote/Makefile.inc.am
+--- libvirt-5.4.0.orig/src/remote/Makefile.inc.am      2019-06-17 20:17:53.240000000 +0200
++++ libvirt-5.4.0/src/remote/Makefile.inc.am   2019-06-17 20:18:17.714000000 +0200
 @@ -244,7 +244,7 @@ endif WITH_LIBVIRTD
  # This is needed for clients too, so can't wrap in
  # the WITH_LIBVIRTD conditional
@@ -134,9 +134,9 @@ diff -urp libvirt-5.3.0.orig/src/remote/Makefile.inc.am libvirt-5.3.0/src/remote
  
  install-sasl:
        $(MKDIR_P) $(DESTDIR)$(sasldir)
-diff -urp libvirt-5.3.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-5.3.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
---- libvirt-5.3.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args   2018-01-12 15:48:37.072414510 +0100
-+++ libvirt-5.3.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args        2019-05-06 14:07:53.499000000 +0200
+diff -urp libvirt-5.4.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-5.4.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
+--- libvirt-5.4.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args   2019-06-17 20:17:54.132000000 +0200
++++ libvirt-5.4.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args        2019-06-17 20:18:17.714000000 +0200
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -146,9 +146,9 @@ diff -urp libvirt-5.3.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvi
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-5.3.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-5.3.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
---- libvirt-5.3.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args    2018-01-12 15:48:37.073414500 +0100
-+++ libvirt-5.3.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2019-05-06 14:07:53.499000000 +0200
+diff -urp libvirt-5.4.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-5.4.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
+--- libvirt-5.4.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args    2019-06-17 20:17:54.132000000 +0200
++++ libvirt-5.4.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2019-06-17 20:18:17.714000000 +0200
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -158,9 +158,9 @@ diff -urp libvirt-5.3.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvir
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.3.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-04-27 12:31:35.106090528 +0200
-+++ libvirt-5.3.0/tests/qemuxml2argvdata/graphics-spice-sasl.args      2019-05-06 14:08:46.241000000 +0200
+diff -urp libvirt-5.4.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.4.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
+--- libvirt-5.4.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-06-17 20:17:54.162000000 +0200
++++ libvirt-5.4.0/tests/qemuxml2argvdata/graphics-spice-sasl.args      2019-06-17 20:18:17.714000000 +0200
 @@ -6,7 +6,7 @@ LOGNAME=test \
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -170,9 +170,9 @@ diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args lib
  QEMU_AUDIO_DRV=spice \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.3.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args   2019-04-27 12:31:35.108090510 +0200
-+++ libvirt-5.3.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args        2019-05-06 14:08:24.446000000 +0200
+diff -urp libvirt-5.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.4.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+--- libvirt-5.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args   2019-06-17 20:17:54.163000000 +0200
++++ libvirt-5.4.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args        2019-06-17 20:18:17.714000000 +0200
 @@ -6,7 +6,7 @@ LOGNAME=test \
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -182,9 +182,9 @@ diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvi
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.3.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args    2019-04-27 12:31:35.109090500 +0200
-+++ libvirt-5.3.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-05-06 14:08:33.926000000 +0200
+diff -urp libvirt-5.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.4.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
+--- libvirt-5.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args    2019-06-17 20:17:54.165000000 +0200
++++ libvirt-5.4.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-06-17 20:18:17.714000000 +0200
 @@ -6,7 +6,7 @@ LOGNAME=test \
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -194,9 +194,9 @@ diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvir
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvtest.c libvirt-5.3.0/tests/qemuxml2argvtest.c
---- libvirt-5.3.0.orig/tests/qemuxml2argvtest.c        2019-04-27 12:31:35.156090069 +0200
-+++ libvirt-5.3.0/tests/qemuxml2argvtest.c     2019-05-06 14:07:53.502000000 +0200
+diff -urp libvirt-5.4.0.orig/tests/qemuxml2argvtest.c libvirt-5.4.0/tests/qemuxml2argvtest.c
+--- libvirt-5.4.0.orig/tests/qemuxml2argvtest.c        2019-06-17 20:17:53.274000000 +0200
++++ libvirt-5.4.0/tests/qemuxml2argvtest.c     2019-06-17 20:18:17.715000000 +0200
 @@ -1145,7 +1145,7 @@ mymain(void)
  
      driver.config->vncSASL = 1;
@@ -215,9 +215,9 @@ diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvtest.c libvirt-5.3.0/tests/qemuxm
      DO_TEST("graphics-spice-sasl",
              QEMU_CAPS_SPICE,
              QEMU_CAPS_DEVICE_QXL);
-diff -urp libvirt-5.3.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.3.0/tests/virconfdata/libvirtd.conf
---- libvirt-5.3.0.orig/tests/virconfdata/libvirtd.conf 2017-10-30 08:32:36.772365929 +0100
-+++ libvirt-5.3.0/tests/virconfdata/libvirtd.conf      2019-05-06 14:07:53.502000000 +0200
+diff -urp libvirt-5.4.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.4.0/tests/virconfdata/libvirtd.conf
+--- libvirt-5.4.0.orig/tests/virconfdata/libvirtd.conf 2019-06-17 20:17:54.591000000 +0200
++++ libvirt-5.4.0/tests/virconfdata/libvirtd.conf      2019-06-17 20:18:17.715000000 +0200
 @@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -236,9 +236,9 @@ diff -urp libvirt-5.3.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.3.0/tests
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -urp libvirt-5.3.0.orig/tests/virconfdata/libvirtd.out libvirt-5.3.0/tests/virconfdata/libvirtd.out
---- libvirt-5.3.0.orig/tests/virconfdata/libvirtd.out  2017-10-30 08:32:36.772365929 +0100
-+++ libvirt-5.3.0/tests/virconfdata/libvirtd.out       2019-05-06 14:07:53.502000000 +0200
+diff -urp libvirt-5.4.0.orig/tests/virconfdata/libvirtd.out libvirt-5.4.0/tests/virconfdata/libvirtd.out
+--- libvirt-5.4.0.orig/tests/virconfdata/libvirtd.out  2019-06-17 20:17:54.591000000 +0200
++++ libvirt-5.4.0/tests/virconfdata/libvirtd.out       2019-06-17 20:18:17.715000000 +0200
 @@ -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 11f9a8bd1e72baaa488da66feecebc836517fb14..3829e53c05b8e8f78a4d5b50ca02c997f0cb9707 100644 (file)
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-5.3.0.orig/src/Makefile.in libvirt-5.3.0/src/Makefile.in
---- libvirt-5.3.0.orig/src/Makefile.in 2019-05-06 14:16:10.359000000 +0200
-+++ libvirt-5.3.0/src/Makefile.in      2019-05-06 14:16:28.876000000 +0200
-@@ -6264,7 +6264,7 @@ REMOTE_DRIVER_PROTOCOL = \
+diff -urp libvirt-5.4.0.orig/src/Makefile.in libvirt-5.4.0/src/Makefile.in
+--- libvirt-5.4.0.orig/src/Makefile.in 2019-06-17 20:22:00.311000000 +0200
++++ libvirt-5.4.0/src/Makefile.in      2019-06-17 20:22:13.032000000 +0200
+@@ -6250,7 +6250,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
@@ -10,9 +10,9 @@ diff -urp libvirt-5.3.0.orig/src/Makefile.in libvirt-5.3.0/src/Makefile.in
  @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.3.0.orig/src/remote/Makefile.inc.am libvirt-5.3.0/src/remote/Makefile.inc.am
---- libvirt-5.3.0.orig/src/remote/Makefile.inc.am      2019-05-06 14:16:10.348000000 +0200
-+++ libvirt-5.3.0/src/remote/Makefile.inc.am   2019-05-06 14:16:28.876000000 +0200
+diff -urp libvirt-5.4.0.orig/src/remote/Makefile.inc.am libvirt-5.4.0/src/remote/Makefile.inc.am
+--- libvirt-5.4.0.orig/src/remote/Makefile.inc.am      2019-06-17 20:22:00.336000000 +0200
++++ libvirt-5.4.0/src/remote/Makefile.inc.am   2019-06-17 20:22:13.032000000 +0200
 @@ -195,7 +195,7 @@ check-augeas-remote: test_libvirtd.aug
  if WITH_SYSCTL
  # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on

diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch
index 9b362bc3e10b7795a29c2fb738f79265183ee2f1..15ee593a0029af0cb368791cf20e934168b78127 100644 (file)
--- a/libvirt-udevadm-settle.patch
+++ b/libvirt-udevadm-settle.patch
@@ -1,12 +1,12 @@
-diff -urp libvirt-5.3.0.orig/src/util/virutil.c libvirt-5.3.0/src/util/virutil.c
---- libvirt-5.3.0.orig/src/util/virutil.c      2019-05-06 14:12:23.947000000 +0200
-+++ libvirt-5.3.0/src/util/virutil.c   2019-05-06 14:12:43.225000000 +0200
-@@ -1483,7 +1483,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gi
- void virWaitForDevices(void)
- {
- # ifdef UDEVADM
--    const char *const settleprog[] = { UDEVADM, "settle", NULL };
-+    const char *const settleprog[] = { UDEVADM, "settle", "--timeout=10" , NULL };
- # else
-     const char *const settleprog[] = { UDEVSETTLE, NULL };
- # endif
+diff -urp libvirt-5.4.0.orig/src/util/virutil.c libvirt-5.4.0/src/util/virutil.c
+--- libvirt-5.4.0.orig/src/util/virutil.c      2019-06-17 20:19:59.489000000 +0200
++++ libvirt-5.4.0/src/util/virutil.c   2019-06-17 20:21:10.462000000 +0200
+@@ -1488,7 +1488,7 @@ void virWaitForDevices(void)
+     if (!(udev = virFindFileInPath(UDEVADM)))
+         return;
+ 
+-    if (!(cmd = virCommandNewArgList(udev, "settle", NULL)))
++    if (!(cmd = virCommandNewArgList(udev, "settle", "--timeout=10", NULL)))
+         return;
+ 
+     /*

diff --git a/libvirt.spec b/libvirt.spec
index 047a3013957c4f159072278f76d72a6f7ad0ffbe..98b78318ae3c60f2933ddb478f2b5466e5328185 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -40,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:       5.3.0
+Version:       5.4.0
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5: 1cfaaf3717783ba19850b5ac04f7e76a
+# Source0-md5: 92b7d6f53b1ff21e03afeee726850109
 Source1:       libvirtd.init
 Source2:       virtlockd.init
 Source3:       virtlogd.init