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

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index f4a30bc..44b93a1 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-3.0.0.orig/src/qemu/qemu_command.c libvirt-3.0.0/src/qemu/qemu_command.c
---- libvirt-3.0.0.orig/src/qemu/qemu_command.c	2017-02-11 16:00:09.943362563 +0000
-+++ libvirt-3.0.0/src/qemu/qemu_command.c	2017-02-11 16:01:03.437361961 +0000
-@@ -7650,6 +7650,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+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
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,10 +12,10 @@ diff -urp libvirt-3.0.0.orig/src/qemu/qemu_command.c libvirt-3.0.0/src/qemu/qemu
      }
  
      virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-3.0.0.orig/src/qemu/qemu.conf libvirt-3.0.0/src/qemu/qemu.conf
---- libvirt-3.0.0.orig/src/qemu/qemu.conf	2017-02-11 16:00:09.945362563 +0000
-+++ libvirt-3.0.0/src/qemu/qemu.conf	2017-02-11 16:01:03.438361961 +0000
-@@ -118,6 +118,15 @@
+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
+@@ -141,6 +141,15 @@
  #vnc_sasl = 1
  
  
@@ -31,26 +31,26 @@ diff -urp libvirt-3.0.0.orig/src/qemu/qemu.conf libvirt-3.0.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.0.0.orig/src/qemu/qemu_conf.c libvirt-3.0.0/src/qemu/qemu_conf.c
---- libvirt-3.0.0.orig/src/qemu/qemu_conf.c	2017-02-11 16:00:09.943362563 +0000
-+++ libvirt-3.0.0/src/qemu/qemu_conf.c	2017-02-11 16:01:03.438361961 +0000
-@@ -487,6 +487,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
-         goto cleanup;
-     if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
-         goto cleanup;
+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
+         return -1;
+     if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
+         return -1;
 +    if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0)
-+        goto cleanup;
++        return -1;
  
- 
-     if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
-diff -urp libvirt-3.0.0.orig/src/qemu/qemu_conf.h libvirt-3.0.0/src/qemu/qemu_conf.h
---- libvirt-3.0.0.orig/src/qemu/qemu_conf.h	2017-02-11 16:00:09.943362563 +0000
-+++ libvirt-3.0.0/src/qemu/qemu_conf.h	2017-02-11 16:01:03.438361961 +0000
-@@ -119,6 +119,7 @@ struct _virQEMUDriverConfig {
-     bool vncTLS;
+     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 {
      bool vncTLSx509verify;
+     bool vncTLSx509verifyPresent;
      bool vncSASL;
 +    bool vncACL;
      char *vncTLSx509certdir;
+     char *vncTLSx509secretUUID;
      char *vncListen;
-     char *vncPassword;