- updated to 5.8.0

diff --git a/bashisms.patch b/bashisms.patch
index a9b3bf0d8e63c43ea5565a129558b1d51136f7e1..3f7dac0445a1fbcf94e50de9720edebb9f91348c 100644 (file)
--- a/bashisms.patch
+++ b/bashisms.patch
@@ -1,6 +1,6 @@
-diff -ur libvirt-5.6.0.orig/tools/libvirt-guests.sh.in libvirt-5.6.0/tools/libvirt-guests.sh.in
---- libvirt-5.6.0.orig/tools/libvirt-guests.sh.in      2019-08-18 18:16:04.544000000 +0200
-+++ libvirt-5.6.0/tools/libvirt-guests.sh.in   2019-08-18 18:16:15.722000000 +0200
+diff -ur libvirt-5.8.0.orig/tools/libvirt-guests.sh.in libvirt-5.8.0/tools/libvirt-guests.sh.in
+--- libvirt-5.8.0.orig/tools/libvirt-guests.sh.in      2019-10-20 16:09:06.213000000 +0200
++++ libvirt-5.8.0/tools/libvirt-guests.sh.in   2019-10-20 16:09:23.648000000 +0200
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 6522c73671f5f374bd3df1357432e353c852576c..d473146cbee36426ae3d78eac7fe6725a0d32339 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -ur libvirt-5.6.0.orig/src/qemu/qemu_command.c libvirt-5.6.0/src/qemu/qemu_command.c
---- libvirt-5.6.0.orig/src/qemu/qemu_command.c 2019-08-18 18:14:58.605000000 +0200
-+++ libvirt-5.6.0/src/qemu/qemu_command.c      2019-08-18 18:15:10.043000000 +0200
-@@ -8218,6 +8218,10 @@
+diff -ur libvirt-5.8.0.orig/src/qemu/qemu_command.c libvirt-5.8.0/src/qemu/qemu_command.c
+--- libvirt-5.8.0.orig/src/qemu/qemu_command.c 2019-10-20 16:07:26.267000000 +0200
++++ libvirt-5.8.0/src/qemu/qemu_command.c      2019-10-20 16:07:44.191000000 +0200
+@@ -7952,6 +7952,10 @@
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,9 +12,9 @@ diff -ur libvirt-5.6.0.orig/src/qemu/qemu_command.c libvirt-5.6.0/src/qemu/qemu_
      }
  
      virCommandAddArg(cmd, "-vnc");
-diff -ur libvirt-5.6.0.orig/src/qemu/qemu.conf libvirt-5.6.0/src/qemu/qemu.conf
---- libvirt-5.6.0.orig/src/qemu/qemu.conf      2019-08-18 18:14:58.606000000 +0200
-+++ libvirt-5.6.0/src/qemu/qemu.conf   2019-08-18 18:15:10.043000000 +0200
+diff -ur libvirt-5.8.0.orig/src/qemu/qemu.conf libvirt-5.8.0/src/qemu/qemu.conf
+--- libvirt-5.8.0.orig/src/qemu/qemu.conf      2019-10-20 16:07:26.267000000 +0200
++++ libvirt-5.8.0/src/qemu/qemu.conf   2019-10-20 16:07:44.192000000 +0200
 @@ -141,6 +141,15 @@
  #vnc_sasl = 1
  
@@ -31,10 +31,10 @@ diff -ur libvirt-5.6.0.orig/src/qemu/qemu.conf libvirt-5.6.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 -ur libvirt-5.6.0.orig/src/qemu/qemu_conf.c libvirt-5.6.0/src/qemu/qemu_conf.c
---- libvirt-5.6.0.orig/src/qemu/qemu_conf.c    2019-08-18 18:14:58.604000000 +0200
-+++ libvirt-5.6.0/src/qemu/qemu_conf.c 2019-08-18 18:15:10.044000000 +0200
-@@ -459,6 +459,8 @@
+diff -ur libvirt-5.8.0.orig/src/qemu/qemu_conf.c libvirt-5.8.0/src/qemu/qemu_conf.c
+--- libvirt-5.8.0.orig/src/qemu/qemu_conf.c    2019-10-20 16:07:26.266000000 +0200
++++ libvirt-5.8.0/src/qemu/qemu_conf.c 2019-10-20 16:07:44.192000000 +0200
+@@ -443,6 +443,8 @@
          return -1;
      if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
          return -1;
