X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-qemu-acl.patch;h=2b7f6a8918a82864820772e6ec6f8bfc6d9d7273;hb=a7c741870f2e811e1d40dd2cac7f6389ee3e77e5;hp=3ea5678584ab91fb1fa69acc912ba4f2e5b2afbf;hpb=3e36cfaeb430c9abf7b9a6b93d92661d49120ce4;p=packages%2Flibvirt.git

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 3ea5678..2b7f6a8 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,6 +1,20 @@
-diff -ur libvirt-6.10.0.orig/src/qemu/qemu.conf libvirt-6.10.0/src/qemu/qemu.conf
---- libvirt-6.10.0.orig/src/qemu/qemu.conf	2021-01-01 20:40:17.379692686 +0100
-+++ libvirt-6.10.0/src/qemu/qemu.conf	2021-01-01 20:40:45.381692686 +0100
+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 @@
+             virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
+ 
+         /* TODO: Support ACLs later */
++
++        if (cfg->vncACL)
++           virBufferAddLit(&opt, ",acl");
++
+     }
+ 
+     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
  
@@ -17,36 +31,22 @@ diff -ur libvirt-6.10.0.orig/src/qemu/qemu.conf libvirt-6.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-6.10.0.orig/src/qemu/qemu_command.c libvirt-6.10.0/src/qemu/qemu_command.c
---- libvirt-6.10.0.orig/src/qemu/qemu_command.c	2021-01-01 20:40:17.375692686 +0100
-+++ libvirt-6.10.0/src/qemu/qemu_command.c	2021-01-01 20:40:45.382692686 +0100
-@@ -7597,6 +7597,10 @@
-             virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
- 
-         /* TODO: Support ACLs later */
-+
-+        if (cfg->vncACL)
-+           virBufferAddLit(&opt, ",acl");
-+
-     }
- 
-     virCommandAddArg(cmd, "-vnc");
-diff -ur libvirt-6.10.0.orig/src/qemu/qemu_conf.c libvirt-6.10.0/src/qemu/qemu_conf.c
---- libvirt-6.10.0.orig/src/qemu/qemu_conf.c	2021-01-01 20:40:17.375692686 +0100
-+++ libvirt-6.10.0/src/qemu/qemu_conf.c	2021-01-01 20:40:45.382692686 +0100
-@@ -446,6 +446,8 @@
+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 @@
          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.10.0.orig/src/qemu/qemu_conf.h libvirt-6.10.0/src/qemu/qemu_conf.h
---- libvirt-6.10.0.orig/src/qemu/qemu_conf.h	2021-01-01 20:40:17.375692686 +0100
-+++ libvirt-6.10.0/src/qemu/qemu_conf.h	2021-01-01 20:40:45.383692686 +0100
-@@ -116,6 +116,7 @@
+     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
+@@ -114,6 +114,7 @@
      bool vncTLSx509verify;
      bool vncTLSx509verifyPresent;
      bool vncSASL;