- BR docutils

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

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index e4781d2b3fef2d1db8b0d86897bc23c9ad1f77c4..67a3abc0135c3458ff2e208b3a3e6658104a7fa8 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-4.0.0.orig/src/qemu/qemu_command.c libvirt-4.0.0/src/qemu/qemu_command.c
---- libvirt-4.0.0.orig/src/qemu/qemu_command.c 2018-01-24 12:03:25.563517453 +0000
-+++ libvirt-4.0.0/src/qemu/qemu_command.c      2018-01-24 12:03:45.990516235 +0000
-@@ -8091,6 +8091,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+diff -ur libvirt-10.2.0.orig/src/qemu/qemu_command.c libvirt-10.2.0/src/qemu/qemu_command.c
+--- libvirt-10.2.0.orig/src/qemu/qemu_command.c        2024-04-03 17:49:34.976744165 +0200
++++ libvirt-10.2.0/src/qemu/qemu_command.c     2024-04-03 17:49:53.468991419 +0200
+@@ -8201,6 +8201,10 @@
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -11,11 +11,34 @@ diff -urp libvirt-4.0.0.orig/src/qemu/qemu_command.c libvirt-4.0.0/src/qemu/qemu
 +
      }
  
-     virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-4.0.0.orig/src/qemu/qemu.conf libvirt-4.0.0/src/qemu/qemu.conf
---- libvirt-4.0.0.orig/src/qemu/qemu.conf      2018-01-24 12:03:25.566517453 +0000
-+++ libvirt-4.0.0/src/qemu/qemu.conf   2018-01-24 12:03:45.991516235 +0000
-@@ -135,6 +135,15 @@
+     if (graphics->data.vnc.powerControl != VIR_TRISTATE_BOOL_ABSENT) {
+diff -ur libvirt-10.2.0.orig/src/qemu/qemu_conf.c libvirt-10.2.0/src/qemu/qemu_conf.c
+--- libvirt-10.2.0.orig/src/qemu/qemu_conf.c   2024-04-03 17:49:34.976744165 +0200
++++ libvirt-10.2.0/src/qemu/qemu_conf.c        2024-04-03 17:49:53.472991473 +0200
+@@ -441,6 +441,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;
+ 
+     if (cfg->vncPassword &&
+         strlen(cfg->vncPassword) > 8) {
+diff -ur libvirt-10.2.0.orig/src/qemu/qemu_conf.h libvirt-10.2.0/src/qemu/qemu_conf.h
+--- libvirt-10.2.0.orig/src/qemu/qemu_conf.h   2024-04-03 17:49:34.980744218 +0200
++++ libvirt-10.2.0/src/qemu/qemu_conf.h        2024-04-03 17:49:53.472991473 +0200
+@@ -120,6 +120,7 @@
+     bool vncTLSx509verify;
+     bool vncTLSx509verifyPresent;
+     bool vncSASL;
++    bool vncACL;
+     char *vncTLSx509certdir;
+     char *vncTLSx509secretUUID;
+     char *vncListen;
+diff -ur libvirt-10.2.0.orig/src/qemu/qemu.conf.in libvirt-10.2.0/src/qemu/qemu.conf.in
+--- libvirt-10.2.0.orig/src/qemu/qemu.conf.in  2024-04-03 17:49:34.976744165 +0200
++++ libvirt-10.2.0/src/qemu/qemu.conf.in       2024-04-03 17:49:53.472991473 +0200
+@@ -147,6 +147,15 @@
  #vnc_sasl = 1
  
  
@@ -24,33 +47,10 @@ diff -urp libvirt-4.0.0.orig/src/qemu/qemu.conf libvirt-4.0.0/src/qemu/qemu.conf
 +# add and remove ids from the ACLs you will need to send the appropriate
 +# commands to the qemu monitor as required by your particular version of
 +# QEMU. See the QEMU documentation for more details.
-+# 
++#
 +# vnc_acl = 1
 +
 +
  # 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-4.0.0.orig/src/qemu/qemu_conf.c libvirt-4.0.0/src/qemu/qemu_conf.c
---- libvirt-4.0.0.orig/src/qemu/qemu_conf.c    2018-01-24 12:03:25.564517453 +0000
-+++ libvirt-4.0.0/src/qemu/qemu_conf.c 2018-01-24 12:03:45.991516235 +0000
-@@ -524,6 +524,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
-         goto cleanup;
-     if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
-         goto cleanup;
-+    if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0)
-+        goto cleanup;
- 
- 
-     if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
-diff -urp libvirt-4.0.0.orig/src/qemu/qemu_conf.h libvirt-4.0.0/src/qemu/qemu_conf.h
---- libvirt-4.0.0.orig/src/qemu/qemu_conf.h    2018-01-24 12:03:25.564517453 +0000
-+++ libvirt-4.0.0/src/qemu/qemu_conf.h 2018-01-24 12:03:45.991516235 +0000
-@@ -121,6 +121,7 @@ struct _virQEMUDriverConfig {
-     bool vncTLS;
-     bool vncTLSx509verify;
-     bool vncSASL;
-+    bool vncACL;
-     char *vncTLSx509certdir;
-     char *vncListen;
-     char *vncPassword;