@@ -43,10 +43,10 @@ diff -ur libvirt-5.6.0.orig/src/qemu/qemu_conf.c libvirt-5.6.0/src/qemu/qemu_con
  
      return 0;
  }
-diff -ur libvirt-5.6.0.orig/src/qemu/qemu_conf.h libvirt-5.6.0/src/qemu/qemu_conf.h
---- libvirt-5.6.0.orig/src/qemu/qemu_conf.h    2019-08-18 18:14:58.603000000 +0200
-+++ libvirt-5.6.0/src/qemu/qemu_conf.h 2019-08-18 18:15:10.044000000 +0200
-@@ -117,6 +117,7 @@
+diff -ur libvirt-5.8.0.orig/src/qemu/qemu_conf.h libvirt-5.8.0/src/qemu/qemu_conf.h
+--- libvirt-5.8.0.orig/src/qemu/qemu_conf.h    2019-10-20 16:07:26.265000000 +0200
++++ libvirt-5.8.0/src/qemu/qemu_conf.h 2019-10-20 16:07:44.192000000 +0200
+@@ -118,6 +118,7 @@
      bool vncTLSx509verify;
      bool vncTLSx509verifyPresent;
      bool vncSASL;

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index a33de1c9b6a4a1f42001964b52e9250cc02fefb8..bf92ef0491841dcb18e14a29cd5319010a783603 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,7 +1,7 @@
-diff -ur libvirt-5.6.0.orig/docs/auth.html libvirt-5.6.0/docs/auth.html
---- libvirt-5.6.0.orig/docs/auth.html  2019-08-18 18:13:34.004000000 +0200
-+++ libvirt-5.6.0/docs/auth.html       2019-08-18 18:13:49.483000000 +0200
-@@ -318,7 +318,7 @@
+diff -ur libvirt-5.8.0.orig/docs/auth.html libvirt-5.8.0/docs/auth.html
+--- libvirt-5.8.0.orig/docs/auth.html  2019-10-20 16:04:35.546000000 +0200
++++ libvirt-5.8.0/docs/auth.html       2019-10-20 16:04:56.339000000 +0200
+@@ -316,7 +316,7 @@
          <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 -ur libvirt-5.6.0.orig/docs/auth.html libvirt-5.6.0/docs/auth.html
  parameter to <code>scram-sha-1</code>.
      </p>
          <p>
-diff -ur libvirt-5.6.0.orig/docs/auth.html.in libvirt-5.6.0/docs/auth.html.in
---- libvirt-5.6.0.orig/docs/auth.html.in       2019-08-18 18:13:34.038000000 +0200
-+++ libvirt-5.6.0/docs/auth.html.in    2019-08-18 18:13:49.483000000 +0200
-@@ -277,7 +277,7 @@
+diff -ur libvirt-5.8.0.orig/docs/auth.html.in libvirt-5.8.0/docs/auth.html.in
+--- libvirt-5.8.0.orig/docs/auth.html.in       2019-10-20 16:04:35.553000000 +0200
++++ libvirt-5.8.0/docs/auth.html.in    2019-10-20 16:04:56.339000000 +0200
+@@ -275,7 +275,7 @@
      <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,21 +22,21 @@ diff -ur libvirt-5.6.0.orig/docs/auth.html.in libvirt-5.6.0/docs/auth.html.in
  parameter to <code>scram-sha-1</code>.
      </p>
      <p>
-diff -ur libvirt-5.6.0.orig/src/Makefile.in libvirt-5.6.0/src/Makefile.in
---- libvirt-5.6.0.orig/src/Makefile.in 2019-08-18 18:13:33.904000000 +0200
-+++ libvirt-5.6.0/src/Makefile.in      2019-08-18 18:13:49.485000000 +0200
-@@ -6729,7 +6729,7 @@
+diff -ur libvirt-5.8.0.orig/src/Makefile.in libvirt-5.8.0/src/Makefile.in
+--- libvirt-5.8.0.orig/src/Makefile.in 2019-10-20 16:04:35.325000000 +0200
++++ libvirt-5.8.0/src/Makefile.in      2019-10-20 16:05:47.662000000 +0200
+@@ -7325,7 +7325,7 @@
  
  # 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_191) $(am__append_193)
