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

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 44b93a1..2b7f6a8 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-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
+diff -ur libvirt-8.0.0.orig/src/qemu/qemu_command.c libvirt-8.0.0/src/qemu/qemu_command.c
+--- libvirt-8.0.0.orig/src/qemu/qemu_command.c	2022-01-23 12:17:21.722539037 +0100
++++ libvirt-8.0.0/src/qemu/qemu_command.c	2022-01-23 12:17:43.308582727 +0100
+@@ -8327,6 +8327,10 @@
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -11,11 +11,11 @@ diff -urp libvirt-5.4.0.orig/src/qemu/qemu_command.c libvirt-5.4.0/src/qemu/qemu
 +
      }
  
-     virCommandAddArg(cmd, "-vnc");
-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 @@
+     if (graphics->data.vnc.powerControl != VIR_TRISTATE_BOOL_ABSENT) {
+diff -ur libvirt-8.0.0.orig/src/qemu/qemu.conf libvirt-8.0.0/src/qemu/qemu.conf
+--- libvirt-8.0.0.orig/src/qemu/qemu.conf	2022-01-23 12:17:21.720539033 +0100
++++ libvirt-8.0.0/src/qemu/qemu.conf	2022-01-23 12:17:43.308582727 +0100
+@@ -147,6 +147,15 @@
  #vnc_sasl = 1
  
  
@@ -31,22 +31,22 @@ diff -urp libvirt-5.4.0.orig/src/qemu/qemu.conf libvirt-5.4.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.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
+diff -ur libvirt-8.0.0.orig/src/qemu/qemu_conf.c libvirt-8.0.0/src/qemu/qemu_conf.c
+--- libvirt-8.0.0.orig/src/qemu/qemu_conf.c	2022-01-23 12:17:21.722539037 +0100
++++ libvirt-8.0.0/src/qemu/qemu_conf.c	2022-01-23 12:17:43.308582727 +0100
+@@ -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;
  
-     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 {
+     if (cfg->vncPassword &&
+         strlen(cfg->vncPassword) > 8) {
+diff -ur libvirt-8.0.0.orig/src/qemu/qemu_conf.h libvirt-8.0.0/src/qemu/qemu_conf.h
+--- libvirt-8.0.0.orig/src/qemu/qemu_conf.h	2022-01-23 12:17:21.722539037 +0100
++++ libvirt-8.0.0/src/qemu/qemu_conf.h	2022-01-23 12:17:43.309582729 +0100
+@@ -114,6 +114,7 @@
      bool vncTLSx509verify;
      bool vncTLSx509verifyPresent;
      bool vncSASL;