X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-qemu-acl.patch;h=2e4cf31b42166835307cc1b763e9a48872810726;hb=02549a4031fa34133809e51ad102a37c04e37672;hp=346926c1b8703b17dc85db0890399228eb1a1b64;hpb=270ab3676a03a7dea28909130a6edfc9a8c68651;p=packages%2Flibvirt.git

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 346926c..2e4cf31 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-1.3.3.orig/src/qemu/qemu_command.c libvirt-1.3.3/src/qemu/qemu_command.c
---- libvirt-1.3.3.orig/src/qemu/qemu_command.c	2016-04-14 10:17:35.131170000 +0000
-+++ libvirt-1.3.3/src/qemu/qemu_command.c	2016-04-14 10:30:12.861170000 +0000
-@@ -7336,6 +7336,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+diff -ur libvirt-7.5.0.orig/src/qemu/qemu_command.c libvirt-7.5.0/src/qemu/qemu_command.c
+--- libvirt-7.5.0.orig/src/qemu/qemu_command.c	2021-07-10 01:17:10.220677568 +0200
++++ libvirt-7.5.0/src/qemu/qemu_command.c	2021-07-10 01:17:25.635677568 +0200
+@@ -8087,6 +8087,10 @@
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -11,11 +11,11 @@ diff -urp libvirt-1.3.3.orig/src/qemu/qemu_command.c libvirt-1.3.3/src/qemu/qemu
 +
      }
  
-     virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-1.3.3.orig/src/qemu/qemu.conf libvirt-1.3.3/src/qemu/qemu.conf
---- libvirt-1.3.3.orig/src/qemu/qemu.conf	2016-04-14 10:17:35.131170000 +0000
-+++ libvirt-1.3.3/src/qemu/qemu.conf	2016-04-14 10:18:01.034170000 +0000
-@@ -80,6 +80,15 @@
+     if (graphics->data.vnc.powerControl != VIR_TRISTATE_BOOL_ABSENT) {
+diff -ur libvirt-7.5.0.orig/src/qemu/qemu.conf libvirt-7.5.0/src/qemu/qemu.conf
+--- libvirt-7.5.0.orig/src/qemu/qemu.conf	2021-07-10 01:17:10.225677568 +0200
++++ libvirt-7.5.0/src/qemu/qemu.conf	2021-07-10 01:17:25.633677568 +0200
+@@ -147,6 +147,15 @@
  #vnc_sasl = 1
  
  
@@ -31,25 +31,26 @@ diff -urp libvirt-1.3.3.orig/src/qemu/qemu.conf libvirt-1.3.3/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-1.3.3.orig/src/qemu/qemu_conf.c libvirt-1.3.3/src/qemu/qemu_conf.c
---- libvirt-1.3.3.orig/src/qemu/qemu_conf.c	2016-04-14 10:17:35.130170000 +0000
-+++ libvirt-1.3.3/src/qemu/qemu_conf.c	2016-04-14 10:18:01.034170000 +0000
-@@ -536,6 +536,7 @@ int virQEMUDriverConfigLoadFile(virQEMUD
-     GET_VALUE_STR("vnc_sasl_dir", cfg->vncSASLdir);
-     GET_VALUE_BOOL("vnc_allow_host_audio", cfg->vncAllowHostAudio);
-     GET_VALUE_BOOL("nographics_allow_host_audio", cfg->nogfxAllowHostAudio);
-+    GET_VALUE_LONG("vnc_acl", cfg->vncACL);
+diff -ur libvirt-7.5.0.orig/src/qemu/qemu_conf.c libvirt-7.5.0/src/qemu/qemu_conf.c
+--- libvirt-7.5.0.orig/src/qemu/qemu_conf.c	2021-07-10 01:17:10.220677568 +0200
++++ libvirt-7.5.0/src/qemu/qemu_conf.c	2021-07-10 01:17:25.636677568 +0200
+@@ -450,6 +450,8 @@
+         return -1;
+     if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
+         return -1;
++    if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0)
++        return -1;
  
-     p = virConfGetValue(conf, "security_driver");
-     if (p && p->type == VIR_CONF_LIST) {
-diff -urp libvirt-1.3.3.orig/src/qemu/qemu_conf.h libvirt-1.3.3/src/qemu/qemu_conf.h
---- libvirt-1.3.3.orig/src/qemu/qemu_conf.h	2016-04-14 10:17:35.130170000 +0000
-+++ libvirt-1.3.3/src/qemu/qemu_conf.h	2016-04-14 10:18:01.035170000 +0000
-@@ -112,6 +112,7 @@ struct _virQEMUDriverConfig {
-     bool vncTLS;
+     return 0;
+ }
+diff -ur libvirt-7.5.0.orig/src/qemu/qemu_conf.h libvirt-7.5.0/src/qemu/qemu_conf.h
+--- libvirt-7.5.0.orig/src/qemu/qemu_conf.h	2021-07-10 01:17:10.220677568 +0200
++++ libvirt-7.5.0/src/qemu/qemu_conf.h	2021-07-10 01:17:25.636677568 +0200
+@@ -114,6 +114,7 @@
      bool vncTLSx509verify;
+     bool vncTLSx509verifyPresent;
      bool vncSASL;
 +    bool vncACL;
      char *vncTLSx509certdir;
+     char *vncTLSx509secretUUID;
      char *vncListen;
-     char *vncPassword;