- updated to 5.10.0

diff --git a/bashisms.patch b/bashisms.patch
index 3f7dac0445a1fbcf94e50de9720edebb9f91348c..89ea39551c44b38d17de0cc04cd42a4b56a63afb 100644 (file)
--- a/bashisms.patch
+++ b/bashisms.patch
@@ -1,6 +1,6 @@
-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
+diff -ur libvirt-5.10.0.orig/tools/libvirt-guests.sh.in libvirt-5.10.0/tools/libvirt-guests.sh.in
+--- libvirt-5.10.0.orig/tools/libvirt-guests.sh.in     2019-12-08 00:46:13.734000000 +0100
++++ libvirt-5.10.0/tools/libvirt-guests.sh.in  2019-12-08 00:46:24.889000000 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index d473146cbee36426ae3d78eac7fe6725a0d32339..f709a32a38a3db42ba1557c6039a6b284a86bf0d 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,20 +1,6 @@
-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 */
-+
-+        if (cfg->vncACL)
-+           virBufferAddLit(&opt, ",acl");
-+
-     }
- 
-     virCommandAddArg(cmd, "-vnc");
-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
+diff -ur libvirt-5.10.0.orig/src/qemu/qemu.conf libvirt-5.10.0/src/qemu/qemu.conf
+--- libvirt-5.10.0.orig/src/qemu/qemu.conf     2019-12-08 00:44:49.154000000 +0100
++++ libvirt-5.10.0/src/qemu/qemu.conf  2019-12-08 00:45:04.937000000 +0100
 @@ -141,6 +141,15 @@
  #vnc_sasl = 1
  
@@ -31,10 +17,24 @@ diff -ur libvirt-5.8.0.orig/src/qemu/qemu.conf libvirt-5.8.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.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 @@
+diff -ur libvirt-5.10.0.orig/src/qemu/qemu_command.c libvirt-5.10.0/src/qemu/qemu_command.c
+--- libvirt-5.10.0.orig/src/qemu/qemu_command.c        2019-12-08 00:44:49.154000000 +0100
++++ libvirt-5.10.0/src/qemu/qemu_command.c     2019-12-08 00:45:04.937000000 +0100
+@@ -7875,6 +7875,10 @@
+             virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
+ 
+         /* TODO: Support ACLs later */
++
++        if (cfg->vncACL)
++           virBufferAddLit(&opt, ",acl");
++
+     }
+ 
+     virCommandAddArg(cmd, "-vnc");
+diff -ur libvirt-5.10.0.orig/src/qemu/qemu_conf.c libvirt-5.10.0/src/qemu/qemu_conf.c
+--- libvirt-5.10.0.orig/src/qemu/qemu_conf.c   2019-12-08 00:44:49.152000000 +0100
++++ libvirt-5.10.0/src/qemu/qemu_conf.c        2019-12-08 00:45:04.937000000 +0100
+@@ -400,6 +400,8 @@
          return -1;
      if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
          return -1;
@@ -43,9 +43,9 @@ diff -ur libvirt-5.8.0.orig/src/qemu/qemu_conf.c libvirt-5.8.0/src/qemu/qemu_con
  
      return 0;
  }
-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
+diff -ur libvirt-5.10.0.orig/src/qemu/qemu_conf.h libvirt-5.10.0/src/qemu/qemu_conf.h
+--- libvirt-5.10.0.orig/src/qemu/qemu_conf.h   2019-12-08 00:44:49.151000000 +0100
++++ libvirt-5.10.0/src/qemu/qemu_conf.h        2019-12-08 00:45:04.937000000 +0100
 @@ -118,6 +118,7 @@
      bool vncTLSx509verify;
      bool vncTLSx509verifyPresent;

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index bf92ef0491841dcb18e14a29cd5319010a783603..913e1dd7e915b8cefdc4e00190666544adf8e976 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,18 +1,6 @@
-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
--editting <code>/etc/sasl2/libvirt.conf</code> to set the <code>mech_list</code>
-+editting <code>/etc/sasl/libvirt.conf</code> to set the <code>mech_list</code>
- parameter to <code>scram-sha-1</code>.
-     </p>
-         <p>
-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
+diff -ur libvirt-5.10.0.orig/docs/auth.html.in libvirt-5.10.0/docs/auth.html.in
+--- libvirt-5.10.0.orig/docs/auth.html.in      2019-12-08 00:42:43.765000000 +0100
++++ libvirt-5.10.0/docs/auth.html.in   2019-12-08 00:43:02.262000000 +0100
 @@ -275,7 +275,7 @@
      <p>
  Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
@@ -22,10 +10,10 @@ diff -ur libvirt-5.8.0.orig/docs/auth.html.in libvirt-5.8.0/docs/auth.html.in
  parameter to <code>scram-sha-1</code>.
      </p>
      <p>
-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 @@
+diff -ur libvirt-5.10.0.orig/src/Makefile.in libvirt-5.10.0/src/Makefile.in
+--- libvirt-5.10.0.orig/src/Makefile.in        2019-12-08 00:42:43.668000000 +0100
++++ libvirt-5.10.0/src/Makefile.in     2019-12-08 00:43:02.265000000 +0100
+@@ -7409,7 +7409,7 @@
  
  # This is needed for clients too, so can't wrap in
  # the WITH_LIBVIRTD conditional
