X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=libvirt-qemu-acl.patch;h=03959ac125aa81997b9faa7dde11ab3e72002323;hb=2765e4210c7a86244e673b4ee183a616ddb2db1a;hp=f709a32a38a3db42ba1557c6039a6b284a86bf0d;hpb=71a5e15c242981328418b3378f76793bf4661c39;p=packages%2Flibvirt.git

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index f709a32..03959ac 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,6 +1,6 @@
-diff -ur libvirt-5.10.0.orig/src/qemu/qemu.conf libvirt-5.10.0/src/qemu/qemu.conf
---- libvirt-5.10.0.orig/src/qemu/qemu.conf	2019-12-08 00:44:49.154000000 +0100
-+++ libvirt-5.10.0/src/qemu/qemu.conf	2019-12-08 00:45:04.937000000 +0100
+diff -ur libvirt-6.1.0.orig/src/qemu/qemu.conf libvirt-6.1.0/src/qemu/qemu.conf
+--- libvirt-6.1.0.orig/src/qemu/qemu.conf	2020-03-06 09:49:35.413000000 +0100
++++ libvirt-6.1.0/src/qemu/qemu.conf	2020-03-06 09:50:04.229000000 +0100
 @@ -141,6 +141,15 @@
  #vnc_sasl = 1
  
@@ -17,10 +17,10 @@ diff -ur libvirt-5.10.0.orig/src/qemu/qemu.conf libvirt-5.10.0/src/qemu/qemu.con
  # 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 -ur libvirt-5.10.0.orig/src/qemu/qemu_command.c libvirt-5.10.0/src/qemu/qemu_command.c
---- libvirt-5.10.0.orig/src/qemu/qemu_command.c	2019-12-08 00:44:49.154000000 +0100
-+++ libvirt-5.10.0/src/qemu/qemu_command.c	2019-12-08 00:45:04.937000000 +0100
-@@ -7875,6 +7875,10 @@
+diff -ur libvirt-6.1.0.orig/src/qemu/qemu_command.c libvirt-6.1.0/src/qemu/qemu_command.c
+--- libvirt-6.1.0.orig/src/qemu/qemu_command.c	2020-03-06 09:49:35.413000000 +0100
++++ libvirt-6.1.0/src/qemu/qemu_command.c	2020-03-06 09:50:04.230000000 +0100
+@@ -7569,6 +7569,10 @@
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -31,10 +31,10 @@ diff -ur libvirt-5.10.0.orig/src/qemu/qemu_command.c libvirt-5.10.0/src/qemu/qem
      }
  
      virCommandAddArg(cmd, "-vnc");
-diff -ur libvirt-5.10.0.orig/src/qemu/qemu_conf.c libvirt-5.10.0/src/qemu/qemu_conf.c
---- libvirt-5.10.0.orig/src/qemu/qemu_conf.c	2019-12-08 00:44:49.152000000 +0100
-+++ libvirt-5.10.0/src/qemu/qemu_conf.c	2019-12-08 00:45:04.937000000 +0100
-@@ -400,6 +400,8 @@
+diff -ur libvirt-6.1.0.orig/src/qemu/qemu_conf.c libvirt-6.1.0/src/qemu/qemu_conf.c
+--- libvirt-6.1.0.orig/src/qemu/qemu_conf.c	2020-03-06 09:49:35.410000000 +0100
++++ libvirt-6.1.0/src/qemu/qemu_conf.c	2020-03-06 09:50:04.230000000 +0100
+@@ -428,6 +428,8 @@
          return -1;
      if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
          return -1;
@@ -43,9 +43,9 @@ diff -ur libvirt-5.10.0.orig/src/qemu/qemu_conf.c libvirt-5.10.0/src/qemu/qemu_c
  
      return 0;
  }
-diff -ur libvirt-5.10.0.orig/src/qemu/qemu_conf.h libvirt-5.10.0/src/qemu/qemu_conf.h
---- libvirt-5.10.0.orig/src/qemu/qemu_conf.h	2019-12-08 00:44:49.151000000 +0100
-+++ libvirt-5.10.0/src/qemu/qemu_conf.h	2019-12-08 00:45:04.937000000 +0100
+diff -ur libvirt-6.1.0.orig/src/qemu/qemu_conf.h libvirt-6.1.0/src/qemu/qemu_conf.h
+--- libvirt-6.1.0.orig/src/qemu/qemu_conf.h	2020-03-06 09:49:35.409000000 +0100
++++ libvirt-6.1.0/src/qemu/qemu_conf.h	2020-03-06 09:50:04.230000000 +0100
 @@ -118,6 +118,7 @@
      bool vncTLSx509verify;
      bool vncTLSx509verifyPresent;