X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-qemu-acl.patch;h=ec0df5ade0fb0a84b9432112c6853abec76bb907;hb=6f7964ef1e23875dea5d65d1b93e8f8fc9c4267f;hp=f4a30bcad0c6c941b77657f06a0e72723474a1e4;hpb=392f6a6608e85bb2105c0ad3d5856c033cc35f6a;p=packages%2Flibvirt.git

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index f4a30bc..ec0df5a 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-3.0.0.orig/src/qemu/qemu_command.c libvirt-3.0.0/src/qemu/qemu_command.c
---- libvirt-3.0.0.orig/src/qemu/qemu_command.c	2017-02-11 16:00:09.943362563 +0000
-+++ libvirt-3.0.0/src/qemu/qemu_command.c	2017-02-11 16:01:03.437361961 +0000
-@@ -7650,6 +7650,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+diff -urp libvirt-3.2.0.orig/src/qemu/qemu_command.c libvirt-3.2.0/src/qemu/qemu_command.c
+--- libvirt-3.2.0.orig/src/qemu/qemu_command.c	2017-04-11 12:49:12.761295272 +0000
++++ libvirt-3.2.0/src/qemu/qemu_command.c	2017-04-11 12:49:28.389296387 +0000
+@@ -7815,6 +7815,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,10 +12,10 @@ diff -urp libvirt-3.0.0.orig/src/qemu/qemu_command.c libvirt-3.0.0/src/qemu/qemu
      }
  
      virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-3.0.0.orig/src/qemu/qemu.conf libvirt-3.0.0/src/qemu/qemu.conf
---- libvirt-3.0.0.orig/src/qemu/qemu.conf	2017-02-11 16:00:09.945362563 +0000
-+++ libvirt-3.0.0/src/qemu/qemu.conf	2017-02-11 16:01:03.438361961 +0000
-@@ -118,6 +118,15 @@
+diff -urp libvirt-3.2.0.orig/src/qemu/qemu.conf libvirt-3.2.0/src/qemu/qemu.conf
+--- libvirt-3.2.0.orig/src/qemu/qemu.conf	2017-04-11 12:49:12.764295272 +0000
++++ libvirt-3.2.0/src/qemu/qemu.conf	2017-04-11 12:49:28.389296387 +0000
+@@ -125,6 +125,15 @@
  #vnc_sasl = 1
  
  
@@ -31,10 +31,10 @@ diff -urp libvirt-3.0.0.orig/src/qemu/qemu.conf libvirt-3.0.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-3.0.0.orig/src/qemu/qemu_conf.c libvirt-3.0.0/src/qemu/qemu_conf.c
---- libvirt-3.0.0.orig/src/qemu/qemu_conf.c	2017-02-11 16:00:09.943362563 +0000
-+++ libvirt-3.0.0/src/qemu/qemu_conf.c	2017-02-11 16:01:03.438361961 +0000
-@@ -487,6 +487,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
+diff -urp libvirt-3.2.0.orig/src/qemu/qemu_conf.c libvirt-3.2.0/src/qemu/qemu_conf.c
+--- libvirt-3.2.0.orig/src/qemu/qemu_conf.c	2017-04-11 12:49:12.762295272 +0000
++++ libvirt-3.2.0/src/qemu/qemu_conf.c	2017-04-11 12:49:28.390296387 +0000
+@@ -496,6 +496,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
          goto cleanup;
      if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
          goto cleanup;
@@ -43,9 +43,9 @@ diff -urp libvirt-3.0.0.orig/src/qemu/qemu_conf.c libvirt-3.0.0/src/qemu/qemu_co
  
  
      if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
-diff -urp libvirt-3.0.0.orig/src/qemu/qemu_conf.h libvirt-3.0.0/src/qemu/qemu_conf.h
---- libvirt-3.0.0.orig/src/qemu/qemu_conf.h	2017-02-11 16:00:09.943362563 +0000
-+++ libvirt-3.0.0/src/qemu/qemu_conf.h	2017-02-11 16:01:03.438361961 +0000
+diff -urp libvirt-3.2.0.orig/src/qemu/qemu_conf.h libvirt-3.2.0/src/qemu/qemu_conf.h
+--- libvirt-3.2.0.orig/src/qemu/qemu_conf.h	2017-04-11 12:49:12.762295272 +0000
++++ libvirt-3.2.0/src/qemu/qemu_conf.h	2017-04-11 12:49:28.390296387 +0000
 @@ -119,6 +119,7 @@ struct _virQEMUDriverConfig {
      bool vncTLS;
      bool vncTLSx509verify;