@@ -34,9 +22,9 @@ diff -ur libvirt-5.8.0.orig/src/Makefile.in libvirt-5.8.0/src/Makefile.in
  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
+diff -ur libvirt-5.10.0.orig/src/qemu/qemu.conf libvirt-5.10.0/src/qemu/qemu.conf
+--- libvirt-5.10.0.orig/src/qemu/qemu.conf     2019-12-08 00:42:43.698000000 +0100
++++ libvirt-5.10.0/src/qemu/qemu.conf  2019-12-08 00:43:02.265000000 +0100
 @@ -135,18 +135,18 @@
  # Examples include vinagre, virt-viewer and virt-manager
  # itself. UltraVNC, RealVNC, TightVNC do not support this
@@ -80,9 +68,9 @@ diff -ur libvirt-5.8.0.orig/src/qemu/qemu.conf libvirt-5.8.0/src/qemu/qemu.conf
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-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
+diff -ur libvirt-5.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.10.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-5.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in     2019-12-08 00:42:43.697000000 +0100
++++ libvirt-5.10.0/src/qemu/test_libvirtd_qemu.aug.in  2019-12-08 00:43:02.265000000 +0100
 @@ -13,7 +13,7 @@
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
@@ -101,9 +89,21 @@ diff -ur libvirt-5.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.8.0/src
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-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
+diff -ur libvirt-5.10.0.orig/src/remote/Makefile.inc.am libvirt-5.10.0/src/remote/Makefile.inc.am
+--- libvirt-5.10.0.orig/src/remote/Makefile.inc.am     2019-12-08 00:42:43.683000000 +0100
++++ libvirt-5.10.0/src/remote/Makefile.inc.am  2019-12-08 00:43:02.266000000 +0100
+@@ -375,7 +375,7 @@
+ # This is needed for clients too, so can't wrap in
+ # the WITH_LIBVIRTD conditional
+ if WITH_SASL
+-sasldir = $(sysconfdir)/sasl2
++sasldir = $(sysconfdir)/sasl
+ 
+ install-sasl:
+       $(MKDIR_P) $(DESTDIR)$(sasldir)
+diff -ur libvirt-5.10.0.orig/src/remote/libvirtd.conf.in libvirt-5.10.0/src/remote/libvirtd.conf.in
+--- libvirt-5.10.0.orig/src/remote/libvirtd.conf.in    2019-12-08 00:42:43.683000000 +0100
++++ libvirt-5.10.0/src/remote/libvirtd.conf.in 2019-12-08 00:43:02.266000000 +0100
 @@ -134,7 +134,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -122,21 +122,9 @@ diff -ur libvirt-5.8.0.orig/src/remote/libvirtd.conf.in libvirt-5.8.0/src/remote
  #auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-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
--sasldir = $(sysconfdir)/sasl2
-+sasldir = $(sysconfdir)/sasl
- 
- install-sasl:
-       $(MKDIR_P) $(DESTDIR)$(sasldir)
-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
+diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
+--- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args        2019-12-08 00:42:43.289000000 +0100
++++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-spice-sasl.args     2019-12-08 00:43:02.266000000 +0100
 @@ -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 +134,9 @@ diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libv
  QEMU_AUDIO_DRV=spice \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-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
+diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+--- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args  2019-12-08 00:42:43.303000000 +0100
++++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args       2019-12-08 00:43:02.266000000 +0100
 @@ -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 +146,9 @@ diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvir
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-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
+diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+--- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args      2019-12-08 00:42:43.303000000 +0100
++++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args   2019-12-08 00:43:02.266000000 +0100
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -169,10 +157,10 @@ diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt
 +SASL_CONF_PATH=/root/.sasl \
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
- -name QEMUGuest1 \
-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
+ -name guest=QEMUGuest1,debug-threads=on \
+diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
+--- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args   2019-12-08 00:42:43.289000000 +0100
++++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.args        2019-12-08 00:43:02.266000000 +0100
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -181,10 +169,10 @@ diff -ur libvirt-5.8.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_6
 +SASL_CONF_PATH=/root/.sasl \
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
- -name guest=QEMUGuest1,debug-threads=on \
-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
+ -name QEMUGuest1 \
+diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
+--- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args      2019-12-08 00:42:43.297000000 +0100
++++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args   2019-12-08 00:43:02.267000000 +0100
 @@ -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 +182,9 @@ diff -ur libvirt-5.8.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.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
+diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+--- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args     2019-12-08 00:42:43.299000000 +0100
++++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args  2019-12-08 00:43:02.298000000 +0100
 @@ -6,7 +6,7 @@
  XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
  XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