- SECDRIVER_LIBS = $(am__append_192) $(am__append_194)
-diff -ur libvirt-5.6.0.orig/src/qemu/qemu.conf libvirt-5.6.0/src/qemu/qemu.conf
---- libvirt-5.6.0.orig/src/qemu/qemu.conf      2019-08-18 18:13:33.918000000 +0200
-+++ libvirt-5.6.0/src/qemu/qemu.conf   2019-08-18 18:13:49.486000000 +0200
+ LIBVIRTD_UNIT_VARS = \
+       $(COMMON_UNIT_VARS) \
+       -e 's|[@]name[@]|Libvirt|g' \
+diff -ur libvirt-5.8.0.orig/src/qemu/qemu.conf libvirt-5.8.0/src/qemu/qemu.conf
+--- libvirt-5.8.0.orig/src/qemu/qemu.conf      2019-10-20 16:04:35.385000000 +0200
++++ libvirt-5.8.0/src/qemu/qemu.conf   2019-10-20 16:04:56.343000000 +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 -ur libvirt-5.6.0.orig/src/qemu/qemu.conf libvirt-5.6.0/src/qemu/qemu.conf
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-diff -ur libvirt-5.6.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.6.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-5.6.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2019-08-18 18:13:33.917000000 +0200
-+++ libvirt-5.6.0/src/qemu/test_libvirtd_qemu.aug.in   2019-08-18 18:13:49.486000000 +0200
+diff -ur libvirt-5.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.8.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-5.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2019-10-20 16:04:35.351000000 +0200
++++ libvirt-5.8.0/src/qemu/test_libvirtd_qemu.aug.in   2019-10-20 16:04:56.343000000 +0200
 @@ -13,7 +13,7 @@
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
@@ -101,31 +101,31 @@ diff -ur libvirt-5.6.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.6.0/src
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-diff -ur libvirt-5.6.0.orig/src/remote/libvirtd.conf libvirt-5.6.0/src/remote/libvirtd.conf
---- libvirt-5.6.0.orig/src/remote/libvirtd.conf        2019-08-18 18:13:33.899000000 +0200
-+++ libvirt-5.6.0/src/remote/libvirtd.conf     2019-08-18 18:13:49.486000000 +0200
-@@ -132,7 +132,7 @@
+diff -ur libvirt-5.8.0.orig/src/remote/libvirtd.conf.in libvirt-5.8.0/src/remote/libvirtd.conf.in
+--- libvirt-5.8.0.orig/src/remote/libvirtd.conf.in     2019-10-20 16:04:35.339000000 +0200
++++ libvirt-5.8.0/src/remote/libvirtd.conf.in  2019-10-20 16:06:12.441000000 +0200
+@@ -134,7 +134,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
  #  - sasl: use SASL infrastructure. The actual auth scheme is then
--#          controlled from /etc/sasl2/libvirt.conf. For the TCP
-+#          controlled from /etc/sasl/libvirt.conf. For the TCP
+-#          controlled from @sysconfdir@/sasl2/libvirt.conf. For the TCP
++#          controlled from @sysconfdir@/sasl/libvirt.conf. For the TCP
  #          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
  #          For non-TCP or TLS sockets, any scheme is allowed.
  #
-@@ -163,7 +163,7 @@
+@@ -166,7 +166,7 @@
  # If you don't enable SASL, then all TCP traffic is cleartext.
  # Don't do this outside of a dev/test scenario. For real world
  # use, always enable SASL and use the GSSAPI or DIGEST-MD5
--# mechanism in /etc/sasl2/libvirt.conf
-+# mechanism in /etc/sasl/libvirt.conf
+-# mechanism in @sysconfdir@/sasl2/libvirt.conf
++# mechanism in @sysconfdir@/sasl/libvirt.conf
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-5.6.0.orig/src/remote/Makefile.inc.am libvirt-5.6.0/src/remote/Makefile.inc.am
---- libvirt-5.6.0.orig/src/remote/Makefile.inc.am      2019-08-18 18:13:33.901000000 +0200
-+++ libvirt-5.6.0/src/remote/Makefile.inc.am   2019-08-18 18:13:49.486000000 +0200
-@@ -249,7 +249,7 @@
+diff -ur libvirt-5.8.0.orig/src/remote/Makefile.inc.am libvirt-5.8.0/src/remote/Makefile.inc.am
+--- libvirt-5.8.0.orig/src/remote/Makefile.inc.am      2019-10-20 16:04:35.339000000 +0200
++++ libvirt-5.8.0/src/remote/Makefile.inc.am   2019-10-20 16:04:58.545000000 +0200
+@@ -360,7 +360,7 @@
  # This is needed for clients too, so can't wrap in
  # the WITH_LIBVIRTD conditional
  if WITH_SASL
