X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-qemu-acl.patch;h=d10ea7d0b7c48b5135a8a314b870f9fb75a887ca;hp=03959ac125aa81997b9faa7dde11ab3e72002323;hb=69c354bc3e587972c43559ff76dfe363a23f26cb;hpb=fb9ba66439cd633004f1975095e9ddb1b47a0234

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 03959ac..d10ea7d 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,26 +1,7 @@
-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
- 
- 
-+# 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-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 @@
+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 */
@@ -30,23 +11,23 @@ diff -ur libvirt-6.1.0.orig/src/qemu/qemu_command.c libvirt-6.1.0/src/qemu/qemu_
 +
      }
  
-     virCommandAddArg(cmd, "-vnc");
-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 @@
+     if (graphics->data.vnc.powerControl != VIR_TRISTATE_BOOL_ABSENT) {
+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;
 +    if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0)
 +        return -1;
  
-     return 0;
- }
-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 @@
+     if (cfg->vncPassword &&
+         strlen(cfg->vncPassword) > 8) {
+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;
      bool vncSASL;
@@ -54,3 +35,22 @@ diff -ur libvirt-6.1.0.orig/src/qemu/qemu_conf.h libvirt-6.1.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