From fb9ba66439cd633004f1975095e9ddb1b47a0234 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sat, 7 Mar 2020 00:43:51 +0100 Subject: [PATCH] - updated to 6.1.0 --- bashisms.patch | 6 +- libvirt-qemu-acl.patch | 28 ++++----- libvirt-sasl.patch | 112 +++++++++++++++++------------------ libvirt-sysctl-dir.patch | 16 ++--- libvirt-udevadm-settle.patch | 8 +-- libvirt.spec | 11 +++- 6 files changed, 94 insertions(+), 87 deletions(-) diff --git a/bashisms.patch b/bashisms.patch index 89ea395..1f86d16 100644 --- a/bashisms.patch +++ b/bashisms.patch @@ -1,6 +1,6 @@ -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 +diff -ur libvirt-6.1.0.orig/tools/libvirt-guests.sh.in libvirt-6.1.0/tools/libvirt-guests.sh.in +--- libvirt-6.1.0.orig/tools/libvirt-guests.sh.in 2020-03-06 09:51:29.981000000 +0100 ++++ libvirt-6.1.0/tools/libvirt-guests.sh.in 2020-03-06 09:51:54.935000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch index f709a32..03959ac 100644 --- a/libvirt-qemu-acl.patch +++ b/libvirt-qemu-acl.patch @@ -1,6 +1,6 @@ -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 +diff -ur libvirt-6.1.0.orig/src/qemu/qemu.conf libvirt-6.1.0/src/qemu/qemu.conf +--- libvirt-6.1.0.orig/src/qemu/qemu.conf 2020-03-06 09:49:35.413000000 +0100 ++++ libvirt-6.1.0/src/qemu/qemu.conf 2020-03-06 09:50:04.229000000 +0100 @@ -141,6 +141,15 @@ #vnc_sasl = 1 @@ -17,10 +17,10 @@ diff -ur libvirt-5.10.0.orig/src/qemu/qemu.conf libvirt-5.10.0/src/qemu/qemu.con # 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.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 @@ +diff -ur libvirt-6.1.0.orig/src/qemu/qemu_command.c libvirt-6.1.0/src/qemu/qemu_command.c +--- libvirt-6.1.0.orig/src/qemu/qemu_command.c 2020-03-06 09:49:35.413000000 +0100 ++++ libvirt-6.1.0/src/qemu/qemu_command.c 2020-03-06 09:50:04.230000000 +0100 +@@ -7569,6 +7569,10 @@ virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir); /* TODO: Support ACLs later */ @@ -31,10 +31,10 @@ diff -ur libvirt-5.10.0.orig/src/qemu/qemu_command.c libvirt-5.10.0/src/qemu/qem } 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 @@ +diff -ur libvirt-6.1.0.orig/src/qemu/qemu_conf.c libvirt-6.1.0/src/qemu/qemu_conf.c +--- libvirt-6.1.0.orig/src/qemu/qemu_conf.c 2020-03-06 09:49:35.410000000 +0100 ++++ libvirt-6.1.0/src/qemu/qemu_conf.c 2020-03-06 09:50:04.230000000 +0100 +@@ -428,6 +428,8 @@ return -1; if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0) return -1; @@ -43,9 +43,9 @@ diff -ur libvirt-5.10.0.orig/src/qemu/qemu_conf.c libvirt-5.10.0/src/qemu/qemu_c return 0; } -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 +diff -ur libvirt-6.1.0.orig/src/qemu/qemu_conf.h libvirt-6.1.0/src/qemu/qemu_conf.h +--- libvirt-6.1.0.orig/src/qemu/qemu_conf.h 2020-03-06 09:49:35.409000000 +0100 ++++ libvirt-6.1.0/src/qemu/qemu_conf.h 2020-03-06 09:50:04.230000000 +0100 @@ -118,6 +118,7 @@ bool vncTLSx509verify; bool vncTLSx509verifyPresent; diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch index 913e1dd..1ebc932 100644 --- a/libvirt-sasl.patch +++ b/libvirt-sasl.patch @@ -1,19 +1,19 @@ -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 +diff -ur libvirt-6.1.0.orig/docs/auth.html.in libvirt-6.1.0/docs/auth.html.in +--- libvirt-6.1.0.orig/docs/auth.html.in 2020-03-06 09:47:34.102000000 +0100 ++++ libvirt-6.1.0/docs/auth.html.in 2020-03-06 09:48:38.900000000 +0100 @@ -275,7 +275,7 @@

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 + config change is required to enable plain password auth. This is done by -editting /etc/sasl2/libvirt.conf to set the mech_list +editting /etc/sasl/libvirt.conf to set the mech_list parameter to scram-sha-1.

