X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-qemu-acl.patch;h=c31da453600910c9ad34df44c1de47531008e47f;hp=e05d5dfa4aa1ddad0383852ab5edd3daff439894;hb=7470b860cfb9847023a18a90d640e4ed229e6310;hpb=99a79a91e301c50ee0384d32c3c27108e850b2b4

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index e05d5df..c31da45 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-4.5.0.orig/src/qemu/qemu_command.c libvirt-4.5.0/src/qemu/qemu_command.c
---- libvirt-4.5.0.orig/src/qemu/qemu_command.c	2018-07-09 16:27:53.841864595 +0000
-+++ libvirt-4.5.0/src/qemu/qemu_command.c	2018-07-09 16:28:11.860863521 +0000
-@@ -7859,6 +7859,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+diff -urp libvirt-5.1.0.orig/src/qemu/qemu_command.c libvirt-5.1.0/src/qemu/qemu_command.c
+--- libvirt-5.1.0.orig/src/qemu/qemu_command.c	2019-03-23 11:41:18.269000000 +0100
++++ libvirt-5.1.0/src/qemu/qemu_command.c	2019-03-23 11:41:44.602000000 +0100
+@@ -8155,6 +8155,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,10 +12,10 @@ diff -urp libvirt-4.5.0.orig/src/qemu/qemu_command.c libvirt-4.5.0/src/qemu/qemu
      }
  
      virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-4.5.0.orig/src/qemu/qemu.conf libvirt-4.5.0/src/qemu/qemu.conf
---- libvirt-4.5.0.orig/src/qemu/qemu.conf	2018-07-09 16:27:53.844864595 +0000
-+++ libvirt-4.5.0/src/qemu/qemu.conf	2018-07-09 16:28:11.861863521 +0000
-@@ -135,6 +135,15 @@
+diff -urp libvirt-5.1.0.orig/src/qemu/qemu.conf libvirt-5.1.0/src/qemu/qemu.conf
+--- libvirt-5.1.0.orig/src/qemu/qemu.conf	2019-03-23 11:41:18.271000000 +0100
++++ libvirt-5.1.0/src/qemu/qemu.conf	2019-03-23 11:41:44.602000000 +0100
+@@ -141,6 +141,15 @@
  #vnc_sasl = 1
  
  
@@ -31,26 +31,26 @@ diff -urp libvirt-4.5.0.orig/src/qemu/qemu.conf libvirt-4.5.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-4.5.0.orig/src/qemu/qemu_conf.c libvirt-4.5.0/src/qemu/qemu_conf.c
---- libvirt-4.5.0.orig/src/qemu/qemu_conf.c	2018-07-09 16:27:53.842864595 +0000
-+++ libvirt-4.5.0/src/qemu/qemu_conf.c	2018-07-09 16:28:11.861863521 +0000
-@@ -555,6 +555,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
-         goto cleanup;
-     if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
-         goto cleanup;
+diff -urp libvirt-5.1.0.orig/src/qemu/qemu_conf.c libvirt-5.1.0/src/qemu/qemu_conf.c
+--- libvirt-5.1.0.orig/src/qemu/qemu_conf.c	2019-03-23 11:41:18.270000000 +0100
++++ libvirt-5.1.0/src/qemu/qemu_conf.c	2019-03-23 11:47:01.904000000 +0100
+@@ -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-4.5.0.orig/src/qemu/qemu_conf.h libvirt-4.5.0/src/qemu/qemu_conf.h
---- libvirt-4.5.0.orig/src/qemu/qemu_conf.h	2018-07-09 16:27:53.842864595 +0000
-+++ libvirt-4.5.0/src/qemu/qemu_conf.h	2018-07-09 16:28:11.861863521 +0000
+     return 0;
+ }
+diff -urp libvirt-5.1.0.orig/src/qemu/qemu_conf.h libvirt-5.1.0/src/qemu/qemu_conf.h
+--- libvirt-5.1.0.orig/src/qemu/qemu_conf.h	2019-03-23 11:41:18.270000000 +0100
++++ libvirt-5.1.0/src/qemu/qemu_conf.h	2019-03-23 11:41:44.603000000 +0100
 @@ -124,6 +124,7 @@ struct _virQEMUDriverConfig {
-     bool vncTLS;
      bool vncTLSx509verify;
+     bool vncTLSx509verifyPresent;
      bool vncSASL;
 +    bool vncACL;
      char *vncTLSx509certdir;
+     char *vncTLSx509secretUUID;
      char *vncListen;
-     char *vncPassword;