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

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index ce711ac..0a9e2d9 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-4.2.0.orig/src/qemu/qemu_command.c libvirt-4.2.0/src/qemu/qemu_command.c
---- libvirt-4.2.0.orig/src/qemu/qemu_command.c	2018-04-12 12:47:51.427576965 +0000
-+++ libvirt-4.2.0/src/qemu/qemu_command.c	2018-04-12 12:48:01.793576849 +0000
-@@ -7893,6 +7893,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,10 +12,10 @@ diff -urp libvirt-4.2.0.orig/src/qemu/qemu_command.c libvirt-4.2.0/src/qemu/qemu
      }
  
      virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-4.2.0.orig/src/qemu/qemu.conf libvirt-4.2.0/src/qemu/qemu.conf
---- libvirt-4.2.0.orig/src/qemu/qemu.conf	2018-04-12 12:47:51.430576965 +0000
-+++ libvirt-4.2.0/src/qemu/qemu.conf	2018-04-12 12:48:01.794576849 +0000
-@@ -135,6 +135,15 @@
+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,26 +31,26 @@ diff -urp libvirt-4.2.0.orig/src/qemu/qemu.conf libvirt-4.2.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.2.0.orig/src/qemu/qemu_conf.c libvirt-4.2.0/src/qemu/qemu_conf.c
---- libvirt-4.2.0.orig/src/qemu/qemu_conf.c	2018-04-12 12:47:51.428576965 +0000
-+++ libvirt-4.2.0/src/qemu/qemu_conf.c	2018-04-12 12:48:01.794576849 +0000
-@@ -524,6 +524,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
-         goto cleanup;
-     if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
-         goto cleanup;
+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;
 +    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.2.0.orig/src/qemu/qemu_conf.h libvirt-4.2.0/src/qemu/qemu_conf.h
---- libvirt-4.2.0.orig/src/qemu/qemu_conf.h	2018-04-12 12:47:51.428576965 +0000
-+++ libvirt-4.2.0/src/qemu/qemu_conf.h	2018-04-12 12:48:01.794576849 +0000
-@@ -121,6 +121,7 @@ struct _virQEMUDriverConfig {
-     bool vncTLS;
+     return 0;
+ }
+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;
 +    bool vncACL;
      char *vncTLSx509certdir;
+     char *vncTLSx509secretUUID;
      char *vncListen;
-     char *vncPassword;