From 69c354bc3e587972c43559ff76dfe363a23f26cb Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 3 Jun 2022 00:38:05 +0200 Subject: [PATCH] - updated to 8.4.0 --- bashisms.patch | 33 ++++++++++- libvirt-qemu-acl.patch | 60 +++++++++---------- libvirt-sasl.patch | 110 ++++++++++++++--------------------- libvirt-sysctl-dir.patch | 16 ++--- libvirt-udevadm-settle.patch | 8 +-- libvirt.spec | 6 +- 6 files changed, 118 insertions(+), 115 deletions(-) diff --git a/bashisms.patch b/bashisms.patch index 66abdf4..3a48fd7 100644 --- a/bashisms.patch +++ b/bashisms.patch @@ -1,9 +1,36 @@ -diff -ur libvirt-7.5.0.orig/tools/libvirt-guests.sh.in libvirt-7.5.0/tools/libvirt-guests.sh.in ---- libvirt-7.5.0.orig/tools/libvirt-guests.sh.in 2021-07-10 01:21:48.420677568 +0200 -+++ libvirt-7.5.0/tools/libvirt-guests.sh.in 2021-07-10 01:21:55.874677568 +0200 +diff -ur libvirt-8.4.0.orig/tools/libvirt-guests.sh.in libvirt-8.4.0/tools/libvirt-guests.sh.in +--- libvirt-8.4.0.orig/tools/libvirt-guests.sh.in 2022-06-03 00:15:20.548557875 +0200 ++++ libvirt-8.4.0/tools/libvirt-guests.sh.in 2022-06-03 00:15:31.627580007 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright (C) 2011-2014 Red Hat, Inc. # +diff -ur libvirt-8.4.0.orig/tools/virt-pki-validate.in libvirt-8.4.0/tools/virt-pki-validate.in +--- libvirt-8.4.0.orig/tools/virt-pki-validate.in 2022-06-03 00:15:20.552557883 +0200 ++++ libvirt-8.4.0/tools/virt-pki-validate.in 2022-06-03 00:17:33.367826199 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # This shell script checks the TLS certificates and options needed + # for the secure client/server support of libvirt as documented at +diff -ur libvirt-8.4.0.orig/tools/virt-sanlock-cleanup.in libvirt-8.4.0/tools/virt-sanlock-cleanup.in +--- libvirt-8.4.0.orig/tools/virt-sanlock-cleanup.in 2022-06-03 00:15:20.552557883 +0200 ++++ libvirt-8.4.0/tools/virt-sanlock-cleanup.in 2022-06-03 00:17:25.688810609 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + # A script to cleanup resource leases auto-created by + # the libvirt lock plugin for sanlock +diff -ur libvirt-8.4.0.orig/tools/virt-xml-validate.in libvirt-8.4.0/tools/virt-xml-validate.in +--- libvirt-8.4.0.orig/tools/virt-xml-validate.in 2022-06-03 00:15:20.552557883 +0200 ++++ libvirt-8.4.0/tools/virt-xml-validate.in 2022-06-03 00:17:17.894794790 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch index 2b7f6a8..d10ea7d 100644 --- a/libvirt-qemu-acl.patch +++ b/libvirt-qemu-acl.patch @@ -1,7 +1,7 @@ -diff -ur libvirt-8.0.0.orig/src/qemu/qemu_command.c libvirt-8.0.0/src/qemu/qemu_command.c ---- libvirt-8.0.0.orig/src/qemu/qemu_command.c 2022-01-23 12:17:21.722539037 +0100 -+++ libvirt-8.0.0/src/qemu/qemu_command.c 2022-01-23 12:17:43.308582727 +0100 -@@ -8327,6 +8327,10 @@ +diff -ur libvirt-8.4.0.orig/src/qemu/qemu_command.c libvirt-8.4.0/src/qemu/qemu_command.c +--- libvirt-8.4.0.orig/src/qemu/qemu_command.c 2022-06-03 00:01:50.967940423 +0200 ++++ libvirt-8.4.0/src/qemu/qemu_command.c 2022-06-03 00:02:10.338979122 +0200 +@@ -8318,6 +8318,10 @@ virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir); /* TODO: Support ACLs later */ @@ -12,29 +12,10 @@ diff -ur libvirt-8.0.0.orig/src/qemu/qemu_command.c libvirt-8.0.0/src/qemu/qemu_ } if (graphics->data.vnc.powerControl != VIR_TRISTATE_BOOL_ABSENT) { -diff -ur libvirt-8.0.0.orig/src/qemu/qemu.conf libvirt-8.0.0/src/qemu/qemu.conf ---- libvirt-8.0.0.orig/src/qemu/qemu.conf 2022-01-23 12:17:21.720539033 +0100 -+++ libvirt-8.0.0/src/qemu/qemu.conf 2022-01-23 12:17:43.308582727 +0100 -@@ -147,6 +147,15 @@ - #vnc_sasl = 1 - - -+# Enable the VNC access control lists. When switched on this will -+# initially block all vnc users from accessing the vnc server. To -+# add and remove ids from the ACLs you will need to send the appropriate -+# commands to the qemu monitor as required by your particular version of -+# QEMU. See the QEMU documentation for more details. -+# -+# vnc_acl = 1 -+ -+ - # 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-8.0.0.orig/src/qemu/qemu_conf.c libvirt-8.0.0/src/qemu/qemu_conf.c ---- libvirt-8.0.0.orig/src/qemu/qemu_conf.c 2022-01-23 12:17:21.722539037 +0100 -+++ libvirt-8.0.0/src/qemu/qemu_conf.c 2022-01-23 12:17:43.308582727 +0100 -@@ -450,6 +450,8 @@ +diff -ur libvirt-8.4.0.orig/src/qemu/qemu_conf.c libvirt-8.4.0/src/qemu/qemu_conf.c +--- libvirt-8.4.0.orig/src/qemu/qemu_conf.c 2022-06-03 00:01:50.967940423 +0200 ++++ libvirt-8.4.0/src/qemu/qemu_conf.c 2022-06-03 00:02:13.756985948 +0200 +@@ -439,6 +439,8 @@ return -1; if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0) return -1; @@ -43,9 +24,9 @@ diff -ur libvirt-8.0.0.orig/src/qemu/qemu_conf.c libvirt-8.0.0/src/qemu/qemu_con if (cfg->vncPassword && strlen(cfg->vncPassword) > 8) { -diff -ur libvirt-8.0.0.orig/src/qemu/qemu_conf.h libvirt-8.0.0/src/qemu/qemu_conf.h ---- libvirt-8.0.0.orig/src/qemu/qemu_conf.h 2022-01-23 12:17:21.722539037 +0100 -+++ libvirt-8.0.0/src/qemu/qemu_conf.h 2022-01-23 12:17:43.309582729 +0100 +diff -ur libvirt-8.4.0.orig/src/qemu/qemu_conf.h libvirt-8.4.0/src/qemu/qemu_conf.h +--- libvirt-8.4.0.orig/src/qemu/qemu_conf.h 2022-06-03 00:01:50.967940423 +0200 ++++ libvirt-8.4.0/src/qemu/qemu_conf.h 2022-06-03 00:02:13.756985948 +0200 @@ -114,6 +114,7 @@ bool vncTLSx509verify; bool vncTLSx509verifyPresent; @@ -54,3 +35,22 @@ diff -ur libvirt-8.0.0.orig/src/qemu/qemu_conf.h libvirt-8.0.0/src/qemu/qemu_con char *vncTLSx509certdir; char *vncTLSx509secretUUID; char *vncListen; +diff -ur libvirt-8.4.0.orig/src/qemu/qemu.conf.in libvirt-8.4.0/src/qemu/qemu.conf.in +--- libvirt-8.4.0.orig/src/qemu/qemu.conf.in 2022-06-03 00:01:50.966940421 +0200 ++++ libvirt-8.4.0/src/qemu/qemu.conf.in 2022-06-03 00:03:50.351178936 +0200 +@@ -147,6 +147,15 @@ + #vnc_sasl = 1 + + ++# Enable the VNC access control lists. When switched on this will ++# initially block all vnc users from accessing the vnc server. To ++# add and remove ids from the ACLs you will need to send the appropriate ++# commands to the qemu monitor as required by your particular version of ++# QEMU. See the QEMU documentation for more details. ++# ++# vnc_acl = 1 ++ ++ + # 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 --git a/libvirt-sasl.patch b/libvirt-sasl.patch index b85055f..1626d1d 100644 --- a/libvirt-sasl.patch +++ b/libvirt-sasl.patch @@ -1,6 +1,6 @@ -diff -ur libvirt-8.0.0.orig/docs/auth.rst libvirt-8.0.0/docs/auth.rst ---- libvirt-8.0.0.orig/docs/auth.rst 2022-01-23 12:13:11.662032954 +0100 -+++ libvirt-8.0.0/docs/auth.rst 2022-01-23 12:13:54.286119215 +0100 +diff -ur libvirt-8.4.0.orig/docs/auth.rst libvirt-8.4.0/docs/auth.rst +--- libvirt-8.4.0.orig/docs/auth.rst 2022-06-02 23:58:08.077490237 +0200 ++++ libvirt-8.4.0/docs/auth.rst 2022-06-02 23:58:27.936533169 +0200 @@ -225,7 +225,7 @@ Since the libvirt SASL config file defaults to using ``GSSAPI`` (Kerberos), a @@ -10,9 +10,9 @@ diff -ur libvirt-8.0.0.orig/docs/auth.rst libvirt-8.0.0/docs/auth.rst parameter to ``scram-sha-256``. **Note:** previous versions of libvirt suggested ``DIGEST-MD5`` and -diff -ur libvirt-8.0.0.orig/src/qemu/qemu.conf libvirt-8.0.0/src/qemu/qemu.conf ---- libvirt-8.0.0.orig/src/qemu/qemu.conf 2022-01-23 12:13:11.768033168 +0100 -+++ libvirt-8.0.0/src/qemu/qemu.conf 2022-01-23 12:13:54.287119217 +0100 +diff -ur libvirt-8.4.0.orig/src/qemu/qemu.conf.in libvirt-8.4.0/src/qemu/qemu.conf.in +--- libvirt-8.4.0.orig/src/qemu/qemu.conf.in 2022-06-02 23:58:08.164490425 +0200 ++++ libvirt-8.4.0/src/qemu/qemu.conf.in 2022-06-03 00:01:05.398849381 +0200 @@ -141,18 +141,18 @@ # Examples include vinagre, virt-viewer and virt-manager # itself. UltraVNC, RealVNC, TightVNC do not support this @@ -56,9 +56,9 @@ diff -ur libvirt-8.0.0.orig/src/qemu/qemu.conf libvirt-8.0.0/src/qemu/qemu.conf # Enable use of TLS encryption on the chardev TCP transports. # -diff -ur libvirt-8.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-8.0.0/src/qemu/test_libvirtd_qemu.aug.in ---- libvirt-8.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2022-01-23 12:13:11.775033183 +0100 -+++ libvirt-8.0.0/src/qemu/test_libvirtd_qemu.aug.in 2022-01-23 12:13:54.287119217 +0100 +diff -ur libvirt-8.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-8.4.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-8.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2022-06-02 23:58:08.170490438 +0200 ++++ libvirt-8.4.0/src/qemu/test_libvirtd_qemu.aug.in 2022-06-02 23:58:30.521538761 +0200 @@ -13,7 +13,7 @@ { "vnc_tls_x509_verify" = "1" } { "vnc_password" = "XYZ12345" } @@ -77,9 +77,9 @@ diff -ur libvirt-8.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-8.0.0/src { "chardev_tls" = "1" } { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" } { "chardev_tls_x509_verify" = "1" } -diff -ur libvirt-8.0.0.orig/src/remote/libvirtd.conf.in libvirt-8.0.0/src/remote/libvirtd.conf.in ---- libvirt-8.0.0.orig/src/remote/libvirtd.conf.in 2022-01-23 12:13:11.775033183 +0100 -+++ libvirt-8.0.0/src/remote/libvirtd.conf.in 2022-01-23 12:13:54.287119217 +0100 +diff -ur libvirt-8.4.0.orig/src/remote/libvirtd.conf.in libvirt-8.4.0/src/remote/libvirtd.conf.in +--- libvirt-8.4.0.orig/src/remote/libvirtd.conf.in 2022-06-02 23:58:08.171490440 +0200 ++++ libvirt-8.4.0/src/remote/libvirtd.conf.in 2022-06-02 23:58:30.521538761 +0200 @@ -136,7 +136,7 @@ # the network providing auth (eg, TLS/x509 certificates) # @@ -98,10 +98,10 @@ diff -ur libvirt-8.0.0.orig/src/remote/libvirtd.conf.in libvirt-8.0.0/src/remote #auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -ur libvirt-8.0.0.orig/src/remote/meson.build libvirt-8.0.0/src/remote/meson.build ---- libvirt-8.0.0.orig/src/remote/meson.build 2022-01-23 12:13:11.776033185 +0100 -+++ libvirt-8.0.0/src/remote/meson.build 2022-01-23 12:13:54.288119219 +0100 -@@ -309,7 +309,7 @@ +diff -ur libvirt-8.4.0.orig/src/remote/meson.build libvirt-8.4.0/src/remote/meson.build +--- libvirt-8.4.0.orig/src/remote/meson.build 2022-06-02 23:58:08.171490440 +0200 ++++ libvirt-8.4.0/src/remote/meson.build 2022-06-02 23:58:30.522538764 +0200 +@@ -302,7 +302,7 @@ if conf.has('WITH_SASL') install_data( 'libvirtd.sasl', @@ -110,9 +110,9 @@ diff -ur libvirt-8.0.0.orig/src/remote/meson.build libvirt-8.0.0/src/remote/meso rename: [ 'libvirt.conf' ], ) endif -diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args ---- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args 2022-01-23 12:13:11.959033556 +0100 -+++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args 2022-01-23 12:15:32.706318406 +0100 +diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args +--- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args 2022-06-02 23:58:08.323490769 +0200 ++++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args 2022-06-02 23:58:30.522538764 +0200 @@ -6,7 +6,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ @@ -122,21 +122,9 @@ diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-la /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args ---- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args 2022-01-23 12:13:11.960033558 +0100 -+++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args 2022-01-23 12:15:44.141341542 +0100 -@@ -7,7 +7,7 @@ - XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ - XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - QEMU_AUDIO_DRV=none \ --SASL_CONF_PATH=/root/.sasl2 \ -+SASL_CONF_PATH=/root/.sasl \ - /usr/bin/qemu-system-x86_64 \ - -name guest=QEMUGuest1,debug-threads=on \ - -S \ -diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args ---- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args 2022-01-23 12:13:11.960033558 +0100 -+++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args 2022-01-23 12:15:47.578348507 +0100 +diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args +--- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args 2022-06-02 23:58:08.324490771 +0200 ++++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args 2022-06-02 23:58:31.535540952 +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 +134,9 @@ diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-late /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args ---- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2022-01-23 12:13:11.960033558 +0100 -+++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2022-01-23 12:15:37.354327814 +0100 +diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args +--- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2022-06-02 23:58:08.324490771 +0200 ++++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2022-06-02 23:58:31.535540952 +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 +146,9 @@ diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_6 /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args ---- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2022-01-23 12:13:11.960033558 +0100 -+++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2022-01-23 12:15:20.475293652 +0100 +diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args +--- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2022-06-02 23:58:08.324490771 +0200 ++++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2022-06-02 23:58:31.536540954 +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,21 +158,9 @@ diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_6 /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args ---- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args 2022-01-23 12:13:11.960033558 +0100 -+++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args 2022-01-23 12:15:28.153309190 +0100 -@@ -7,7 +7,7 @@ - XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ - XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - QEMU_AUDIO_DRV=none \ --SASL_CONF_PATH=/root/.sasl2 \ -+SASL_CONF_PATH=/root/.sasl \ - /usr/bin/qemu-system-x86_64 \ - -name guest=QEMUGuest1,debug-threads=on \ - -S \ -diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args ---- libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2022-01-23 12:13:11.960033558 +0100 -+++ libvirt-8.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2022-01-23 12:15:40.112333398 +0100 +diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args +--- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2022-06-02 23:58:08.324490771 +0200 ++++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2022-06-02 23:58:32.239542466 +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,19 +170,19 @@ diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-lates /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvtest.c libvirt-8.0.0/tests/qemuxml2argvtest.c ---- libvirt-8.0.0.orig/tests/qemuxml2argvtest.c 2022-01-23 12:13:12.005033649 +0100 -+++ libvirt-8.0.0/tests/qemuxml2argvtest.c 2022-01-23 12:15:08.509269432 +0100 -@@ -1552,7 +1552,7 @@ +diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvtest.c libvirt-8.4.0/tests/qemuxml2argvtest.c +--- libvirt-8.4.0.orig/tests/qemuxml2argvtest.c 2022-06-02 23:58:08.469491084 +0200 ++++ libvirt-8.4.0/tests/qemuxml2argvtest.c 2022-06-02 23:59:10.540619907 +0200 +@@ -1509,7 +1509,7 @@ driver.config->vncSASL = 1; VIR_FREE(driver.config->vncSASLdir); - driver.config->vncSASLdir = g_strdup("/root/.sasl2"); + driver.config->vncSASLdir = g_strdup("/root/.sasl"); - DO_TEST_CAPS_VER("graphics-vnc-sasl", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc-sasl"); driver.config->vncTLS = 1; -@@ -1577,7 +1577,7 @@ + driver.config->vncTLSx509verify = 1; +@@ -1531,7 +1531,7 @@ DO_TEST_CAPS_LATEST("graphics-spice"); DO_TEST_CAPS_LATEST("graphics-spice-no-args"); driver.config->spiceSASL = 1; @@ -215,9 +191,9 @@ diff -ur libvirt-8.0.0.orig/tests/qemuxml2argvtest.c libvirt-8.0.0/tests/qemuxml DO_TEST_CAPS_LATEST("graphics-spice-sasl"); VIR_FREE(driver.config->spiceSASLdir); driver.config->spiceSASL = 0; -diff -ur libvirt-8.0.0.orig/tests/virconfdata/libvirtd.conf libvirt-8.0.0/tests/virconfdata/libvirtd.conf ---- libvirt-8.0.0.orig/tests/virconfdata/libvirtd.conf 2022-01-23 12:13:12.112033865 +0100 -+++ libvirt-8.0.0/tests/virconfdata/libvirtd.conf 2022-01-23 12:14:04.741140369 +0100 +diff -ur libvirt-8.4.0.orig/tests/virconfdata/libvirtd.conf libvirt-8.4.0/tests/virconfdata/libvirtd.conf +--- libvirt-8.4.0.orig/tests/virconfdata/libvirtd.conf 2022-06-02 23:58:08.555491270 +0200 ++++ libvirt-8.4.0/tests/virconfdata/libvirtd.conf 2022-06-02 23:58:32.240542468 +0200 @@ -91,7 +91,7 @@ # the network providing auth (eg, TLS/x509 certificates) # @@ -236,9 +212,9 @@ diff -ur libvirt-8.0.0.orig/tests/virconfdata/libvirtd.conf libvirt-8.0.0/tests/ auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -ur libvirt-8.0.0.orig/tests/virconfdata/libvirtd.out libvirt-8.0.0/tests/virconfdata/libvirtd.out ---- libvirt-8.0.0.orig/tests/virconfdata/libvirtd.out 2022-01-23 12:13:12.112033865 +0100 -+++ libvirt-8.0.0/tests/virconfdata/libvirtd.out 2022-01-23 12:14:04.741140369 +0100 +diff -ur libvirt-8.4.0.orig/tests/virconfdata/libvirtd.out libvirt-8.4.0/tests/virconfdata/libvirtd.out +--- libvirt-8.4.0.orig/tests/virconfdata/libvirtd.out 2022-06-02 23:58:08.555491270 +0200 ++++ libvirt-8.4.0/tests/virconfdata/libvirtd.out 2022-06-02 23:58:32.240542468 +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 b71d7fa..5a7ba4f 100644 --- a/libvirt-sysctl-dir.patch +++ b/libvirt-sysctl-dir.patch @@ -1,7 +1,7 @@ -diff -ur libvirt-8.0.0.orig/src/qemu/meson.build libvirt-8.0.0/src/qemu/meson.build ---- libvirt-8.0.0.orig/src/qemu/meson.build 2022-01-23 12:33:30.542501853 +0100 -+++ libvirt-8.0.0/src/qemu/meson.build 2022-01-23 12:34:27.331616939 +0100 -@@ -173,7 +173,7 @@ +diff -ur libvirt-8.4.0.orig/src/qemu/meson.build libvirt-8.4.0/src/qemu/meson.build +--- libvirt-8.4.0.orig/src/qemu/meson.build 2022-06-03 00:19:08.479019287 +0200 ++++ libvirt-8.4.0/src/qemu/meson.build 2022-06-03 00:19:24.410051620 +0200 +@@ -193,7 +193,7 @@ if conf.has('WITH_SYSCTL') install_data( 'postcopy-migration.sysctl', @@ -10,10 +10,10 @@ diff -ur libvirt-8.0.0.orig/src/qemu/meson.build libvirt-8.0.0/src/qemu/meson.bu rename: [ '60-qemu-postcopy-migration.conf' ], ) endif -diff -ur libvirt-8.0.0.orig/src/remote/meson.build libvirt-8.0.0/src/remote/meson.build ---- libvirt-8.0.0.orig/src/remote/meson.build 2022-01-23 12:33:30.549501867 +0100 -+++ libvirt-8.0.0/src/remote/meson.build 2022-01-23 12:33:41.164523379 +0100 -@@ -265,11 +265,9 @@ +diff -ur libvirt-8.4.0.orig/src/remote/meson.build libvirt-8.4.0/src/remote/meson.build +--- libvirt-8.4.0.orig/src/remote/meson.build 2022-06-03 00:19:08.485019299 +0200 ++++ libvirt-8.4.0/src/remote/meson.build 2022-06-03 00:19:24.410051620 +0200 +@@ -258,11 +258,9 @@ endforeach if conf.has('WITH_SYSCTL') diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch index 179862f..478106b 100644 --- a/libvirt-udevadm-settle.patch +++ b/libvirt-udevadm-settle.patch @@ -1,7 +1,7 @@ -diff -ur libvirt-8.0.0.orig/src/util/virutil.c libvirt-8.0.0/src/util/virutil.c ---- libvirt-8.0.0.orig/src/util/virutil.c 2022-01-23 12:18:28.804674804 +0100 -+++ libvirt-8.0.0/src/util/virutil.c 2022-01-23 12:18:44.386706336 +0100 -@@ -1291,7 +1291,7 @@ +diff -ur libvirt-8.4.0.orig/src/util/virutil.c libvirt-8.4.0/src/util/virutil.c +--- libvirt-8.4.0.orig/src/util/virutil.c 2022-06-03 00:14:24.210445318 +0200 ++++ libvirt-8.4.0/src/util/virutil.c 2022-06-03 00:14:38.976474815 +0200 +@@ -1249,7 +1249,7 @@ if (!(udev = virFindFileInPath(UDEVADM))) return; diff --git a/libvirt.spec b/libvirt.spec index ce82913..24de28b 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -49,12 +49,12 @@ Summary: Toolkit to interact with virtualization capabilities Summary(pl.UTF-8): Narzędzia współpracujące z funkcjami wirtualizacji Name: libvirt -Version: 8.1.0 -Release: 2 +Version: 8.4.0 +Release: 1 License: LGPL v2.1+ Group: Libraries Source0: http://libvirt.org/sources/libvirt-%{version}.tar.xz -# Source0-md5: db2ab9f064a611dbeea3156cf26a2ed1 +# Source0-md5: d9ffa11bc1dcbf5aca13271f3248d3f7 Source1: libvirtd.init Source2: virtlockd.init Source3: virtlogd.init -- 2.44.0