@@ -134,9 +134,9 @@ diff -ur libvirt-5.6.0.orig/src/remote/Makefile.inc.am libvirt-5.6.0/src/remote/
  
  install-sasl:
        $(MKDIR_P) $(DESTDIR)$(sasldir)
-diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.6.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-08-18 18:13:33.381000000 +0200
-+++ libvirt-5.6.0/tests/qemuxml2argvdata/graphics-spice-sasl.args      2019-08-18 18:13:49.486000000 +0200
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.8.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
+--- libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-10-20 16:04:35.069000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvdata/graphics-spice-sasl.args      2019-10-20 16:04:58.545000000 +0200
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -146,9 +146,9 @@ diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libv
  QEMU_AUDIO_DRV=spice \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args   2019-08-18 18:13:33.390000000 +0200
-+++ libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args        2019-08-18 18:13:49.486000000 +0200
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+--- libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args   2019-10-20 16:04:35.078000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args        2019-10-20 16:04:58.546000000 +0200
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -158,9 +158,9 @@ diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvir
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args    2019-08-18 18:13:33.380000000 +0200
-+++ libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-08-18 18:13:49.486000000 +0200
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
+--- libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args    2019-10-20 16:04:35.069000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-10-20 16:04:58.546000000 +0200
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -170,9 +170,9 @@ diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
---- libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args       2019-08-18 18:13:33.390000000 +0200
-+++ libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args    2019-08-18 18:13:49.486000000 +0200
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+--- libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args       2019-10-20 16:04:35.078000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args    2019-10-20 16:04:58.546000000 +0200
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -182,9 +182,9 @@ diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_6
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name guest=QEMUGuest1,debug-threads=on \
-diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
---- libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args       2019-08-18 18:13:33.385000000 +0200
-+++ libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args    2019-08-18 18:13:49.487000000 +0200
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
+--- libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args       2019-10-20 16:04:35.073000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args    2019-10-20 16:04:58.546000000 +0200
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -194,9 +194,9 @@ diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name guest=QEMUGuest1,debug-threads=on \
-diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
---- libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args      2019-08-18 18:13:33.386000000 +0200
-+++ libvirt-5.6.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args   2019-08-18 18:13:49.487000000 +0200
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+--- libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args      2019-10-20 16:04:35.075000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args   2019-10-20 16:04:58.546000000 +0200
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -206,10 +206,10 @@ diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-lates
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name guest=QEMUGuest1,debug-threads=on \
-diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvtest.c libvirt-5.6.0/tests/qemuxml2argvtest.c
---- libvirt-5.6.0.orig/tests/qemuxml2argvtest.c        2019-08-18 18:13:33.406000000 +0200
-+++ libvirt-5.6.0/tests/qemuxml2argvtest.c     2019-08-18 18:13:49.487000000 +0200
-@@ -1177,7 +1177,7 @@
+diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvtest.c libvirt-5.8.0/tests/qemuxml2argvtest.c
+--- libvirt-5.8.0.orig/tests/qemuxml2argvtest.c        2019-10-20 16:04:35.085000000 +0200
++++ libvirt-5.8.0/tests/qemuxml2argvtest.c     2019-10-20 16:04:58.547000000 +0200
+@@ -1215,7 +1215,7 @@
  
      driver.config->vncSASL = 1;
      VIR_FREE(driver.config->vncSASLdir);
@@ -218,7 +218,7 @@ diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvtest.c libvirt-5.6.0/tests/qemuxml
      DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->vncTLS = 1;
      driver.config->vncTLSx509verify = 1;
