[packages/libvirt] - rediff patches
mrozowik
mrozowik at pld-linux.org
Thu Jul 8 20:48:32 CEST 2021
commit 875b1e7784eb0af7fbd844c5b0f33b2fb6ce0655
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date: Thu Jul 8 18:48:11 2021 +0000
- rediff patches
bashisms.patch | 6 ++--
libvirt-qemu-acl.patch | 67 ++++++++++++++++++++--------------------
libvirt-sasl.patch | 83 ++++++++++++++++++++++++++++----------------------
3 files changed, 82 insertions(+), 74 deletions(-)
---
diff --git a/bashisms.patch b/bashisms.patch
index 9d7dfc4..478dab5 100644
--- a/bashisms.patch
+++ b/bashisms.patch
@@ -1,8 +1,8 @@
---- libvirt-1.2.3/tools/libvirt-guests.sh.in~ 2014-02-26 05:09:50.000000000 +0200
-+++ libvirt-1.2.3/tools/libvirt-guests.sh.in 2014-04-05 02:52:16.187741175 +0300
+--- libvirt-6.6.0/tools/libvirt-guests.sh.in~ 2020-07-21 13:34:45.204255044 +0000
++++ libvirt-6.6.0/tools/libvirt-guests.sh.in 2021-07-08 18:45:34.786103043 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
- # Copyright (C) 2011-2013 Red Hat, Inc.
+ # Copyright (C) 2011-2014 Red Hat, Inc.
#
diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index c321962..15c0499 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,20 +1,42 @@
-diff -dur -x '*.orig' -x '*.rej' -x '*~' libvirt-2.1.0.orig/src/qemu/qemu_command.c libvirt-2.1.0/src/qemu/qemu_command.c
---- libvirt-2.1.0.orig/src/qemu/qemu_command.c 2016-08-02 09:10:56.000000000 +0200
-+++ libvirt-2.1.0/src/qemu/qemu_command.c 2016-08-17 12:43:29.000000000 +0200
-@@ -7521,6 +7521,9 @@
+--- libvirt-6.6.0/src/qemu/qemu_command.c~ 2020-07-21 13:39:30.000000000 +0000
++++ libvirt-6.6.0/src/qemu/qemu_command.c 2021-07-08 18:33:22.029690230 +0000
+@@ -7644,6 +7644,9 @@
/* TODO: Support ACLs later */
}
-+ if (cfg->vncACL)
-+ virBufferAddLit(&opt, ",acl");
++ if (cfg->vncACL)
++ virBufferAddLit(&opt, ",acl");
+
virCommandAddArg(cmd, "-vnc");
virCommandAddArgBuffer(cmd, &opt);
if (graphics->data.vnc.keymap)
-diff -dur -x '*.orig' -x '*.rej' -x '*~' libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.0/src/qemu/qemu.conf
---- libvirt-2.1.0.orig/src/qemu/qemu.conf 2016-08-17 12:30:24.000000000 +0200
-+++ libvirt-2.1.0/src/qemu/qemu.conf 2016-08-17 12:37:00.000000000 +0200
-@@ -80,6 +80,15 @@
+
+--- libvirt-6.6.0/src/qemu/qemu_conf.c~ 2020-07-21 13:34:45.000000000 +0000
++++ libvirt-6.6.0/src/qemu/qemu_conf.c 2021-07-08 18:37:21.789487295 +0000
+@@ -439,6 +439,8 @@
+ return -1;
+ if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
+ return -1;
++ if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0)
++ return -1;
+
+ return 0;
+ }
+
+--- libvirt-6.6.0/src/qemu/qemu_conf.h~ 2020-07-21 13:34:45.000000000 +0000
++++ libvirt-6.6.0/src/qemu/qemu_conf.h 2021-07-08 18:38:13.950893081 +0000
+@@ -119,6 +119,7 @@
+ bool vncTLSx509verify;
+ bool vncTLSx509verifyPresent;
+ bool vncSASL;
++ bool vncACL;
+ char *vncTLSx509certdir;
+ char *vncTLSx509secretUUID;
+ char *vncListen;
+
+--- libvirt-6.6.0/src/qemu/qemu.conf~ 2021-07-08 18:39:03.982241321 +0000
++++ libvirt-6.6.0/src/qemu/qemu.conf 2021-07-08 18:42:35.567942073 +0000
+@@ -141,6 +141,15 @@
#vnc_sasl = 1
@@ -23,33 +45,10 @@ diff -dur -x '*.orig' -x '*.rej' -x '*~' libvirt-2.1.0.orig/src/qemu/qemu.conf l
+# 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-5.1.0.orig/src/qemu/qemu_conf.c libvirt-5.1.0/src/qemu/qemu_conf.c
---- libvirt-5.1.0.orig/src/qemu/qemu_conf.c 2019-02-26 00:24:59.015183201 +0100
-+++ libvirt-5.1.0/src/qemu/qemu_conf.c 2019-03-07 00:31:31.736955745 +0100
-@@ -471,6 +471,8 @@
- return -1;
- if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
- return -1;
-+ if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0)
-+ return -1;
-
- return 0;
- }
-diff -dur -x '*.orig' -x '*.rej' -x '*~' libvirt-2.1.0.orig/src/qemu/qemu_conf.h libvirt-2.1.0/src/qemu/qemu_conf.h
---- libvirt-2.1.0.orig/src/qemu/qemu_conf.h 2016-07-27 14:39:35.000000000 +0200
-+++ libvirt-2.1.0/src/qemu/qemu_conf.h 2016-08-17 12:37:00.000000000 +0200
-@@ -113,6 +113,7 @@
- bool vncTLS;
- bool vncTLSx509verify;
- bool vncSASL;
-+ bool vncACL;
- char *vncTLSx509certdir;
- char *vncListen;
- char *vncPassword;
diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 81f9b91..82830d3 100644
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,5 +1,5 @@
---- libvirt-6.4.0/src/remote/libvirtd.conf.in.orig 2020-05-27 22:17:10.347644118 +0200
-+++ libvirt-6.4.0/src/remote/libvirtd.conf.in 2020-06-21 10:22:08.342641796 +0200
+--- libvirt-6.6.0/src/remote/libvirtd.conf.in~ 2020-07-21 13:34:45.000000000 +0000
++++ libvirt-6.6.0/src/remote/libvirtd.conf.in 2021-07-08 18:11:11.683914079 +0000
@@ -134,7 +134,7 @@
# the network providing auth (eg, TLS/x509 certificates)
#
@@ -18,21 +18,13 @@
#auth_tcp = "sasl"
# Change the authentication scheme for TLS sockets.
---- libvirt-6.4.0/docs/auth.html.in.orig 2020-06-11 07:49:02.932714864 +0200
-+++ libvirt-6.4.0/docs/auth.html.in 2020-06-21 10:23:05.598998279 +0200
-@@ -275,7 +275,7 @@
- <p>
- Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
- config change is required 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 -dur -x '*~' -x '*.orig' -x '*.rej' libvirt-2.5.0.orig/src/qemu/qemu.conf libvirt-2.5.0/src/qemu/qemu.conf
---- libvirt-2.5.0.orig/src/qemu/qemu.conf 2016-11-29 10:47:58.000000000 +0100
-+++ libvirt-2.5.0/src/qemu/qemu.conf 2016-12-20 12:56:04.000000000 +0100
-@@ -112,18 +112,18 @@
+278c278
+< 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>
+--- libvirt-6.6.0/src/qemu/qemu.conf~ 2020-07-21 13:34:45.000000000 +0000
++++ libvirt-6.6.0/src/qemu/qemu.conf 2021-07-08 18:19:09.316683971 +0000
+@@ -135,18 +135,18 @@
# Examples include vinagre, virt-viewer and virt-manager
# itself. UltraVNC, RealVNC, TightVNC do not support this
#
@@ -54,34 +46,52 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' libvirt-2.5.0.orig/src/qemu/qemu.conf l
# QEMU implements an extension for providing audio over a VNC connection,
-diff -dur -x '*~' -x '*.orig' -x '*.rej' libvirt-2.5.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-2.5.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
---- libvirt-2.5.0.orig/tests/qemuxml2argvdata/-graphics-vnc-sasl.args 2016-07-27 14:39:35.000000000 +0200
-+++ libvirt-2.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2016-12-20 12:56:04.000000000 +0100
-@@ -3,7 +3,7 @@
+@@ -211,17 +211,17 @@
+ # Enable use of SASL encryption on the SPICE server. This requires
+ # a SPICE client which supports the SASL protocol extension.
+ #
+-# It is necessary to configure /etc/sasl2/qemu.conf to choose
++# It is necessary to configure /etc/sasl/qemu.conf to choose
+ # the desired SASL plugin (eg, GSSPI for Kerberos)
+ #
+ #spice_sasl = 1
+
+-# The default SASL configuration file is located in /etc/sasl2/
++# 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
+ # point to the directory, and create a qemu.conf in that location
+ #
+-#spice_sasl_dir = "/some/directory/sasl2"
++#spice_sasl_dir = "/some/directory/sasl"
+
+ # Enable use of TLS encryption on the chardev TCP transports.
+ #
+--- libvirt-6.6.0//tests/qemuxml2argvdata/graphics-vnc-sasl.args~ 2020-07-21 13:34:45.000000000 +0000
++++ libvirt-6.6.0//tests/qemuxml2argvdata/graphics-vnc-sasl.args 2021-07-08 18:21:11.219952616 +0000
+@@ -6,7 +6,7 @@
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-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 -dur -x '*~' -x '*.orig' -x '*.rej' libvirt-2.5.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-2.5.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
---- libvirt-2.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2016-07-27 14:39:35.000000000 +0200
-+++ libvirt-2.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2016-12-20 12:56:04.000000000 +0100
-@@ -3,7 +3,7 @@
+--- libvirt-6.6.0/tests/qemuxml2argvdata/graphics-vnc-tls.args~ 2020-07-21 13:34:45.000000000 +0000
++++ libvirt-6.6.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2021-07-08 18:22:00.471277949 +0000
+@@ -6,7 +6,7 @@
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-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 -dur -x '*~' -x '*.orig' -x '*.rej' libvirt-2.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-2.5.0/tests/virconfdata/libvirtd.conf
---- libvirt-2.5.0.orig/tests/virconfdata/libvirtd.conf 2016-04-26 04:20:09.000000000 +0200
-+++ libvirt-2.5.0/tests/virconfdata/libvirtd.conf 2016-12-20 12:56:04.000000000 +0100
-@@ -108,7 +108,7 @@
+--- libvirt-6.6.0/tests/virconfdata/libvirtd.conf~ 2020-07-21 13:34:45.000000000 +0000
++++ libvirt-6.6.0/tests/virconfdata/libvirtd.conf 2021-07-08 18:27:52.110787287 +0000
+@@ -91,7 +91,7 @@
# the network providing auth (eg, TLS/x509 certificates)
#
# - sasl: use SASL infrastructure. The actual auth scheme is then
@@ -90,7 +100,7 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' libvirt-2.5.0.orig/tests/virconfdata/li
# socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
# For non-TCP or TLS sockets, any scheme is allowed.
#
-@@ -139,7 +139,7 @@
+@@ -122,7 +122,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
@@ -99,10 +109,9 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' libvirt-2.5.0.orig/tests/virconfdata/li
auth_tcp = "sasl"
# Change the authentication scheme for TLS sockets.
-diff -dur -x '*~' -x '*.orig' -x '*.rej' libvirt-2.5.0.orig/tests/virconfdata/libvirtd.out libvirt-2.5.0/tests/virconfdata/libvirtd.out
---- libvirt-2.5.0.orig/tests/virconfdata/libvirtd.out 2016-04-26 04:20:09.000000000 +0200
-+++ libvirt-2.5.0/tests/virconfdata/libvirtd.out 2016-12-20 12:56:04.000000000 +0100
-@@ -87,7 +87,7 @@
+--- libvirt-6.6.0/tests/virconfdata/libvirtd.out~ 2020-07-21 13:34:45.000000000 +0000
++++ libvirt-6.6.0/tests/virconfdata/libvirtd.out 2021-07-08 18:28:48.448975223 +0000
+@@ -73,7 +73,7 @@
# the network providing auth (eg, TLS/x509 certificates)
#
# - sasl: use SASL infrastructure. The actual auth scheme is then
@@ -111,7 +120,7 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' libvirt-2.5.0.orig/tests/virconfdata/li
# socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
# For non-TCP or TLS sockets, any scheme is allowed.
#
-@@ -116,7 +116,7 @@
+@@ -102,7 +102,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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libvirt.git/commitdiff/875b1e7784eb0af7fbd844c5b0f33b2fb6ce0655
More information about the pld-cvs-commit
mailing list