From bd794c8b00c2612a686e8257ba1c31931ee756c2 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 18 Aug 2019 18:17:24 +0200 Subject: [PATCH] - updated to 5.6.0 --- bashisms.patch | 6 +- libvirt-qemu-acl.patch | 30 +++++----- libvirt-sasl.patch | 108 +++++++++++++++++------------------ libvirt-sysctl-dir.patch | 16 +++--- libvirt-udevadm-settle.patch | 6 +- libvirt.spec | 6 +- 6 files changed, 86 insertions(+), 86 deletions(-) diff --git a/bashisms.patch b/bashisms.patch index 2b33dc4..a9b3bf0 100644 --- a/bashisms.patch +++ b/bashisms.patch @@ -1,6 +1,6 @@ -diff -ur libvirt-5.5.0.orig/tools/libvirt-guests.sh.in libvirt-5.5.0/tools/libvirt-guests.sh.in ---- libvirt-5.5.0.orig/tools/libvirt-guests.sh.in 2019-07-14 19:28:26.639000000 +0200 -+++ libvirt-5.5.0/tools/libvirt-guests.sh.in 2019-07-14 19:28:36.123000000 +0200 +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 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch index 0a9e2d9..6522c73 100644 --- a/libvirt-qemu-acl.patch +++ b/libvirt-qemu-acl.patch @@ -1,7 +1,7 @@ -diff -ur libvirt-5.5.0.orig/src/qemu/qemu_command.c libvirt-5.5.0/src/qemu/qemu_command.c ---- libvirt-5.5.0.orig/src/qemu/qemu_command.c 2019-07-14 19:27:07.837000000 +0200 -+++ libvirt-5.5.0/src/qemu/qemu_command.c 2019-07-14 19:27:29.079000000 +0200 -@@ -8239,6 +8239,10 @@ +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 @@ virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir); /* TODO: Support ACLs later */ @@ -12,9 +12,9 @@ diff -ur libvirt-5.5.0.orig/src/qemu/qemu_command.c libvirt-5.5.0/src/qemu/qemu_ } virCommandAddArg(cmd, "-vnc"); -diff -ur libvirt-5.5.0.orig/src/qemu/qemu.conf libvirt-5.5.0/src/qemu/qemu.conf ---- libvirt-5.5.0.orig/src/qemu/qemu.conf 2019-07-14 19:27:07.837000000 +0200 -+++ libvirt-5.5.0/src/qemu/qemu.conf 2019-07-14 19:27:29.079000000 +0200 +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 @@ -141,6 +141,15 @@ #vnc_sasl = 1 @@ -31,10 +31,10 @@ diff -ur libvirt-5.5.0.orig/src/qemu/qemu.conf libvirt-5.5.0/src/qemu/qemu.conf # The default SASL configuration file is located in /etc/sasl/ # When running libvirtd unprivileged, it may be desirable to # override the configs in this location. Set this parameter to -diff -ur libvirt-5.5.0.orig/src/qemu/qemu_conf.c libvirt-5.5.0/src/qemu/qemu_conf.c ---- libvirt-5.5.0.orig/src/qemu/qemu_conf.c 2019-07-14 19:27:07.836000000 +0200 -+++ libvirt-5.5.0/src/qemu/qemu_conf.c 2019-07-14 19:27:29.079000000 +0200 -@@ -453,6 +453,8 @@ +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 @@ return -1; if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0) return -1; @@ -43,10 +43,10 @@ diff -ur libvirt-5.5.0.orig/src/qemu/qemu_conf.c libvirt-5.5.0/src/qemu/qemu_con return 0; } -diff -ur libvirt-5.5.0.orig/src/qemu/qemu_conf.h libvirt-5.5.0/src/qemu/qemu_conf.h ---- libvirt-5.5.0.orig/src/qemu/qemu_conf.h 2019-07-14 19:27:07.835000000 +0200 -+++ libvirt-5.5.0/src/qemu/qemu_conf.h 2019-07-14 19:27:29.080000000 +0200 -@@ -115,6 +115,7 @@ +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 @@ bool vncTLSx509verify; bool vncTLSx509verifyPresent; bool vncSASL; diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch index d23a770..a33de1c 100644 --- a/libvirt-sasl.patch +++ b/libvirt-sasl.patch @@ -1,6 +1,6 @@ -diff -ur libvirt-5.5.0.orig/docs/auth.html libvirt-5.5.0/docs/auth.html ---- libvirt-5.5.0.orig/docs/auth.html 2019-07-14 19:23:33.979000000 +0200 -+++ libvirt-5.5.0/docs/auth.html 2019-07-14 19:23:54.564000000 +0200 +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 @@

Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a @@ -10,9 +10,9 @@ diff -ur libvirt-5.5.0.orig/docs/auth.html libvirt-5.5.0/docs/auth.html parameter to scram-sha-1.

