- updated to 9.5.0, added zfs bcond

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

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index e81c7d8d22a66ec9b255ea7b229819ab586492ac..779f6dd4748d184ea5ffad442b742bcb840c1a7c 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-4.1.0.orig/src/qemu/qemu_command.c libvirt-4.1.0/src/qemu/qemu_command.c
---- libvirt-4.1.0.orig/src/qemu/qemu_command.c 2018-02-26 09:02:18.000000000 +0000
-+++ libvirt-4.1.0/src/qemu/qemu_command.c      2018-03-12 10:54:51.326947485 +0000
-@@ -7842,6 +7842,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+diff -ur libvirt-9.5.0.orig/src/qemu/qemu_command.c libvirt-9.5.0/src/qemu/qemu_command.c
+--- libvirt-9.5.0.orig/src/qemu/qemu_command.c 2023-07-20 17:19:16.014948742 +0200
++++ libvirt-9.5.0/src/qemu/qemu_command.c      2023-07-20 17:19:30.957162714 +0200
+@@ -8057,6 +8057,10 @@
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -11,11 +11,34 @@ diff -urp libvirt-4.1.0.orig/src/qemu/qemu_command.c libvirt-4.1.0/src/qemu/qemu
 +
      }
  
-     virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-4.1.0.orig/src/qemu/qemu.conf libvirt-4.1.0/src/qemu/qemu.conf
---- libvirt-4.1.0.orig/src/qemu/qemu.conf      2018-03-12 10:51:10.000000000 +0000
-+++ libvirt-4.1.0/src/qemu/qemu.conf   2018-03-12 10:54:51.327947485 +0000
-@@ -135,6 +135,15 @@
+     if (graphics->data.vnc.powerControl != VIR_TRISTATE_BOOL_ABSENT) {
+diff -ur libvirt-9.5.0.orig/src/qemu/qemu_conf.c libvirt-9.5.0/src/qemu/qemu_conf.c
+--- libvirt-9.5.0.orig/src/qemu/qemu_conf.c    2023-07-20 17:19:16.014948742 +0200
++++ libvirt-9.5.0/src/qemu/qemu_conf.c 2023-07-20 17:19:30.958162728 +0200
+@@ -443,6 +443,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-9.5.0.orig/src/qemu/qemu_conf.h libvirt-9.5.0/src/qemu/qemu_conf.h
+--- libvirt-9.5.0.orig/src/qemu/qemu_conf.h    2023-07-20 17:19:16.014948742 +0200
++++ libvirt-9.5.0/src/qemu/qemu_conf.h 2023-07-20 17:19:30.958162728 +0200
+@@ -119,6 +119,7 @@
+     bool vncTLSx509verify;
+     bool vncTLSx509verifyPresent;
+     bool vncSASL;
++    bool vncACL;
+     char *vncTLSx509certdir;
+     char *vncTLSx509secretUUID;
+     char *vncListen;
+diff -ur libvirt-9.5.0.orig/src/qemu/qemu.conf.in libvirt-9.5.0/src/qemu/qemu.conf.in
+--- libvirt-9.5.0.orig/src/qemu/qemu.conf.in   2023-07-20 17:19:16.013948728 +0200
++++ libvirt-9.5.0/src/qemu/qemu.conf.in        2023-07-20 17:19:30.958162728 +0200
+@@ -147,6 +147,15 @@
  #vnc_sasl = 1
  
  
@@ -24,33 +47,10 @@ diff -urp libvirt-4.1.0.orig/src/qemu/qemu.conf libvirt-4.1.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.1.0.orig/src/qemu/qemu_conf.c libvirt-4.1.0/src/qemu/qemu_conf.c
---- libvirt-4.1.0.orig/src/qemu/qemu_conf.c    2018-02-26 09:02:18.000000000 +0000
-+++ libvirt-4.1.0/src/qemu/qemu_conf.c 2018-03-12 10:54:51.327947485 +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.1.0.orig/src/qemu/qemu_conf.h libvirt-4.1.0/src/qemu/qemu_conf.h
---- libvirt-4.1.0.orig/src/qemu/qemu_conf.h    2018-02-26 09:02:18.000000000 +0000
-+++ libvirt-4.1.0/src/qemu/qemu_conf.h 2018-03-12 10:54:51.327947485 +0000
-@@ -121,6 +121,7 @@ struct _virQEMUDriverConfig {
-     bool vncTLS;
-     bool vncTLSx509verify;
-     bool vncSASL;
-+    bool vncACL;
-     char *vncTLSx509certdir;
-     char *vncListen;
-     char *vncPassword;