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

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index e2de6e5..e4781d2 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-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
+diff -urp libvirt-4.0.0.orig/src/qemu/qemu_command.c libvirt-4.0.0/src/qemu/qemu_command.c
+--- libvirt-4.0.0.orig/src/qemu/qemu_command.c	2018-01-24 12:03:25.563517453 +0000
++++ libvirt-4.0.0/src/qemu/qemu_command.c	2018-01-24 12:03:45.990516235 +0000
+@@ -8091,6 +8091,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,10 +12,10 @@ diff -urp libvirt-2.1.0.orig/src/qemu/qemu_command.c libvirt-2.1.0/src/qemu/qemu
      }
  
      virCommandAddArg(cmd, "-vnc");
-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 @@
+diff -urp libvirt-4.0.0.orig/src/qemu/qemu.conf libvirt-4.0.0/src/qemu/qemu.conf
+--- libvirt-4.0.0.orig/src/qemu/qemu.conf	2018-01-24 12:03:25.566517453 +0000
++++ libvirt-4.0.0/src/qemu/qemu.conf	2018-01-24 12:03:45.991516235 +0000
+@@ -135,6 +135,15 @@
  #vnc_sasl = 1
  
  
@@ -31,10 +31,10 @@ diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.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-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
+diff -urp libvirt-4.0.0.orig/src/qemu/qemu_conf.c libvirt-4.0.0/src/qemu/qemu_conf.c
+--- libvirt-4.0.0.orig/src/qemu/qemu_conf.c	2018-01-24 12:03:25.564517453 +0000
++++ libvirt-4.0.0/src/qemu/qemu_conf.c	2018-01-24 12:03:45.991516235 +0000
+@@ -524,6 +524,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
          goto cleanup;
      if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
          goto cleanup;
@@ -43,10 +43,10 @@ diff -urp libvirt-2.1.0.orig/src/qemu/qemu_conf.c libvirt-2.1.0/src/qemu/qemu_co
  
  
      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 {
+diff -urp libvirt-4.0.0.orig/src/qemu/qemu_conf.h libvirt-4.0.0/src/qemu/qemu_conf.h
+--- libvirt-4.0.0.orig/src/qemu/qemu_conf.h	2018-01-24 12:03:25.564517453 +0000
++++ libvirt-4.0.0/src/qemu/qemu_conf.h	2018-01-24 12:03:45.991516235 +0000
+@@ -121,6 +121,7 @@ struct _virQEMUDriverConfig {
      bool vncTLS;
      bool vncTLSx509verify;
      bool vncSASL;