X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-qemu-acl.patch;h=0a9e2d93cadbe8a5578cce9c1f000d0dbbc53454;hb=c833928a7e72d39a9e4302b345e26bad8fbbd5ff;hp=d6d2c60bd342a9e7470db9c6ed93e98b803b160d;hpb=77fa38b0152ac1eb78b8ef467bc4eb8bf1fc6875;p=packages%2Flibvirt.git

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index d6d2c60..0a9e2d9 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-5.3.0.orig/src/qemu/qemu_command.c libvirt-5.3.0/src/qemu/qemu_command.c
---- libvirt-5.3.0.orig/src/qemu/qemu_command.c	2019-05-06 14:10:01.332000000 +0200
-+++ libvirt-5.3.0/src/qemu/qemu_command.c	2019-05-06 14:10:36.653000000 +0200
-@@ -8306,6 +8306,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+diff -ur libvirt-5.5.0.orig/src/qemu/qemu_command.c libvirt-5.5.0/src/qemu/qemu_command.c
+--- libvirt-5.5.0.orig/src/qemu/qemu_command.c	2019-07-14 19:27:07.837000000 +0200
++++ libvirt-5.5.0/src/qemu/qemu_command.c	2019-07-14 19:27:29.079000000 +0200
+@@ -8239,6 +8239,10 @@
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,9 +12,9 @@ diff -urp libvirt-5.3.0.orig/src/qemu/qemu_command.c libvirt-5.3.0/src/qemu/qemu
      }
  
      virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-5.3.0.orig/src/qemu/qemu.conf libvirt-5.3.0/src/qemu/qemu.conf
---- libvirt-5.3.0.orig/src/qemu/qemu.conf	2019-05-06 14:10:01.334000000 +0200
-+++ libvirt-5.3.0/src/qemu/qemu.conf	2019-05-06 14:10:36.653000000 +0200
+diff -ur libvirt-5.5.0.orig/src/qemu/qemu.conf libvirt-5.5.0/src/qemu/qemu.conf
+--- libvirt-5.5.0.orig/src/qemu/qemu.conf	2019-07-14 19:27:07.837000000 +0200
++++ libvirt-5.5.0/src/qemu/qemu.conf	2019-07-14 19:27:29.079000000 +0200
 @@ -141,6 +141,15 @@
  #vnc_sasl = 1
  
@@ -31,10 +31,10 @@ diff -urp libvirt-5.3.0.orig/src/qemu/qemu.conf libvirt-5.3.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.3.0.orig/src/qemu/qemu_conf.c libvirt-5.3.0/src/qemu/qemu_conf.c
---- libvirt-5.3.0.orig/src/qemu/qemu_conf.c	2019-05-06 14:10:01.332000000 +0200
-+++ libvirt-5.3.0/src/qemu/qemu_conf.c	2019-05-06 14:10:36.654000000 +0200
-@@ -471,6 +471,8 @@ virQEMUDriverConfigLoadVNCEntry(virQEMUD
+diff -ur libvirt-5.5.0.orig/src/qemu/qemu_conf.c libvirt-5.5.0/src/qemu/qemu_conf.c
+--- libvirt-5.5.0.orig/src/qemu/qemu_conf.c	2019-07-14 19:27:07.836000000 +0200
++++ libvirt-5.5.0/src/qemu/qemu_conf.c	2019-07-14 19:27:29.079000000 +0200
+@@ -453,6 +453,8 @@
          return -1;
      if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
          return -1;
@@ -43,10 +43,10 @@ diff -urp libvirt-5.3.0.orig/src/qemu/qemu_conf.c libvirt-5.3.0/src/qemu/qemu_co
  
      return 0;
  }
-diff -urp libvirt-5.3.0.orig/src/qemu/qemu_conf.h libvirt-5.3.0/src/qemu/qemu_conf.h
---- libvirt-5.3.0.orig/src/qemu/qemu_conf.h	2019-05-06 14:10:01.332000000 +0200
-+++ libvirt-5.3.0/src/qemu/qemu_conf.h	2019-05-06 14:10:36.654000000 +0200
-@@ -124,6 +124,7 @@ struct _virQEMUDriverConfig {
+diff -ur libvirt-5.5.0.orig/src/qemu/qemu_conf.h libvirt-5.5.0/src/qemu/qemu_conf.h
+--- libvirt-5.5.0.orig/src/qemu/qemu_conf.h	2019-07-14 19:27:07.835000000 +0200
++++ libvirt-5.5.0/src/qemu/qemu_conf.h	2019-07-14 19:27:29.080000000 +0200
+@@ -115,6 +115,7 @@
      bool vncTLSx509verify;
      bool vncTLSx509verifyPresent;
      bool vncSASL;