X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-qemu-acl.patch;h=03959ac125aa81997b9faa7dde11ab3e72002323;hb=60d0909aad60cee96ddf2119563f92fe778f2269;hp=44b93a1439d4444d4b3cd111e0fe846ebfba249d;hpb=2b677ce945111ed66d2c3c4b4a6eb0be3a3afab2;p=packages%2Flibvirt.git

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 44b93a1..03959ac 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,20 +1,6 @@
-diff -urp libvirt-5.4.0.orig/src/qemu/qemu_command.c libvirt-5.4.0/src/qemu/qemu_command.c
---- libvirt-5.4.0.orig/src/qemu/qemu_command.c	2019-06-17 20:19:15.321000000 +0200
-+++ libvirt-5.4.0/src/qemu/qemu_command.c	2019-06-17 20:19:33.942000000 +0200
-@@ -8280,6 +8280,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.4.0.orig/src/qemu/qemu.conf libvirt-5.4.0/src/qemu/qemu.conf
---- libvirt-5.4.0.orig/src/qemu/qemu.conf	2019-06-17 20:19:15.325000000 +0200
-+++ libvirt-5.4.0/src/qemu/qemu.conf	2019-06-17 20:19:33.943000000 +0200
+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
  
@@ -31,10 +17,24 @@ diff -urp libvirt-5.4.0.orig/src/qemu/qemu.conf libvirt-5.4.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.4.0.orig/src/qemu/qemu_conf.c libvirt-5.4.0/src/qemu/qemu_conf.c
---- libvirt-5.4.0.orig/src/qemu/qemu_conf.c	2019-06-17 20:19:15.323000000 +0200
-+++ libvirt-5.4.0/src/qemu/qemu_conf.c	2019-06-17 20:19:33.943000000 +0200
-@@ -471,6 +471,8 @@ virQEMUDriverConfigLoadVNCEntry(virQEMUD
+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 @@
+             virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
+ 
+         /* TODO: Support ACLs later */
++
++        if (cfg->vncACL)
++           virBufferAddLit(&opt, ",acl");
++
+     }
+ 
+     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 @@
          return -1;
      if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
          return -1;
@@ -43,10 +43,10 @@ diff -urp libvirt-5.4.0.orig/src/qemu/qemu_conf.c libvirt-5.4.0/src/qemu/qemu_co
  
      return 0;
  }
-diff -urp libvirt-5.4.0.orig/src/qemu/qemu_conf.h libvirt-5.4.0/src/qemu/qemu_conf.h
---- libvirt-5.4.0.orig/src/qemu/qemu_conf.h	2019-06-17 20:19:15.323000000 +0200
-+++ libvirt-5.4.0/src/qemu/qemu_conf.h	2019-06-17 20:19:33.944000000 +0200
-@@ -124,6 +124,7 @@ struct _virQEMUDriverConfig {
+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 @@
      bool vncTLSx509verify;
      bool vncTLSx509verifyPresent;
      bool vncSASL;