- updated to 5.10.0

[packages/libvirt.git] / libvirt-qemu-acl.patch

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 6522c73671f5f374bd3df1357432e353c852576c..f709a32a38a3db42ba1557c6039a6b284a86bf0d 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,20 +1,6 @@
-diff -ur libvirt-5.6.0.orig/src/qemu/qemu_command.c libvirt-5.6.0/src/qemu/qemu_command.c
---- libvirt-5.6.0.orig/src/qemu/qemu_command.c 2019-08-18 18:14:58.605000000 +0200
-+++ libvirt-5.6.0/src/qemu/qemu_command.c      2019-08-18 18:15:10.043000000 +0200
-@@ -8218,6 +8218,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.6.0.orig/src/qemu/qemu.conf libvirt-5.6.0/src/qemu/qemu.conf
---- libvirt-5.6.0.orig/src/qemu/qemu.conf      2019-08-18 18:14:58.606000000 +0200
-+++ libvirt-5.6.0/src/qemu/qemu.conf   2019-08-18 18:15:10.043000000 +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.6.0.orig/src/qemu/qemu.conf libvirt-5.6.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.6.0.orig/src/qemu/qemu_conf.c libvirt-5.6.0/src/qemu/qemu_conf.c
---- libvirt-5.6.0.orig/src/qemu/qemu_conf.c    2019-08-18 18:14:58.604000000 +0200
-+++ libvirt-5.6.0/src/qemu/qemu_conf.c 2019-08-18 18:15:10.044000000 +0200
-@@ -459,6 +459,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.6.0.orig/src/qemu/qemu_conf.c libvirt-5.6.0/src/qemu/qemu_con
  
      return 0;
  }
-diff -ur libvirt-5.6.0.orig/src/qemu/qemu_conf.h libvirt-5.6.0/src/qemu/qemu_conf.h
---- libvirt-5.6.0.orig/src/qemu/qemu_conf.h    2019-08-18 18:14:58.603000000 +0200
-+++ libvirt-5.6.0/src/qemu/qemu_conf.h 2019-08-18 18:15:10.044000000 +0200
-@@ -117,6 +117,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;