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

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 0a9e2d9..f709a32 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,20 +1,6 @@
-diff -ur libvirt-5.5.0.orig/src/qemu/qemu_command.c libvirt-5.5.0/src/qemu/qemu_command.c
---- libvirt-5.5.0.orig/src/qemu/qemu_command.c	2019-07-14 19:27:07.837000000 +0200
-+++ libvirt-5.5.0/src/qemu/qemu_command.c	2019-07-14 19:27:29.079000000 +0200
-@@ -8239,6 +8239,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.5.0.orig/src/qemu/qemu.conf libvirt-5.5.0/src/qemu/qemu.conf
---- libvirt-5.5.0.orig/src/qemu/qemu.conf	2019-07-14 19:27:07.837000000 +0200
-+++ libvirt-5.5.0/src/qemu/qemu.conf	2019-07-14 19:27:29.079000000 +0200
+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 @@
  #vnc_sasl = 1
  
@@ -31,10 +17,24 @@ diff -ur libvirt-5.5.0.orig/src/qemu/qemu.conf libvirt-5.5.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 -ur libvirt-5.5.0.orig/src/qemu/qemu_conf.c libvirt-5.5.0/src/qemu/qemu_conf.c
---- libvirt-5.5.0.orig/src/qemu/qemu_conf.c	2019-07-14 19:27:07.836000000 +0200
-+++ libvirt-5.5.0/src/qemu/qemu_conf.c	2019-07-14 19:27:29.079000000 +0200
-@@ -453,6 +453,8 @@
+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 @@
          return -1;
      if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
          return -1;
@@ -43,10 +43,10 @@ diff -ur libvirt-5.5.0.orig/src/qemu/qemu_conf.c libvirt-5.5.0/src/qemu/qemu_con
  
      return 0;
  }
-diff -ur libvirt-5.5.0.orig/src/qemu/qemu_conf.h libvirt-5.5.0/src/qemu/qemu_conf.h
---- libvirt-5.5.0.orig/src/qemu/qemu_conf.h	2019-07-14 19:27:07.835000000 +0200
-+++ libvirt-5.5.0/src/qemu/qemu_conf.h	2019-07-14 19:27:29.080000000 +0200
-@@ -115,6 +115,7 @@
+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 @@
      bool vncTLSx509verify;
      bool vncTLSx509verifyPresent;
      bool vncSASL;