-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 @@ +diff -ur libvirt-6.1.0.orig/src/Makefile.in libvirt-6.1.0/src/Makefile.in +--- libvirt-6.1.0.orig/src/Makefile.in 2020-03-06 09:47:34.051000000 +0100 ++++ libvirt-6.1.0/src/Makefile.in 2020-03-06 09:47:52.660000000 +0100 +@@ -6273,7 +6273,7 @@ # This is needed for clients too, so can't wrap in # the WITH_LIBVIRTD conditional @@ -22,9 +22,9 @@ diff -ur libvirt-5.10.0.orig/src/Makefile.in libvirt-5.10.0/src/Makefile.in LIBVIRTD_UNIT_VARS = \ $(COMMON_UNIT_VARS) \ -e 's|[@]name[@]|Libvirt|g' \ -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 +diff -ur libvirt-6.1.0.orig/src/qemu/qemu.conf libvirt-6.1.0/src/qemu/qemu.conf +--- libvirt-6.1.0.orig/src/qemu/qemu.conf 2020-03-06 09:47:34.078000000 +0100 ++++ libvirt-6.1.0/src/qemu/qemu.conf 2020-03-06 09:47:52.660000000 +0100 @@ -135,18 +135,18 @@ # Examples include vinagre, virt-viewer and virt-manager # itself. UltraVNC, RealVNC, TightVNC do not support this @@ -68,9 +68,9 @@ diff -ur libvirt-5.10.0.orig/src/qemu/qemu.conf libvirt-5.10.0/src/qemu/qemu.con # Enable use of TLS encryption on the chardev TCP transports. # -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 +diff -ur libvirt-6.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-6.1.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-6.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2020-03-06 09:47:34.077000000 +0100 ++++ libvirt-6.1.0/src/qemu/test_libvirtd_qemu.aug.in 2020-03-06 09:47:52.661000000 +0100 @@ -13,7 +13,7 @@ { "vnc_tls_x509_verify" = "1" } { "vnc_password" = "XYZ12345" } @@ -89,10 +89,10 @@ diff -ur libvirt-5.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.10.0/s { "chardev_tls" = "1" } { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" } { "chardev_tls_x509_verify" = "1" } -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 @@ +diff -ur libvirt-6.1.0.orig/src/remote/Makefile.inc.am libvirt-6.1.0/src/remote/Makefile.inc.am +--- libvirt-6.1.0.orig/src/remote/Makefile.inc.am 2020-03-06 09:47:34.063000000 +0100 ++++ libvirt-6.1.0/src/remote/Makefile.inc.am 2020-03-06 09:47:52.661000000 +0100 +@@ -382,7 +382,7 @@ # This is needed for clients too, so can't wrap in # the WITH_LIBVIRTD conditional if WITH_SASL @@ -101,9 +101,9 @@ diff -ur libvirt-5.10.0.orig/src/remote/Makefile.inc.am libvirt-5.10.0/src/remot 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 +diff -ur libvirt-6.1.0.orig/src/remote/libvirtd.conf.in libvirt-6.1.0/src/remote/libvirtd.conf.in +--- libvirt-6.1.0.orig/src/remote/libvirtd.conf.in 2020-03-06 09:47:34.063000000 +0100 ++++ libvirt-6.1.0/src/remote/libvirtd.conf.in 2020-03-06 09:47:52.661000000 +0100 @@ -134,7 +134,7 @@ # the network providing auth (eg, TLS/x509 certificates) # @@ -122,9 +122,9 @@ diff -ur libvirt-5.10.0.orig/src/remote/libvirtd.conf.in libvirt-5.10.0/src/remo #auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -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 +diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args +--- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2020-03-06 09:47:33.713000000 +0100 ++++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2020-03-06 09:47:52.661000000 +0100 @@ -6,7 +6,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ @@ -132,11 +132,11 @@ diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args lib -SASL_CONF_PATH=/root/.sasl2 \ +SASL_CONF_PATH=/root/.sasl \ QEMU_AUDIO_DRV=spice \ - /usr/bin/qemu-system-i686 \ + /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -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 +diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args +--- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2020-03-06 09:47:33.722000000 +0100 ++++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2020-03-06 09:47:52.662000000 +0100 @@ -6,7 +6,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ @@ -144,11 +144,11 @@ diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvi -SASL_CONF_PATH=/root/.sasl2 \ +SASL_CONF_PATH=/root/.sasl \ QEMU_AUDIO_DRV=none \ - /usr/bin/qemu-system-i686 \ + /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -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 +diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args +--- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2020-03-06 09:47:33.722000000 +0100 ++++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2020-03-06 09:47:52.662000000 +0100 @@ -6,7 +6,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ @@ -156,11 +156,11 @@ diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_ -SASL_CONF_PATH=/root/.sasl2 \ +SASL_CONF_PATH=/root/.sasl \ QEMU_AUDIO_DRV=none \ - /usr/bin/qemu-system-i686 \ + /usr/bin/qemu-system-i386 \ -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 +diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args +--- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2020-03-06 09:47:33.713000000 +0100 ++++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2020-03-06 09:47:52.663000000 +0100 @@ -6,7 +6,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ @@ -168,11 +168,11 @@ diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvir -SASL_CONF_PATH=/root/.sasl2 \ +SASL_CONF_PATH=/root/.sasl \ QEMU_AUDIO_DRV=none \ - /usr/bin/qemu-system-i686 \ + /usr/bin/qemu-system-i386 \ -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 +diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args +--- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2020-03-06 09:47:33.718000000 +0100 ++++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2020-03-06 09:47:52.663000000 +0100 @@ -6,7 +6,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ @@ -180,11 +180,11 @@ diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4. -SASL_CONF_PATH=/root/.sasl2 \ +SASL_CONF_PATH=/root/.sasl \ QEMU_AUDIO_DRV=none \ - /usr/bin/qemu-system-i686 \ + /usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -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 +diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args +--- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2020-03-06 09:47:33.719000000 +0100 ++++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2020-03-06 09:47:52.664000000 +0100 @@ -6,7 +6,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ @@ -192,12 +192,12 @@ diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-late -SASL_CONF_PATH=/root/.sasl2 \ +SASL_CONF_PATH=/root/.sasl \ QEMU_AUDIO_DRV=none \ - /usr/bin/qemu-system-i686 \ + /usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -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 @@ +diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvtest.c libvirt-6.1.0/tests/qemuxml2argvtest.c +--- libvirt-6.1.0.orig/tests/qemuxml2argvtest.c 2020-03-06 09:47:33.741000000 +0100 ++++ libvirt-6.1.0/tests/qemuxml2argvtest.c 2020-03-06 09:47:52.665000000 +0100 +@@ -1197,7 +1197,7 @@ driver.config->vncSASL = 1; VIR_FREE(driver.config->vncSASLdir); @@ -206,7 +206,7 @@ diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvtest.c libvirt-5.10.0/tests/qemux DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); driver.config->vncTLS = 1; driver.config->vncTLSx509verify = 1; -@@ -1218,7 +1218,7 @@ +@@ -1227,7 +1227,7 @@ DO_TEST("graphics-spice-no-args", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA); driver.config->spiceSASL = 1; @@ -215,9 +215,9 @@ diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvtest.c libvirt-5.10.0/tests/qemux DO_TEST("graphics-spice-sasl", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_QXL); -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 +diff -ur libvirt-6.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-6.1.0/tests/virconfdata/libvirtd.conf +--- libvirt-6.1.0.orig/tests/virconfdata/libvirtd.conf 2020-03-06 09:47:33.909000000 +0100 ++++ libvirt-6.1.0/tests/virconfdata/libvirtd.conf 2020-03-06 09:47:52.665000000 +0100 @@ -91,7 +91,7 @@ # the network providing auth (eg, TLS/x509 certificates) # @@ -236,9 +236,9 @@ diff -ur libvirt-5.10.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.10.0/test auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -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 +diff -ur libvirt-6.1.0.orig/tests/virconfdata/libvirtd.out libvirt-6.1.0/tests/virconfdata/libvirtd.out +--- libvirt-6.1.0.orig/tests/virconfdata/libvirtd.out 2020-03-06 09:47:33.909000000 +0100 ++++ libvirt-6.1.0/tests/virconfdata/libvirtd.out 2020-03-06 09:47:52.665000000 +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 2b890d7..e6b16f8 100644 --- a/libvirt-sysctl-dir.patch +++ b/libvirt-sysctl-dir.patch @@ -1,7 +1,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 @@ +diff -ur libvirt-6.1.0.orig/src/Makefile.in libvirt-6.1.0/src/Makefile.in +--- libvirt-6.1.0.orig/src/Makefile.in 2020-03-06 09:52:13.294000000 +0100 ++++ libvirt-6.1.0/src/Makefile.in 2020-03-06 09:52:22.081000000 +0100 +@@ -6266,7 +6266,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.10.0.orig/src/Makefile.in libvirt-5.10.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.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 @@ +diff -ur libvirt-6.1.0.orig/src/remote/Makefile.inc.am libvirt-6.1.0/src/remote/Makefile.inc.am +--- libvirt-6.1.0.orig/src/remote/Makefile.inc.am 2020-03-06 09:52:13.305000000 +0100 ++++ libvirt-6.1.0/src/remote/Makefile.inc.am 2020-03-06 09:52:22.081000000 +0100 +@@ -334,7 +334,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 7c93bf0..19ac146 100644 --- a/libvirt-udevadm-settle.patch +++ b/libvirt-udevadm-settle.patch @@ -1,7 +1,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 @@ +diff -ur libvirt-6.1.0.orig/src/util/virutil.c libvirt-6.1.0/src/util/virutil.c +--- libvirt-6.1.0.orig/src/util/virutil.c 2020-03-06 09:50:30.870000000 +0100 ++++ libvirt-6.1.0/src/util/virutil.c 2020-03-06 09:50:47.350000000 +0100 +@@ -1332,7 +1332,7 @@ if (!(udev = virFindFileInPath(UDEVADM))) return; diff --git a/libvirt.spec b/libvirt.spec index a785c89..e0ff411 100644 --- 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.10.0 +Version: 6.1.0 Release: 1 License: LGPL v2.1+ Group: Libraries Source0: http://libvirt.org/sources/libvirt-%{version}.tar.xz -# Source0-md5: d15aaba3f1e7dc311aacbded48f0dff7 +# Source0-md5: a870e63f20fac2ccf98e716d05256145 Source1: libvirtd.init Source2: virtlockd.init Source3: virtlogd.init @@ -884,6 +884,9 @@ fi %attr(4755,root,root) %{_bindir}/virt-login-shell %attr(755,root,root) %{_bindir}/virt-xml-validate %attr(755,root,root) %{_bindir}/virt-pki-validate +%if %{with qemu} +%attr(755,root,root) %{_bindir}/virt-qemu-run +%endif %attr(754,root,root) %{_libexecdir}/libvirt-guests.sh %{_libdir}/virt-login-shell-helper %{_mandir}/man1/virsh.1* @@ -892,11 +895,15 @@ fi %{_mandir}/man1/virt-login-shell.1* %{_mandir}/man1/virt-xml-validate.1* %{_mandir}/man1/virt-pki-validate.1* +%if %{with qemu} +%{_mandir}/man1/virt-qemu-run.1* +%endif %dir %{_datadir}/libvirt/schemas %{_datadir}/libvirt/schemas/basictypes.rng %{_datadir}/libvirt/schemas/capability.rng %{_datadir}/libvirt/schemas/cputypes.rng %{_datadir}/libvirt/schemas/domain.rng +%{_datadir}/libvirt/schemas/domainbackup.rng %{_datadir}/libvirt/schemas/domaincaps.rng %{_datadir}/libvirt/schemas/domaincheckpoint.rng %{_datadir}/libvirt/schemas/domaincommon.rng -- 2.44.0