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

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index ec0df5a..e81c7d8 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-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
+diff -urp libvirt-4.1.0.orig/src/qemu/qemu_command.c libvirt-4.1.0/src/qemu/qemu_command.c
+--- libvirt-4.1.0.orig/src/qemu/qemu_command.c	2018-02-26 09:02:18.000000000 +0000
++++ libvirt-4.1.0/src/qemu/qemu_command.c	2018-03-12 10:54:51.326947485 +0000
+@@ -7842,6 +7842,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,10 +12,10 @@ diff -urp libvirt-3.2.0.orig/src/qemu/qemu_command.c libvirt-3.2.0/src/qemu/qemu
      }
  
      virCommandAddArg(cmd, "-vnc");
-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 @@
+diff -urp libvirt-4.1.0.orig/src/qemu/qemu.conf libvirt-4.1.0/src/qemu/qemu.conf
+--- libvirt-4.1.0.orig/src/qemu/qemu.conf	2018-03-12 10:51:10.000000000 +0000
++++ libvirt-4.1.0/src/qemu/qemu.conf	2018-03-12 10:54:51.327947485 +0000
+@@ -135,6 +135,15 @@
  #vnc_sasl = 1
  
  
@@ -31,10 +31,10 @@ diff -urp libvirt-3.2.0.orig/src/qemu/qemu.conf libvirt-3.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-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
+diff -urp libvirt-4.1.0.orig/src/qemu/qemu_conf.c libvirt-4.1.0/src/qemu/qemu_conf.c
+--- libvirt-4.1.0.orig/src/qemu/qemu_conf.c	2018-02-26 09:02:18.000000000 +0000
++++ libvirt-4.1.0/src/qemu/qemu_conf.c	2018-03-12 10:54:51.327947485 +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-3.2.0.orig/src/qemu/qemu_conf.c libvirt-3.2.0/src/qemu/qemu_co
  
  
      if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
-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 {
+diff -urp libvirt-4.1.0.orig/src/qemu/qemu_conf.h libvirt-4.1.0/src/qemu/qemu_conf.h
+--- libvirt-4.1.0.orig/src/qemu/qemu_conf.h	2018-02-26 09:02:18.000000000 +0000
++++ libvirt-4.1.0/src/qemu/qemu_conf.h	2018-03-12 10:54:51.327947485 +0000
+@@ -121,6 +121,7 @@ struct _virQEMUDriverConfig {
      bool vncTLS;
      bool vncTLSx509verify;
      bool vncSASL;