X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-qemu-acl.patch;h=e2de6e56806e13b835e38e018345cf727e1c3676;hp=346926c1b8703b17dc85db0890399228eb1a1b64;hb=5362742718a035681452094c18259125ad56676e;hpb=270ab3676a03a7dea28909130a6edfc9a8c68651

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 346926c..e2de6e5 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-1.3.3.orig/src/qemu/qemu_command.c libvirt-1.3.3/src/qemu/qemu_command.c
---- libvirt-1.3.3.orig/src/qemu/qemu_command.c	2016-04-14 10:17:35.131170000 +0000
-+++ libvirt-1.3.3/src/qemu/qemu_command.c	2016-04-14 10:30:12.861170000 +0000
-@@ -7336,6 +7336,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+diff -urp libvirt-2.1.0.orig/src/qemu/qemu_command.c libvirt-2.1.0/src/qemu/qemu_command.c
+--- libvirt-2.1.0.orig/src/qemu/qemu_command.c	2016-08-20 10:12:37.332554000 +0000
++++ libvirt-2.1.0/src/qemu/qemu_command.c	2016-08-20 10:13:30.288554000 +0000
+@@ -7519,6 +7519,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,9 +12,9 @@ diff -urp libvirt-1.3.3.orig/src/qemu/qemu_command.c libvirt-1.3.3/src/qemu/qemu
      }
  
      virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-1.3.3.orig/src/qemu/qemu.conf libvirt-1.3.3/src/qemu/qemu.conf
---- libvirt-1.3.3.orig/src/qemu/qemu.conf	2016-04-14 10:17:35.131170000 +0000
-+++ libvirt-1.3.3/src/qemu/qemu.conf	2016-04-14 10:18:01.034170000 +0000
+diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.0/src/qemu/qemu.conf
+--- libvirt-2.1.0.orig/src/qemu/qemu.conf	2016-08-20 10:12:37.337554000 +0000
++++ libvirt-2.1.0/src/qemu/qemu.conf	2016-08-20 10:13:30.289554000 +0000
 @@ -80,6 +80,15 @@
  #vnc_sasl = 1
  
@@ -31,21 +31,22 @@ diff -urp libvirt-1.3.3.orig/src/qemu/qemu.conf libvirt-1.3.3/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-1.3.3.orig/src/qemu/qemu_conf.c libvirt-1.3.3/src/qemu/qemu_conf.c
---- libvirt-1.3.3.orig/src/qemu/qemu_conf.c	2016-04-14 10:17:35.130170000 +0000
-+++ libvirt-1.3.3/src/qemu/qemu_conf.c	2016-04-14 10:18:01.034170000 +0000
-@@ -536,6 +536,7 @@ int virQEMUDriverConfigLoadFile(virQEMUD
-     GET_VALUE_STR("vnc_sasl_dir", cfg->vncSASLdir);
-     GET_VALUE_BOOL("vnc_allow_host_audio", cfg->vncAllowHostAudio);
-     GET_VALUE_BOOL("nographics_allow_host_audio", cfg->nogfxAllowHostAudio);
-+    GET_VALUE_LONG("vnc_acl", cfg->vncACL);
+diff -urp libvirt-2.1.0.orig/src/qemu/qemu_conf.c libvirt-2.1.0/src/qemu/qemu_conf.c
+--- libvirt-2.1.0.orig/src/qemu/qemu_conf.c	2016-08-20 10:12:37.334554000 +0000
++++ libvirt-2.1.0/src/qemu/qemu_conf.c	2016-08-20 10:15:22.160554000 +0000
+@@ -425,6 +425,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
+         goto cleanup;
+     if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
+         goto cleanup;
++    if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0)
++        goto cleanup;
  
-     p = virConfGetValue(conf, "security_driver");
-     if (p && p->type == VIR_CONF_LIST) {
-diff -urp libvirt-1.3.3.orig/src/qemu/qemu_conf.h libvirt-1.3.3/src/qemu/qemu_conf.h
---- libvirt-1.3.3.orig/src/qemu/qemu_conf.h	2016-04-14 10:17:35.130170000 +0000
-+++ libvirt-1.3.3/src/qemu/qemu_conf.h	2016-04-14 10:18:01.035170000 +0000
-@@ -112,6 +112,7 @@ struct _virQEMUDriverConfig {
+ 
+     if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
+diff -urp libvirt-2.1.0.orig/src/qemu/qemu_conf.h libvirt-2.1.0/src/qemu/qemu_conf.h
+--- libvirt-2.1.0.orig/src/qemu/qemu_conf.h	2016-08-20 10:12:37.334554000 +0000
++++ libvirt-2.1.0/src/qemu/qemu_conf.h	2016-08-20 10:13:30.294554000 +0000
+@@ -113,6 +113,7 @@ struct _virQEMUDriverConfig {
      bool vncTLS;
      bool vncTLSx509verify;
      bool vncSASL;