X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-qemu-acl.patch;h=e05d5dfa4aa1ddad0383852ab5edd3daff439894;hp=ce711ac8d27ae587fee550816ba4fa7d8c45e0fe;hb=b6348913329f24b2ffa0afd0bd02c528d62ee3dc;hpb=559d73a62a2eace9510788773fbe937c07c54b31

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index ce711ac..e05d5df 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-4.2.0.orig/src/qemu/qemu_command.c libvirt-4.2.0/src/qemu/qemu_command.c
---- libvirt-4.2.0.orig/src/qemu/qemu_command.c	2018-04-12 12:47:51.427576965 +0000
-+++ libvirt-4.2.0/src/qemu/qemu_command.c	2018-04-12 12:48:01.793576849 +0000
-@@ -7893,6 +7893,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+diff -urp libvirt-4.5.0.orig/src/qemu/qemu_command.c libvirt-4.5.0/src/qemu/qemu_command.c
+--- libvirt-4.5.0.orig/src/qemu/qemu_command.c	2018-07-09 16:27:53.841864595 +0000
++++ libvirt-4.5.0/src/qemu/qemu_command.c	2018-07-09 16:28:11.860863521 +0000
+@@ -7859,6 +7859,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,9 +12,9 @@ diff -urp libvirt-4.2.0.orig/src/qemu/qemu_command.c libvirt-4.2.0/src/qemu/qemu
      }
  
      virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-4.2.0.orig/src/qemu/qemu.conf libvirt-4.2.0/src/qemu/qemu.conf
---- libvirt-4.2.0.orig/src/qemu/qemu.conf	2018-04-12 12:47:51.430576965 +0000
-+++ libvirt-4.2.0/src/qemu/qemu.conf	2018-04-12 12:48:01.794576849 +0000
+diff -urp libvirt-4.5.0.orig/src/qemu/qemu.conf libvirt-4.5.0/src/qemu/qemu.conf
+--- libvirt-4.5.0.orig/src/qemu/qemu.conf	2018-07-09 16:27:53.844864595 +0000
++++ libvirt-4.5.0/src/qemu/qemu.conf	2018-07-09 16:28:11.861863521 +0000
 @@ -135,6 +135,15 @@
  #vnc_sasl = 1
  
@@ -31,10 +31,10 @@ diff -urp libvirt-4.2.0.orig/src/qemu/qemu.conf libvirt-4.2.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-4.2.0.orig/src/qemu/qemu_conf.c libvirt-4.2.0/src/qemu/qemu_conf.c
---- libvirt-4.2.0.orig/src/qemu/qemu_conf.c	2018-04-12 12:47:51.428576965 +0000
-+++ libvirt-4.2.0/src/qemu/qemu_conf.c	2018-04-12 12:48:01.794576849 +0000
-@@ -524,6 +524,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
+diff -urp libvirt-4.5.0.orig/src/qemu/qemu_conf.c libvirt-4.5.0/src/qemu/qemu_conf.c
+--- libvirt-4.5.0.orig/src/qemu/qemu_conf.c	2018-07-09 16:27:53.842864595 +0000
++++ libvirt-4.5.0/src/qemu/qemu_conf.c	2018-07-09 16:28:11.861863521 +0000
+@@ -555,6 +555,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-4.2.0.orig/src/qemu/qemu_conf.c libvirt-4.2.0/src/qemu/qemu_co
  
  
      if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
-diff -urp libvirt-4.2.0.orig/src/qemu/qemu_conf.h libvirt-4.2.0/src/qemu/qemu_conf.h
---- libvirt-4.2.0.orig/src/qemu/qemu_conf.h	2018-04-12 12:47:51.428576965 +0000
-+++ libvirt-4.2.0/src/qemu/qemu_conf.h	2018-04-12 12:48:01.794576849 +0000
-@@ -121,6 +121,7 @@ struct _virQEMUDriverConfig {
+diff -urp libvirt-4.5.0.orig/src/qemu/qemu_conf.h libvirt-4.5.0/src/qemu/qemu_conf.h
+--- libvirt-4.5.0.orig/src/qemu/qemu_conf.h	2018-07-09 16:27:53.842864595 +0000
++++ libvirt-4.5.0/src/qemu/qemu_conf.h	2018-07-09 16:28:11.861863521 +0000
+@@ -124,6 +124,7 @@ struct _virQEMUDriverConfig {
      bool vncTLS;
      bool vncTLSx509verify;
      bool vncSASL;