X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-qemu-acl.patch;h=d473146cbee36426ae3d78eac7fe6725a0d32339;hp=6522c73671f5f374bd3df1357432e353c852576c;hb=1d5f75a19e11fab11f6c4bff93013b81264880dd;hpb=bd794c8b00c2612a686e8257ba1c31931ee756c2

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 6522c73..d473146 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -ur libvirt-5.6.0.orig/src/qemu/qemu_command.c libvirt-5.6.0/src/qemu/qemu_command.c
---- libvirt-5.6.0.orig/src/qemu/qemu_command.c	2019-08-18 18:14:58.605000000 +0200
-+++ libvirt-5.6.0/src/qemu/qemu_command.c	2019-08-18 18:15:10.043000000 +0200
-@@ -8218,6 +8218,10 @@
+diff -ur libvirt-5.8.0.orig/src/qemu/qemu_command.c libvirt-5.8.0/src/qemu/qemu_command.c
+--- libvirt-5.8.0.orig/src/qemu/qemu_command.c	2019-10-20 16:07:26.267000000 +0200
++++ libvirt-5.8.0/src/qemu/qemu_command.c	2019-10-20 16:07:44.191000000 +0200
+@@ -7952,6 +7952,10 @@
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,9 +12,9 @@ diff -ur libvirt-5.6.0.orig/src/qemu/qemu_command.c libvirt-5.6.0/src/qemu/qemu_
      }
  
      virCommandAddArg(cmd, "-vnc");
-diff -ur libvirt-5.6.0.orig/src/qemu/qemu.conf libvirt-5.6.0/src/qemu/qemu.conf
---- libvirt-5.6.0.orig/src/qemu/qemu.conf	2019-08-18 18:14:58.606000000 +0200
-+++ libvirt-5.6.0/src/qemu/qemu.conf	2019-08-18 18:15:10.043000000 +0200
+diff -ur libvirt-5.8.0.orig/src/qemu/qemu.conf libvirt-5.8.0/src/qemu/qemu.conf
+--- libvirt-5.8.0.orig/src/qemu/qemu.conf	2019-10-20 16:07:26.267000000 +0200
++++ libvirt-5.8.0/src/qemu/qemu.conf	2019-10-20 16:07:44.192000000 +0200
 @@ -141,6 +141,15 @@
  #vnc_sasl = 1
  
@@ -31,10 +31,10 @@ diff -ur libvirt-5.6.0.orig/src/qemu/qemu.conf libvirt-5.6.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 -ur libvirt-5.6.0.orig/src/qemu/qemu_conf.c libvirt-5.6.0/src/qemu/qemu_conf.c
---- libvirt-5.6.0.orig/src/qemu/qemu_conf.c	2019-08-18 18:14:58.604000000 +0200
-+++ libvirt-5.6.0/src/qemu/qemu_conf.c	2019-08-18 18:15:10.044000000 +0200
-@@ -459,6 +459,8 @@
+diff -ur libvirt-5.8.0.orig/src/qemu/qemu_conf.c libvirt-5.8.0/src/qemu/qemu_conf.c
+--- libvirt-5.8.0.orig/src/qemu/qemu_conf.c	2019-10-20 16:07:26.266000000 +0200
++++ libvirt-5.8.0/src/qemu/qemu_conf.c	2019-10-20 16:07:44.192000000 +0200
+@@ -443,6 +443,8 @@
          return -1;
      if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
          return -1;
@@ -43,10 +43,10 @@ diff -ur libvirt-5.6.0.orig/src/qemu/qemu_conf.c libvirt-5.6.0/src/qemu/qemu_con
  
      return 0;
  }
-diff -ur libvirt-5.6.0.orig/src/qemu/qemu_conf.h libvirt-5.6.0/src/qemu/qemu_conf.h
---- libvirt-5.6.0.orig/src/qemu/qemu_conf.h	2019-08-18 18:14:58.603000000 +0200
-+++ libvirt-5.6.0/src/qemu/qemu_conf.h	2019-08-18 18:15:10.044000000 +0200
-@@ -117,6 +117,7 @@
+diff -ur libvirt-5.8.0.orig/src/qemu/qemu_conf.h libvirt-5.8.0/src/qemu/qemu_conf.h
+--- libvirt-5.8.0.orig/src/qemu/qemu_conf.h	2019-10-20 16:07:26.265000000 +0200
++++ libvirt-5.8.0/src/qemu/qemu_conf.h	2019-10-20 16:07:44.192000000 +0200
+@@ -118,6 +118,7 @@
      bool vncTLSx509verify;
      bool vncTLSx509verifyPresent;
      bool vncSASL;