-diff -ur libvirt-5.5.0.orig/docs/auth.html.in libvirt-5.5.0/docs/auth.html.in ---- libvirt-5.5.0.orig/docs/auth.html.in 2019-07-14 19:23:33.991000000 +0200 -+++ libvirt-5.5.0/docs/auth.html.in 2019-07-14 19:23:54.564000000 +0200 +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 @@

Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a @@ -22,10 +22,10 @@ diff -ur libvirt-5.5.0.orig/docs/auth.html.in libvirt-5.5.0/docs/auth.html.in parameter to scram-sha-1.

-diff -ur libvirt-5.5.0.orig/src/Makefile.in libvirt-5.5.0/src/Makefile.in ---- libvirt-5.5.0.orig/src/Makefile.in 2019-07-14 19:23:33.798000000 +0200 -+++ libvirt-5.5.0/src/Makefile.in 2019-07-14 19:23:54.566000000 +0200 -@@ -6723,7 +6723,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:13:33.904000000 +0200 ++++ libvirt-5.6.0/src/Makefile.in 2019-08-18 18:13:49.485000000 +0200 +@@ -6729,7 +6729,7 @@ # This is needed for clients too, so can't wrap in # the WITH_LIBVIRTD conditional @@ -34,9 +34,9 @@ diff -ur libvirt-5.5.0.orig/src/Makefile.in libvirt-5.5.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 -ur libvirt-5.5.0.orig/src/qemu/qemu.conf libvirt-5.5.0/src/qemu/qemu.conf ---- libvirt-5.5.0.orig/src/qemu/qemu.conf 2019-07-14 19:23:33.825000000 +0200 -+++ libvirt-5.5.0/src/qemu/qemu.conf 2019-07-14 19:23:54.566000000 +0200 +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 @@ -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.5.0.orig/src/qemu/qemu.conf libvirt-5.5.0/src/qemu/qemu.conf # Enable use of TLS encryption on the chardev TCP transports. # -diff -ur libvirt-5.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.5.0/src/qemu/test_libvirtd_qemu.aug.in ---- libvirt-5.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2019-07-14 19:23:33.824000000 +0200 -+++ libvirt-5.5.0/src/qemu/test_libvirtd_qemu.aug.in 2019-07-14 19:23:54.566000000 +0200 +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 @@ -13,7 +13,7 @@ { "vnc_tls_x509_verify" = "1" } { "vnc_password" = "XYZ12345" } @@ -101,10 +101,10 @@ diff -ur libvirt-5.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.5.0/src { "chardev_tls" = "1" } { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" } { "chardev_tls_x509_verify" = "1" } -diff -ur libvirt-5.5.0.orig/src/remote/libvirtd.conf libvirt-5.5.0/src/remote/libvirtd.conf ---- libvirt-5.5.0.orig/src/remote/libvirtd.conf 2019-07-14 19:23:33.810000000 +0200 -+++ libvirt-5.5.0/src/remote/libvirtd.conf 2019-07-14 19:23:54.566000000 +0200 -@@ -101,7 +101,7 @@ +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 @@ # the network providing auth (eg, TLS/x509 certificates) # # - sasl: use SASL infrastructure. The actual auth scheme is then @@ -113,7 +113,7 @@ diff -ur libvirt-5.5.0.orig/src/remote/libvirtd.conf libvirt-5.5.0/src/remote/li # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. # For non-TCP or TLS sockets, any scheme is allowed. # -@@ -132,7 +132,7 @@ +@@ -163,7 +163,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 @@ -122,10 +122,10 @@ diff -ur libvirt-5.5.0.orig/src/remote/libvirtd.conf libvirt-5.5.0/src/remote/li #auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -ur libvirt-5.5.0.orig/src/remote/Makefile.inc.am libvirt-5.5.0/src/remote/Makefile.inc.am ---- libvirt-5.5.0.orig/src/remote/Makefile.inc.am 2019-07-14 19:23:33.812000000 +0200 -+++ libvirt-5.5.0/src/remote/Makefile.inc.am 2019-07-14 19:23:54.567000000 +0200 -@@ -244,7 +244,7 @@ +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 @@ # 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.5.0.orig/src/remote/Makefile.inc.am libvirt-5.5.0/src/remote/ install-sasl: $(MKDIR_P) $(DESTDIR)$(sasldir) -diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args ---- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-07-14 19:23:33.362000000 +0200 -+++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-07-14 19:23:59.923000000 +0200 +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 @@ -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.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libv QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args ---- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2019-07-14 19:23:33.375000000 +0200 -+++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2019-07-14 19:23:59.923000000 +0200 +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 @@ -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.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvir QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args ---- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-07-14 19:23:33.361000000 +0200 -+++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-07-14 19:23:59.923000000 +0200 +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 @@ -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.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args ---- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2019-07-14 19:23:33.375000000 +0200 -+++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2019-07-14 19:26:27.145000000 +0200 +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 @@ -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.5.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.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args ---- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2019-07-14 19:23:33.369000000 +0200 -+++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2019-07-14 19:26:23.287000000 +0200 +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 @@ -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.5.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.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args ---- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2019-07-14 19:23:33.371000000 +0200 -+++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2019-07-14 19:26:19.952000000 +0200 +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 @@ -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.5.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.5.0.orig/tests/qemuxml2argvtest.c libvirt-5.5.0/tests/qemuxml2argvtest.c ---- libvirt-5.5.0.orig/tests/qemuxml2argvtest.c 2019-07-14 19:23:33.401000000 +0200 -+++ libvirt-5.5.0/tests/qemuxml2argvtest.c 2019-07-14 19:23:59.924000000 +0200 -@@ -1155,7 +1155,7 @@ +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 @@ driver.config->vncSASL = 1; VIR_FREE(driver.config->vncSASLdir); @@ -218,7 +218,7 @@ diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvtest.c libvirt-5.5.0/tests/qemuxml DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); driver.config->vncTLS = 1; driver.config->vncTLSx509verify = 1; -@@ -1187,7 +1187,7 @@ +@@ -1209,7 +1209,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.5.0.orig/tests/qemuxml2argvtest.c libvirt-5.5.0/tests/qemuxml DO_TEST("graphics-spice-sasl", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_QXL); -diff -ur libvirt-5.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.5.0/tests/virconfdata/libvirtd.conf ---- libvirt-5.5.0.orig/tests/virconfdata/libvirtd.conf 2019-07-14 19:23:33.602000000 +0200 -+++ libvirt-5.5.0/tests/virconfdata/libvirtd.conf 2019-07-14 19:23:59.924000000 +0200 +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 @@ -91,7 +91,7 @@ # the network providing auth (eg, TLS/x509 certificates) # @@ -248,9 +248,9 @@ diff -ur libvirt-5.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.5.0/tests/ auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -ur libvirt-5.5.0.orig/tests/virconfdata/libvirtd.out libvirt-5.5.0/tests/virconfdata/libvirtd.out ---- libvirt-5.5.0.orig/tests/virconfdata/libvirtd.out 2019-07-14 19:23:33.602000000 +0200 -+++ libvirt-5.5.0/tests/virconfdata/libvirtd.out 2019-07-14 19:23:59.924000000 +0200 +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 @@ -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 d6afa50..f5f25ea 100644 --- a/libvirt-sysctl-dir.patch +++ b/libvirt-sysctl-dir.patch @@ -1,7 +1,7 @@ -diff -ur libvirt-5.5.0.orig/src/Makefile.in libvirt-5.5.0/src/Makefile.in ---- libvirt-5.5.0.orig/src/Makefile.in 2019-07-14 19:28:49.824000000 +0200 -+++ libvirt-5.5.0/src/Makefile.in 2019-07-14 19:29:06.685000000 +0200 -@@ -6716,7 +6716,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 @@ # 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.5.0.orig/src/Makefile.in libvirt-5.5.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.5.0.orig/src/remote/Makefile.inc.am libvirt-5.5.0/src/remote/Makefile.inc.am ---- libvirt-5.5.0.orig/src/remote/Makefile.inc.am 2019-07-14 19:28:49.809000000 +0200 -+++ libvirt-5.5.0/src/remote/Makefile.inc.am 2019-07-14 19:29:06.685000000 +0200 -@@ -195,7 +195,7 @@ +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 @@ 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 2df8d82..5f8b62f 100644 --- a/libvirt-udevadm-settle.patch +++ b/libvirt-udevadm-settle.patch @@ -1,6 +1,6 @@ -diff -ur libvirt-5.5.0.orig/src/util/virutil.c libvirt-5.5.0/src/util/virutil.c ---- libvirt-5.5.0.orig/src/util/virutil.c 2019-07-14 19:27:54.120000000 +0200 -+++ libvirt-5.5.0/src/util/virutil.c 2019-07-14 19:28:08.383000000 +0200 +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 @@ -1488,7 +1488,7 @@ if (!(udev = virFindFileInPath(UDEVADM))) return; diff --git a/libvirt.spec b/libvirt.spec index aec74c7..43e0839 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -45,12 +45,12 @@ Summary: Toolkit to interact with virtualization capabilities Summary(pl.UTF-8): Narzędzia współpracujące z funkcjami wirtualizacji Name: libvirt -Version: 5.5.0 -Release: 2 +Version: 5.6.0 +Release: 1 License: LGPL v2.1+ Group: Libraries Source0: http://libvirt.org/sources/libvirt-%{version}.tar.xz -# Source0-md5: 27c5fb6c8d2d46eb9e8165aeb3b499b0 +# Source0-md5: e818bb25ead24119925781b7519a8401 Source1: libvirtd.init Source2: virtlockd.init Source3: virtlogd.init -- 2.46.0