- updated to 6.10.0, now uses meson for building

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

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 44b93a1439d4444d4b3cd111e0fe846ebfba249d..3ea5678584ab91fb1fa69acc912ba4f2e5b2afbf 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,21 +1,7 @@
-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
-@@ -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.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.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.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.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;