@@ -206,30 +194,30 @@ diff -ur libvirt-5.8.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.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 @@
+diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvtest.c libvirt-5.10.0/tests/qemuxml2argvtest.c
+--- libvirt-5.10.0.orig/tests/qemuxml2argvtest.c       2019-12-08 00:42:43.258000000 +0100
++++ libvirt-5.10.0/tests/qemuxml2argvtest.c    2019-12-08 00:43:42.225000000 +0100
+@@ -1188,7 +1188,7 @@
  
      driver.config->vncSASL = 1;
      VIR_FREE(driver.config->vncSASLdir);
--    ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl2"));
-+    ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl"));
+-    driver.config->vncSASLdir = g_strdup("/root/.sasl2");
++    driver.config->vncSASLdir = g_strdup("/root/.sasl");
      DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->vncTLS = 1;
      driver.config->vncTLSx509verify = 1;
-@@ -1247,7 +1247,7 @@
+@@ -1218,7 +1218,7 @@
      DO_TEST("graphics-spice-no-args",
              QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->spiceSASL = 1;
--    ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl2"));
-+    ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl"));
+-    driver.config->spiceSASLdir = g_strdup("/root/.sasl2");
++    driver.config->spiceSASLdir = g_strdup("/root/.sasl");
      DO_TEST("graphics-spice-sasl",
              QEMU_CAPS_SPICE,
              QEMU_CAPS_DEVICE_QXL);
-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
+diff -ur libvirt-5.10.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.10.0/tests/virconfdata/libvirtd.conf
+--- libvirt-5.10.0.orig/tests/virconfdata/libvirtd.conf        2019-12-08 00:42:43.506000000 +0100
++++ libvirt-5.10.0/tests/virconfdata/libvirtd.conf     2019-12-08 00:43:02.300000000 +0100
 @@ -91,7 +91,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
@@ -248,9 +236,9 @@ diff -ur libvirt-5.8.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.8.0/tests/
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-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
+diff -ur libvirt-5.10.0.orig/tests/virconfdata/libvirtd.out libvirt-5.10.0/tests/virconfdata/libvirtd.out
+--- libvirt-5.10.0.orig/tests/virconfdata/libvirtd.out 2019-12-08 00:42:43.506000000 +0100
++++ libvirt-5.10.0/tests/virconfdata/libvirtd.out      2019-12-08 00:43:02.300000000 +0100
 @@ -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 51b44c9511fd446525bcd3c5dc2646d335f475db..2b890d75c501720ae44cd37c2212f6a00e388d52 100644 (file)
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,7 +1,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 @@
+diff -ur libvirt-5.10.0.orig/src/Makefile.in libvirt-5.10.0/src/Makefile.in
+--- libvirt-5.10.0.orig/src/Makefile.in        2019-12-08 00:46:48.402000000 +0100
++++ libvirt-5.10.0/src/Makefile.in     2019-12-08 00:46:58.276000000 +0100
+@@ -7402,7 +7402,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.8.0.orig/src/Makefile.in libvirt-5.8.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.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 @@
+diff -ur libvirt-5.10.0.orig/src/remote/Makefile.inc.am libvirt-5.10.0/src/remote/Makefile.inc.am
+--- libvirt-5.10.0.orig/src/remote/Makefile.inc.am     2019-12-08 00:46:48.414000000 +0100
++++ libvirt-5.10.0/src/remote/Makefile.inc.am  2019-12-08 00:46:58.277000000 +0100
+@@ -327,7 +327,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 fc862ab3b7fe4588fff584d61a8d1afbe1c5282e..7c93bf01fac5271dcda938dce9bf40c12f66175b 100644 (file)
--- a/libvirt-udevadm-settle.patch
+++ b/libvirt-udevadm-settle.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -ur libvirt-5.10.0.orig/src/util/virutil.c libvirt-5.10.0/src/util/virutil.c
+--- libvirt-5.10.0.orig/src/util/virutil.c     2019-12-08 00:45:32.458000000 +0100
++++ libvirt-5.10.0/src/util/virutil.c  2019-12-08 00:45:46.793000000 +0100
+@@ -1485,7 +1485,7 @@
      if (!(udev = virFindFileInPath(UDEVADM)))
          return;
  

diff --git a/libvirt.spec b/libvirt.spec
index 82b25cff93009f40d7d9eb2ad5657c48669ff4e0..a785c8999527cded82e8e96d0cba410edb126274 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -43,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.8.0
+Version:       5.10.0
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5: 3f33359d42e4e996c93f6864b4a89a09
+# Source0-md5: d15aaba3f1e7dc311aacbded48f0dff7
 Source1:       libvirtd.init
 Source2:       virtlockd.init
 Source3:       virtlogd.init
@@ -457,7 +457,10 @@ Moduł sekcji Wiresharka do pakietów libvirt.
 %{__autoheader}
 %{__automake}
 
-%configure \
+install -d build
+cd build
+
+../%configure \
        PVCREATE=/sbin/pvcreate \
        VGCREATE=/sbin/vgcreate \
        LVCREATE=/sbin/lvcreate \
@@ -543,11 +546,13 @@ Moduł sekcji Wiresharka do pakietów libvirt.
 %{__make} \
        AWK=gawk
 
+cd ..
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{sysconfig,sysctl.d,rc.d/init.d}
 
-%{__make} install \
+%{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirtd