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

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 2e4cf31..2b7f6a8 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-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 @@
+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 */
@@ -12,9 +12,9 @@ diff -ur libvirt-7.5.0.orig/src/qemu/qemu_command.c libvirt-7.5.0/src/qemu/qemu_
      }
  
      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
+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,9 +31,9 @@ diff -ur libvirt-7.5.0.orig/src/qemu/qemu.conf libvirt-7.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 -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
+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)
@@ -41,11 +41,11 @@ diff -ur libvirt-7.5.0.orig/src/qemu/qemu_conf.c libvirt-7.5.0/src/qemu/qemu_con
 +    if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0)
 +        return -1;
  
-     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
+     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;