-@@ -1209,7 +1209,7 @@
+@@ -1247,7 +1247,7 @@
      DO_TEST("graphics-spice-no-args",
              QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->spiceSASL = 1;
@@ -227,9 +227,9 @@ diff -ur libvirt-5.6.0.orig/tests/qemuxml2argvtest.c libvirt-5.6.0/tests/qemuxml
      DO_TEST("graphics-spice-sasl",
              QEMU_CAPS_SPICE,
              QEMU_CAPS_DEVICE_QXL);
-diff -ur libvirt-5.6.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.6.0/tests/virconfdata/libvirtd.conf
---- libvirt-5.6.0.orig/tests/virconfdata/libvirtd.conf 2019-08-18 18:13:33.812000000 +0200
-+++ libvirt-5.6.0/tests/virconfdata/libvirtd.conf      2019-08-18 18:13:49.487000000 +0200
+diff -ur libvirt-5.8.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.8.0/tests/virconfdata/libvirtd.conf
+--- libvirt-5.8.0.orig/tests/virconfdata/libvirtd.conf 2019-10-20 16:04:35.211000000 +0200
++++ libvirt-5.8.0/tests/virconfdata/libvirtd.conf      2019-10-20 16:04:58.547000000 +0200
 @@ -91,7 +91,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -248,9 +248,9 @@ diff -ur libvirt-5.6.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.6.0/tests/
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -ur libvirt-5.6.0.orig/tests/virconfdata/libvirtd.out libvirt-5.6.0/tests/virconfdata/libvirtd.out
---- libvirt-5.6.0.orig/tests/virconfdata/libvirtd.out  2019-08-18 18:13:33.812000000 +0200
-+++ libvirt-5.6.0/tests/virconfdata/libvirtd.out       2019-08-18 18:13:49.487000000 +0200
+diff -ur libvirt-5.8.0.orig/tests/virconfdata/libvirtd.out libvirt-5.8.0/tests/virconfdata/libvirtd.out
+--- libvirt-5.8.0.orig/tests/virconfdata/libvirtd.out  2019-10-20 16:04:35.211000000 +0200
++++ libvirt-5.8.0/tests/virconfdata/libvirtd.out       2019-10-20 16:04:58.547000000 +0200
 @@ -73,7 +73,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index f5f25ea72dd8340fe0aab3ea8c33904e04f44e29..51b44c9511fd446525bcd3c5dc2646d335f475db 100644 (file)
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,7 +1,7 @@
-diff -ur libvirt-5.6.0.orig/src/Makefile.in libvirt-5.6.0/src/Makefile.in
---- libvirt-5.6.0.orig/src/Makefile.in 2019-08-18 18:16:31.092000000 +0200
-+++ libvirt-5.6.0/src/Makefile.in      2019-08-18 18:16:45.444000000 +0200
-@@ -6722,7 +6722,7 @@
+diff -ur libvirt-5.8.0.orig/src/Makefile.in libvirt-5.8.0/src/Makefile.in
+--- libvirt-5.8.0.orig/src/Makefile.in 2019-10-20 16:09:38.505000000 +0200
++++ libvirt-5.8.0/src/Makefile.in      2019-10-20 16:09:51.396000000 +0200
+@@ -7318,7 +7318,7 @@
  
  # 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 -ur libvirt-5.6.0.orig/src/Makefile.in libvirt-5.6.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 -ur libvirt-5.6.0.orig/src/remote/Makefile.inc.am libvirt-5.6.0/src/remote/Makefile.inc.am
---- libvirt-5.6.0.orig/src/remote/Makefile.inc.am      2019-08-18 18:16:31.077000000 +0200
-+++ libvirt-5.6.0/src/remote/Makefile.inc.am   2019-08-18 18:16:45.445000000 +0200
-@@ -200,7 +200,7 @@
+diff -ur libvirt-5.8.0.orig/src/remote/Makefile.inc.am libvirt-5.8.0/src/remote/Makefile.inc.am
+--- libvirt-5.8.0.orig/src/remote/Makefile.inc.am      2019-10-20 16:09:38.518000000 +0200
++++ libvirt-5.8.0/src/remote/Makefile.inc.am   2019-10-20 16:09:51.397000000 +0200
+@@ -312,7 +312,7 @@
  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 5f8b62fdcf29fd0c16cf6a04bc03c5d2394f4512..fc862ab3b7fe4588fff584d61a8d1afbe1c5282e 100644 (file)
--- a/libvirt-udevadm-settle.patch
+++ b/libvirt-udevadm-settle.patch
@@ -1,6 +1,6 @@
-diff -ur libvirt-5.6.0.orig/src/util/virutil.c libvirt-5.6.0/src/util/virutil.c
---- libvirt-5.6.0.orig/src/util/virutil.c      2019-08-18 18:15:33.951000000 +0200
-+++ libvirt-5.6.0/src/util/virutil.c   2019-08-18 18:15:52.690000000 +0200
+diff -ur libvirt-5.8.0.orig/src/util/virutil.c libvirt-5.8.0/src/util/virutil.c
+--- libvirt-5.8.0.orig/src/util/virutil.c      2019-10-20 16:08:27.731000000 +0200
++++ libvirt-5.8.0/src/util/virutil.c   2019-10-20 16:08:46.538000000 +0200
 @@ -1488,7 +1488,7 @@
      if (!(udev = virFindFileInPath(UDEVADM)))
          return;

diff --git a/libvirt.spec b/libvirt.spec
index 43e0839d4332d70ae8c217d9fbc07a413f74adcb..82b25cff93009f40d7d9eb2ad5657c48669ff4e0 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -13,7 +13,6 @@
 %bcond_without qemu            # Qemu support
 %bcond_without vbox            # VirtualBox support
 %bcond_without vmware          # VMware Workstation/Player support
-%bcond_without xenapi          # Xen API (Citrix XenServer) support
 # - storage
 %bcond_without ceph            # RADOS BD (Ceph) storage support
 %bcond_without glusterfs       # GlusterFS storage support
@@ -33,7 +32,6 @@
 
 # Xen is available only on x86 and ia64
 %ifnarch %{ix86} %{x8664} ia64
-%undefine      with_xenapi
 %undefine      with_libxl
 %endif
 
@@ -45,12 +43,12 @@
 Summary:       Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):     Narzędzia współpracujące z funkcjami wirtualizacji
 Name:          libvirt
-Version:       5.6.0
+Version:       5.8.0
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5: e818bb25ead24119925781b7519a8401
+# Source0-md5: 3f33359d42e4e996c93f6864b4a89a09
 Source1:       libvirtd.init
 Source2:       virtlockd.init
 Source3:       virtlogd.init
@@ -71,7 +69,6 @@ BuildRequires:        audit-libs-devel
 BuildRequires: augeas-devel
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
-BuildRequires: avahi-devel >= 0.6.0
 BuildRequires: bash-completion >= 2.0
 %{?with_ceph:BuildRequires:    ceph-devel}
 BuildRequires: curl-devel >= 7.18.0
@@ -94,7 +91,6 @@ BuildRequires:        libselinux-devel >= 2.5
 BuildRequires: libssh-devel >= 0.7
 BuildRequires: libssh2-devel >= 1.3
 BuildRequires: libtool
-%{?with_xenapi:BuildRequires:  libxenserver-devel}
 BuildRequires: libxml2-devel >= 1:2.6.0
 BuildRequires: libxslt-devel
 BuildRequires: ncurses-devel
@@ -129,7 +125,6 @@ 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
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -243,7 +238,6 @@ Summary:    Server side daemon and supporting files for libvirt library
 Summary(pl.UTF-8):     Demon działający po stronie serwera oraz pliki wspierające dla biblioteki libvirt
 Group:         Applications/System
 Requires:      %{name} = %{version}-%{release}
-Requires:      avahi-libs >= 0.6.0
 Requires:      iproute2
 Requires:      libblkid >= 2.17
 %{?with_netcf:Requires:        netcf >= 0.2.0}
@@ -367,6 +361,20 @@ of the QEMU emulators.
 Sterownik wymagany po stronie serwera do zarządzania funkcjami
 wirtualizacji emulatora QEMU.
 
+%package daemon-vbox
+Summary:       Server side driver required to run Oracle VirtualBox guests
+Summary(pl.UTF-8):     Sterownik wymagany po stronie serwera do uruchamiania gości Oracle VirtualBox
+Group:         Libraries
+Provides:      libvirt(hypervisor)
+
+%description daemon-vbox
+Server side driver required to manage the virtualization capabilities
+of Oracle VirtualBox
+
+%description daemon-vbox -l pl.UTF-8
+Sterownik wymagany po stronie serwera do zarządzania funkcjami
+wirtualizacji emulatora Oracle VirtualBox.
+
 %package client
 Summary:       Client side utilities of the libvirt library
 Summary(pl.UTF-8):     Narzędzia klienckie do biblioteki libvirt
@@ -488,8 +496,6 @@ Moduł sekcji Wiresharka do pakietów libvirt.
        %{?with_static_libs:--enable-static} \
        --with-bash-completion \
        --with-bash-completions-dir=/etc/bash_completion.d \
-       --with-html-dir=%{_gtkdocdir} \
-       --with-html-subdir=%{name} \
        --with-packager="TLD-Linux" \
        --with-packager-version="%{name}-%{version}-%{release}.%{_target_cpu}" \
        --with-qemu-user=qemu \
@@ -505,7 +511,8 @@ Moduł sekcji Wiresharka do pakietów libvirt.
        --with-storage-sheepdog \
        --with-apparmor \
        --with-audit \
-       --with-avahi \
+       --without-firewalld \
+       --without-firewalld-zone \
        %{__with_without systemtap dtrace} \
        %{__with_without esx} \
        --with-driver-modules \
@@ -531,7 +538,6 @@ Moduł sekcji Wiresharka do pakietów libvirt.
        --with-virtualport \
        %{__with_without vmware} \
        %{!?with_wireshark:--without-wireshark-dissector} \
-       %{__with_without xenapi} \
        --x-libraries=%{_libdir}
 
 %{__make} \
@@ -542,7 +548,6 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{sysconfig,sysctl.d,rc.d/init.d}
 
 %{__make} install \
-       DEVHELP_DIR=%{_gtkdocdir}/%{name}/devhelp \
        DESTDIR=$RPM_BUILD_ROOT
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirtd
@@ -646,7 +651,7 @@ fi
 %{?with_lxc:%attr(755,root,root) %{_libdir}/libvirt-lxc.so}
 %attr(755,root,root) %{_libdir}/libvirt-qemu.so
 %{_datadir}/%{name}/api
-%{_gtkdocdir}/%{name}
+%{_docdir}/%{name}
 %{_includedir}/%{name}
 %{_pkgconfigdir}/libvirt.pc
 %{_pkgconfigdir}/libvirt-admin.pc
