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

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index c31da45..2e4cf31 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-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
+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-5.1.0.orig/src/qemu/qemu_command.c libvirt-5.1.0/src/qemu/qemu
 +
      }
  
-     virCommandAddArg(cmd, "-vnc");
-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 @@
+     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,10 +31,10 @@ diff -urp libvirt-5.1.0.orig/src/qemu/qemu.conf libvirt-5.1.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.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
+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;
@@ -43,10 +43,10 @@ diff -urp libvirt-5.1.0.orig/src/qemu/qemu_conf.c libvirt-5.1.0/src/qemu/qemu_co
  
      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 {
+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;