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

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 44b93a1..d473146 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-5.4.0.orig/src/qemu/qemu_command.c libvirt-5.4.0/src/qemu/qemu_command.c
---- libvirt-5.4.0.orig/src/qemu/qemu_command.c	2019-06-17 20:19:15.321000000 +0200
-+++ libvirt-5.4.0/src/qemu/qemu_command.c	2019-06-17 20:19:33.942000000 +0200
-@@ -8280,6 +8280,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+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 -urp libvirt-5.4.0.orig/src/qemu/qemu_command.c libvirt-5.4.0/src/qemu/qemu
      }
  
      virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-5.4.0.orig/src/qemu/qemu.conf libvirt-5.4.0/src/qemu/qemu.conf
---- libvirt-5.4.0.orig/src/qemu/qemu.conf	2019-06-17 20:19:15.325000000 +0200
-+++ libvirt-5.4.0/src/qemu/qemu.conf	2019-06-17 20:19:33.943000000 +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 -urp libvirt-5.4.0.orig/src/qemu/qemu.conf libvirt-5.4.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-5.4.0.orig/src/qemu/qemu_conf.c libvirt-5.4.0/src/qemu/qemu_conf.c
---- libvirt-5.4.0.orig/src/qemu/qemu_conf.c	2019-06-17 20:19:15.323000000 +0200
-+++ libvirt-5.4.0/src/qemu/qemu_conf.c	2019-06-17 20:19:33.943000000 +0200
-@@ -471,6 +471,8 @@ virQEMUDriverConfigLoadVNCEntry(virQEMUD
+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 -urp libvirt-5.4.0.orig/src/qemu/qemu_conf.c libvirt-5.4.0/src/qemu/qemu_co
  
      return 0;
  }
-diff -urp libvirt-5.4.0.orig/src/qemu/qemu_conf.h libvirt-5.4.0/src/qemu/qemu_conf.h
---- libvirt-5.4.0.orig/src/qemu/qemu_conf.h	2019-06-17 20:19:15.323000000 +0200
-+++ libvirt-5.4.0/src/qemu/qemu_conf.h	2019-06-17 20:19:33.944000000 +0200
-@@ -124,6 +124,7 @@ struct _virQEMUDriverConfig {
+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;