- updated to 5.3.0, not tested, release 0.1 due to dropped SysV support

diff --git a/bashisms.patch b/bashisms.patch
index 7b34d3c4e9c156a7bbed98766fa2d9cfe2ae6321..964c2c55e03247af258826365759cdfb7d8aa1eb 100644 (file)
--- a/bashisms.patch
+++ b/bashisms.patch
@@ -1,15 +1,6 @@
-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-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
+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
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash

diff --git a/libvirt-guests.init b/libvirt-guests.init
new file mode 100755 (executable)
index 0000000..e30f449
--- /dev/null
+++ b/libvirt-guests.init
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# libvirt-guests:   suspend/resume libvirt guests on shutdown/boot
+#
+# chkconfig: 345 99 01
+# description:  This is a script for suspending active libvirt guests \
+#               on shutdown and resuming them on next boot \
+#               See https://libvirt.org
+#
+
+exec /usr/lib64/libvirt-guests.sh "$@"
+
+# next line is here for "service --status-all" to work
+#  status)

diff --git a/libvirt-guests.init.patch b/libvirt-guests.init.patch
deleted file mode 100644 (file)
index c7e53c2..0000000
--- a/libvirt-guests.init.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-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 @@
- #
- 
- exec @libexecdir@/libvirt-guests.sh "$@"
-+
-+# next line is here for "service --status-all" to work
-+#  status)

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index c31da453600910c9ad34df44c1de47531008e47f..d6d2c60bd342a9e7470db9c6ed93e98b803b160d 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-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
+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
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,9 +12,9 @@ diff -urp libvirt-5.1.0.orig/src/qemu/qemu_command.c libvirt-5.1.0/src/qemu/qemu
      }
  
      virCommandAddArg(cmd, "-vnc");
-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
+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
 @@ -141,6 +141,15 @@
  #vnc_sasl = 1
  
@@ -31,9 +31,9 @@ diff -urp libvirt-5.1.0.orig/src/qemu/qemu.conf libvirt-5.1.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.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
+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
 @@ -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.1.0.orig/src/qemu/qemu_conf.c libvirt-5.1.0/src/qemu/qemu_co
  
      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
