- updated to 7.7.0

[packages/libvirt.git] / libvirt-qemu-acl.patch

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index f4a30bcad0c6c941b77657f06a0e72723474a1e4..2e4cf31b42166835307cc1b763e9a48872810726 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-3.0.0.orig/src/qemu/qemu_command.c libvirt-3.0.0/src/qemu/qemu_command.c
---- libvirt-3.0.0.orig/src/qemu/qemu_command.c 2017-02-11 16:00:09.943362563 +0000
-+++ libvirt-3.0.0/src/qemu/qemu_command.c      2017-02-11 16:01:03.437361961 +0000
-@@ -7650,6 +7650,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-3.0.0.orig/src/qemu/qemu_command.c libvirt-3.0.0/src/qemu/qemu
 +
      }
  
-     virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-3.0.0.orig/src/qemu/qemu.conf libvirt-3.0.0/src/qemu/qemu.conf
---- libvirt-3.0.0.orig/src/qemu/qemu.conf      2017-02-11 16:00:09.945362563 +0000
-+++ libvirt-3.0.0/src/qemu/qemu.conf   2017-02-11 16:01:03.438361961 +0000
-@@ -118,6 +118,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,26 +31,26 @@ diff -urp libvirt-3.0.0.orig/src/qemu/qemu.conf libvirt-3.0.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-3.0.0.orig/src/qemu/qemu_conf.c libvirt-3.0.0/src/qemu/qemu_conf.c
---- libvirt-3.0.0.orig/src/qemu/qemu_conf.c    2017-02-11 16:00:09.943362563 +0000
-+++ libvirt-3.0.0/src/qemu/qemu_conf.c 2017-02-11 16:01:03.438361961 +0000
-@@ -487,6 +487,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
-         goto cleanup;
-     if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
-         goto cleanup;
+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)
-+        goto cleanup;
++        return -1;
  
- 
-     if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
-diff -urp libvirt-3.0.0.orig/src/qemu/qemu_conf.h libvirt-3.0.0/src/qemu/qemu_conf.h
---- libvirt-3.0.0.orig/src/qemu/qemu_conf.h    2017-02-11 16:00:09.943362563 +0000
-+++ libvirt-3.0.0/src/qemu/qemu_conf.h 2017-02-11 16:01:03.438361961 +0000
-@@ -119,6 +119,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;