X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-qemu-acl.patch;h=2e4cf31b42166835307cc1b763e9a48872810726;hb=07c02faa76daf855ff3897afb78a1c406534ad51;hp=f709a32a38a3db42ba1557c6039a6b284a86bf0d;hpb=71a5e15c242981328418b3378f76793bf4661c39;p=packages%2Flibvirt.git

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index f709a32..2e4cf31 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,21 @@
-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
-@@ -141,6 +141,15 @@
+diff -ur libvirt-7.5.0.orig/src/qemu/qemu_command.c libvirt-7.5.0/src/qemu/qemu_command.c
+--- libvirt-7.5.0.orig/src/qemu/qemu_command.c	2021-07-10 01:17:10.220677568 +0200
++++ libvirt-7.5.0/src/qemu/qemu_command.c	2021-07-10 01:17:25.635677568 +0200
+@@ -8087,6 +8087,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-7.5.0.orig/src/qemu/qemu.conf libvirt-7.5.0/src/qemu/qemu.conf
+--- libvirt-7.5.0.orig/src/qemu/qemu.conf	2021-07-10 01:17:10.225677568 +0200
++++ libvirt-7.5.0/src/qemu/qemu.conf	2021-07-10 01:17:25.633677568 +0200
+@@ -147,6 +147,15 @@
  #vnc_sasl = 1
  
  
@@ -17,24 +31,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 @@
-             virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
- 
-         /* TODO: Support ACLs later */
-+
-+        if (cfg->vncACL)
-+           virBufferAddLit(&opt, ",acl");
-+
-     }
- 
-     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-7.5.0.orig/src/qemu/qemu_conf.c libvirt-7.5.0/src/qemu/qemu_conf.c
+--- libvirt-7.5.0.orig/src/qemu/qemu_conf.c	2021-07-10 01:17:10.220677568 +0200
++++ libvirt-7.5.0/src/qemu/qemu_conf.c	2021-07-10 01:17:25.636677568 +0200
+@@ -450,6 +450,8 @@
          return -1;
      if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
          return -1;
@@ -43,10 +43,10 @@ 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
-@@ -118,6 +118,7 @@
+diff -ur libvirt-7.5.0.orig/src/qemu/qemu_conf.h libvirt-7.5.0/src/qemu/qemu_conf.h
+--- libvirt-7.5.0.orig/src/qemu/qemu_conf.h	2021-07-10 01:17:10.220677568 +0200
++++ libvirt-7.5.0/src/qemu/qemu_conf.h	2021-07-10 01:17:25.636677568 +0200
+@@ -114,6 +114,7 @@
      bool vncTLSx509verify;
      bool vncTLSx509verifyPresent;
      bool vncSASL;