+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
 @@ -124,6 +124,7 @@ struct _virQEMUDriverConfig {
      bool vncTLSx509verify;
      bool vncTLSx509verifyPresent;

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 0181fa1e6c58de4f6f57d6f5722b3beb9241ec22..58b86d89fddcffb51f98f87a6c4504e8a996bacc 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,7 +1,7 @@
-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.
+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
+@@ -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
  config change is rquired to enable plain password auth. This is done by
@@ -10,9 +10,9 @@ diff -urp libvirt-5.1.0.orig/docs/auth.html libvirt-5.1.0/docs/auth.html
  parameter to <code>scram-sha-1</code>.
      </p>
          <p>
-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
+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
 @@ -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,21 +22,21 @@ diff -urp libvirt-5.1.0.orig/docs/auth.html.in libvirt-5.1.0/docs/auth.html.in
  parameter to <code>scram-sha-1</code>.
      </p>
      <p>
-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 = \
+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 = \
  
  # This is needed for clients too, so can't wrap in
  # the WITH_LIBVIRTD conditional
 -@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
+ 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
 @@ -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.1.0.orig/src/qemu/qemu.conf libvirt-5.1.0/src/qemu/qemu.conf
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-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
+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
 @@ -13,7 +13,7 @@ module Test_libvirtd_qemu =
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
@@ -101,9 +101,9 @@ diff -urp libvirt-5.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.1.0/sr
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-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
+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
 @@ -123,7 +123,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -122,10 +122,10 @@ diff -urp libvirt-5.1.0.orig/src/remote/libvirtd.conf libvirt-5.1.0/src/remote/l
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-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
+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
+@@ -244,7 +244,7 @@ endif WITH_LIBVIRTD
  # This is needed for clients too, so can't wrap in
  # the WITH_LIBVIRTD conditional
  if WITH_SASL
@@ -134,9 +134,9 @@ diff -urp libvirt-5.1.0.orig/src/remote/Makefile.inc.am libvirt-5.1.0/src/remote
  
  install-sasl:
        $(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
+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
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -146,9 +146,9 @@ diff -urp libvirt-5.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvi
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-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
+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
 @@ -3,7 +3,7 @@ PATH=/bin \
  HOME=/home/test \
  USER=test \
@@ -158,46 +158,46 @@ diff -urp libvirt-5.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvir
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-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 \
- LOGNAME=test \
+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
+@@ -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 \
+ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -SASL_CONF_PATH=/root/.sasl2 \
 +SASL_CONF_PATH=/root/.sasl \
  QEMU_AUDIO_DRV=spice \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-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 \
- LOGNAME=test \
+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
+@@ -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 \
+ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -SASL_CONF_PATH=/root/.sasl2 \
 +SASL_CONF_PATH=/root/.sasl \
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-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 \
- LOGNAME=test \
+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
+@@ -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 \
+ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -SASL_CONF_PATH=/root/.sasl2 \
 +SASL_CONF_PATH=/root/.sasl \
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-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)
+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
+@@ -1145,7 +1145,7 @@ mymain(void)
  
      driver.config->vncSASL = 1;
      VIR_FREE(driver.config->vncSASLdir);
@@ -206,7 +206,7 @@ diff -urp libvirt-5.1.0.orig/tests/qemuxml2argvtest.c libvirt-5.1.0/tests/qemuxm
      DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->vncTLS = 1;
      driver.config->vncTLSx509verify = 1;
-@@ -1244,7 +1244,7 @@ mymain(void)
+@@ -1177,7 +1177,7 @@ mymain(void)
      DO_TEST("graphics-spice-no-args",
              QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->spiceSASL = 1;
@@ -215,9 +215,9 @@ diff -urp libvirt-5.1.0.orig/tests/qemuxml2argvtest.c libvirt-5.1.0/tests/qemuxm
      DO_TEST("graphics-spice-sasl",
              QEMU_CAPS_SPICE,
              QEMU_CAPS_DEVICE_QXL);
-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
+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
 @@ -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.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.1.0/tests
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-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
+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
 @@ -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 bf8fd3955374934a513487efb4e4fc54c18a81aa..11f9a8bd1e72baaa488da66feecebc836517fb14 100644 (file)
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,7 +1,7 @@
-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 = \
+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 = \
  
  # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
  # /usr/lib/sysctl.d/ even when libdir is /usr/lib64
@@ -10,10 +10,10 @@ diff -urp libvirt-5.1.0.orig/src/Makefile.in libvirt-5.1.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.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
+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
+@@ -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
  # /usr/lib/sysctl.d/ even when libdir is /usr/lib64

diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch
index 85f955a24aa89a8a1efbb56c2d4f2b1e60310fda..9b362bc3e10b7795a29c2fb738f79265183ee2f1 100644 (file)
--- a/libvirt-udevadm-settle.patch
+++ b/libvirt-udevadm-settle.patch
@@ -1,7 +1,7 @@
-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
+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

diff --git a/libvirt.spec b/libvirt.spec
index 7b7de1733868508d04d71f0e18d12e35f675b9a3..0bc1a306a1d4bde7c5d0827db74a90e8297d437e 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -40,21 +40,21 @@
 Summary:       Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):     Narzędzia współpracujące z funkcjami wirtualizacji
 Name:          libvirt
-Version:       5.1.0
-Release:       1
+Version:       5.3.0
+Release:       0.1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5: 74c6c2e90ca9c94d9255eec338615a0c
+# Source0-md5: 1cfaaf3717783ba19850b5ac04f7e76a
 Source1:       libvirtd.init
 Source2:       virtlockd.init
 Source3:       virtlogd.init
+Source4:       libvirt-guests.init
 Patch0:                %{name}-sasl.patch
 Patch1:                %{name}-qemu-acl.patch
 Patch2:                %{name}-udevadm-settle.patch
 Patch3:                bashisms.patch
-Patch4:                %{name}-guests.init.patch
-Patch5:                %{name}-sysctl-dir.patch
+Patch4:                %{name}-sysctl-dir.patch
 URL:           http://www.libvirt.org/
 BuildRequires: acl-devel
 BuildRequires: attr-devel
@@ -432,7 +432,6 @@ Moduł sekcji Wiresharka do pakietów libvirt.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 %{__libtoolize}
@@ -541,6 +540,7 @@ install -d $RPM_BUILD_ROOT/etc/{sysconfig,sysctl.d,rc.d/init.d}
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirtd
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlockd
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlogd
+install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirt-guests
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.la \
@@ -838,6 +838,7 @@ fi
 %{_datadir}/libvirt/schemas/secret.rng
 %{_datadir}/libvirt/schemas/storagecommon.rng
 %{_datadir}/libvirt/schemas/storagepool.rng
+%{_datadir}/libvirt/schemas/storagepoolcaps.rng
 %{_datadir}/libvirt/schemas/storagevol.rng
 # for test driver (built into libvirt)
 %{_datadir}/libvirt/test-screenshot.png