@@ -687,6 +692,13 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtlockd.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt-admin.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtlogd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtinterfaced.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtnetworkd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtnodedevd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtnwfilterd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtproxyd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtsecretd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtstoraged.conf
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu/networks/default.xml
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/nwfilter/*.xml
@@ -705,14 +717,35 @@ fi
 %attr(755,root,root) %{_sbindir}/libvirtd
 %attr(755,root,root) %{_sbindir}/virtlockd
 %attr(755,root,root) %{_sbindir}/virtlogd
+%attr(755,root,root) %{_sbindir}/virtinterfaced
+%attr(755,root,root) %{_sbindir}/virtnetworkd
+%attr(755,root,root) %{_sbindir}/virtnodedevd
+%attr(755,root,root) %{_sbindir}/virtnwfilterd
+%attr(755,root,root) %{_sbindir}/virtproxyd
+%attr(755,root,root) %{_sbindir}/virtsecretd
+%attr(755,root,root) %{_sbindir}/virtstoraged
 %{_datadir}/augeas/lenses/libvirtd.aug
 %{_datadir}/augeas/lenses/libvirt_lockd.aug
 %{_datadir}/augeas/lenses/virtlockd.aug
 %{_datadir}/augeas/lenses/virtlogd.aug
+%{_datadir}/augeas/lenses/virtinterfaced.aug
+%{_datadir}/augeas/lenses/virtnetworkd.aug
+%{_datadir}/augeas/lenses/virtnodedevd.aug
+%{_datadir}/augeas/lenses/virtnwfilterd.aug
+%{_datadir}/augeas/lenses/virtproxyd.aug
+%{_datadir}/augeas/lenses/virtsecretd.aug
+%{_datadir}/augeas/lenses/virtstoraged.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd.aug
 %{?with_qemu:%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug}
 %{_datadir}/augeas/lenses/tests/test_virtlockd.aug
 %{_datadir}/augeas/lenses/tests/test_virtlogd.aug
+%{_datadir}/augeas/lenses/tests/test_virtinterfaced.aug
+%{_datadir}/augeas/lenses/tests/test_virtnetworkd.aug
+%{_datadir}/augeas/lenses/tests/test_virtnodedevd.aug
+%{_datadir}/augeas/lenses/tests/test_virtnwfilterd.aug
+%{_datadir}/augeas/lenses/tests/test_virtproxyd.aug
+%{_datadir}/augeas/lenses/tests/test_virtsecretd.aug
+%{_datadir}/augeas/lenses/tests/test_virtstoraged.aug
 %if %{with polkit}
 %{_datadir}/polkit-1/actions/org.libvirt.api.policy
 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy
@@ -740,7 +773,6 @@ fi
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_nwfilter.so
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_secret.so
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_storage.so
-%{?with_vbox:%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so}
 %dir %{_libdir}/libvirt/lock-driver
 %attr(755,root,root) %{_libdir}/libvirt/lock-driver/lockd.so
 %dir %{_libdir}/libvirt/storage-backend
@@ -775,10 +807,14 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libxl.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libxl-lockd.conf
 %{?with_sanlock:%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libxl-sanlock.conf}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtxend.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.libxl
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_libxl.so
+%attr(755,root,root) %{_sbindir}/virtxend
 %{_datadir}/augeas/lenses/libvirtd_libxl.aug
+%{_datadir}/augeas/lenses/virtxend.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
+%{_datadir}/augeas/lenses/tests/test_virtxend.aug
 %attr(700,root,root) %dir /var/lib/libvirt/libxl
 %attr(700,root,root) %dir /var/run/libvirt/libxl
 %attr(700,root,root) %dir /var/log/libvirt/libxl
@@ -788,14 +824,18 @@ fi
 %files daemon-lxc
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/lxc.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtlxcd.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.lxc
 %attr(700,root,root) %dir /var/lib/libvirt/lxc
 %attr(700,root,root) %dir /var/run/libvirt/lxc
 %attr(700,root,root) %dir /var/log/libvirt/lxc
 %{_datadir}/augeas/lenses/libvirtd_lxc.aug
+%{_datadir}/augeas/lenses/virtlxcd.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
+%{_datadir}/augeas/lenses/tests/test_virtlxcd.aug
 %attr(755,root,root) %{_libexecdir}/libvirt_lxc
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_lxc.so
+%attr(755,root,root) %{_sbindir}/virtlxcd
 %endif
 
 %if %{with qemu}
@@ -804,14 +844,28 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu-lockd.conf
 %{?with_sanlock:%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu-sanlock.conf}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtqemud.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.qemu
 %attr(750,qemu,qemu) %dir /var/cache/libvirt/qemu
 %attr(750,qemu,qemu) %dir /var/lib/libvirt/qemu
 %attr(700,root,root) %dir /var/log/libvirt/qemu
 %attr(700,root,root) %dir /var/run/libvirt/qemu
 %{_datadir}/augeas/lenses/libvirtd_qemu.aug
+%{_datadir}/augeas/lenses/virtqemud.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
+%{_datadir}/augeas/lenses/tests/test_virtqemud.aug
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_qemu.so
+%attr(755,root,root) %{_sbindir}/virtqemud
+%endif
+
+%if %{with vbox}
+%files daemon-vbox
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtvboxd.conf
+%attr(755,root,root) %{_sbindir}/virtvboxd
+%{_datadir}/augeas/lenses/virtvboxd.aug
+%{_datadir}/augeas/lenses/tests/test_virtvboxd.aug
+%{?with_vbox:%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so}
 %endif
 
 %files client
@@ -826,6 +880,7 @@ fi
 %attr(755,root,root) %{_bindir}/virt-xml-validate
 %attr(755,root,root) %{_bindir}/virt-pki-validate
 %attr(754,root,root) %{_libexecdir}/libvirt-guests.sh
+%{_libdir}/virt-login-shell-helper
 %{_mandir}/man1/virsh.1*
 %{_mandir}/man1/virt-admin.1*
 %{_mandir}/man1/virt-host-validate.1*
@@ -838,6 +893,7 @@ fi
 %{_datadir}/libvirt/schemas/cputypes.rng
 %{_datadir}/libvirt/schemas/domain.rng
 %{_datadir}/libvirt/schemas/domaincaps.rng
+%{_datadir}/libvirt/schemas/domaincheckpoint.rng
 %{_datadir}/libvirt/schemas/domaincommon.rng
 %{_datadir}/libvirt/schemas/domainsnapshot.rng
 %{_datadir}/libvirt/schemas/interface.rng