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

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index c31da45..3ea5678 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,21 +1,7 @@
-diff -urp libvirt-5.1.0.orig/src/qemu/qemu_command.c libvirt-5.1.0/src/qemu/qemu_command.c
---- libvirt-5.1.0.orig/src/qemu/qemu_command.c	2019-03-23 11:41:18.269000000 +0100
-+++ libvirt-5.1.0/src/qemu/qemu_command.c	2019-03-23 11:41:44.602000000 +0100
-@@ -8155,6 +8155,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
-             virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
- 
-         /* TODO: Support ACLs later */
-+
-+        if (cfg->vncACL)
-+           virBufferAddLit(&opt, ",acl");
-+
-     }
- 
-     virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-5.1.0.orig/src/qemu/qemu.conf libvirt-5.1.0/src/qemu/qemu.conf
---- libvirt-5.1.0.orig/src/qemu/qemu.conf	2019-03-23 11:41:18.271000000 +0100
-+++ libvirt-5.1.0/src/qemu/qemu.conf	2019-03-23 11:41:44.602000000 +0100
-@@ -141,6 +141,15 @@
+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
+@@ -147,6 +147,15 @@
  #vnc_sasl = 1
  
  
@@ -31,10 +17,24 @@ diff -urp libvirt-5.1.0.orig/src/qemu/qemu.conf libvirt-5.1.0/src/qemu/qemu.conf
  # 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 -urp 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-03-23 11:41:18.270000000 +0100
-+++ libvirt-5.1.0/src/qemu/qemu_conf.c	2019-03-23 11:47:01.904000000 +0100
-@@ -471,6 +471,8 @@ virQEMUDriverConfigLoadVNCEntry(virQEMUD
+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 @@
          return -1;
      if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
          return -1;
@@ -43,10 +43,10 @@ diff -urp libvirt-5.1.0.orig/src/qemu/qemu_conf.c libvirt-5.1.0/src/qemu/qemu_co
  
      return 0;
  }
-diff -urp libvirt-5.1.0.orig/src/qemu/qemu_conf.h libvirt-5.1.0/src/qemu/qemu_conf.h
---- libvirt-5.1.0.orig/src/qemu/qemu_conf.h	2019-03-23 11:41:18.270000000 +0100
-+++ libvirt-5.1.0/src/qemu/qemu_conf.h	2019-03-23 11:41:44.603000000 +0100
-@@ -124,6 +124,7 @@ struct _virQEMUDriverConfig {
+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 @@
      bool vncTLSx509verify;
      bool vncTLSx509verifyPresent;
      bool vncSASL;