- updated to 6.10.0, now uses meson for building

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

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 03959ac125aa81997b9faa7dde11ab3e72002323..3ea5678584ab91fb1fa69acc912ba4f2e5b2afbf 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -ur libvirt-6.1.0.orig/src/qemu/qemu.conf libvirt-6.1.0/src/qemu/qemu.conf
---- libvirt-6.1.0.orig/src/qemu/qemu.conf      2020-03-06 09:49:35.413000000 +0100
-+++ libvirt-6.1.0/src/qemu/qemu.conf   2020-03-06 09:50:04.229000000 +0100
-@@ -141,6 +141,15 @@
+diff -ur libvirt-6.10.0.orig/src/qemu/qemu.conf libvirt-6.10.0/src/qemu/qemu.conf
+--- libvirt-6.10.0.orig/src/qemu/qemu.conf     2021-01-01 20:40:17.379692686 +0100
++++ libvirt-6.10.0/src/qemu/qemu.conf  2021-01-01 20:40:45.381692686 +0100
+@@ -147,6 +147,15 @@
  #vnc_sasl = 1
  
  
@@ -17,10 +17,10 @@ diff -ur libvirt-6.1.0.orig/src/qemu/qemu.conf libvirt-6.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 -ur libvirt-6.1.0.orig/src/qemu/qemu_command.c libvirt-6.1.0/src/qemu/qemu_command.c
---- libvirt-6.1.0.orig/src/qemu/qemu_command.c 2020-03-06 09:49:35.413000000 +0100
-+++ libvirt-6.1.0/src/qemu/qemu_command.c      2020-03-06 09:50:04.230000000 +0100
-@@ -7569,6 +7569,10 @@
+diff -ur libvirt-6.10.0.orig/src/qemu/qemu_command.c libvirt-6.10.0/src/qemu/qemu_command.c
+--- libvirt-6.10.0.orig/src/qemu/qemu_command.c        2021-01-01 20:40:17.375692686 +0100
++++ libvirt-6.10.0/src/qemu/qemu_command.c     2021-01-01 20:40:45.382692686 +0100
+@@ -7597,6 +7597,10 @@
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -31,10 +31,10 @@ diff -ur libvirt-6.1.0.orig/src/qemu/qemu_command.c libvirt-6.1.0/src/qemu/qemu_
      }
  
      virCommandAddArg(cmd, "-vnc");
-diff -ur libvirt-6.1.0.orig/src/qemu/qemu_conf.c libvirt-6.1.0/src/qemu/qemu_conf.c
---- libvirt-6.1.0.orig/src/qemu/qemu_conf.c    2020-03-06 09:49:35.410000000 +0100
-+++ libvirt-6.1.0/src/qemu/qemu_conf.c 2020-03-06 09:50:04.230000000 +0100
-@@ -428,6 +428,8 @@
+diff -ur libvirt-6.10.0.orig/src/qemu/qemu_conf.c libvirt-6.10.0/src/qemu/qemu_conf.c
+--- libvirt-6.10.0.orig/src/qemu/qemu_conf.c   2021-01-01 20:40:17.375692686 +0100
++++ libvirt-6.10.0/src/qemu/qemu_conf.c        2021-01-01 20:40:45.382692686 +0100
+@@ -446,6 +446,8 @@
          return -1;
      if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
          return -1;
@@ -43,10 +43,10 @@ diff -ur libvirt-6.1.0.orig/src/qemu/qemu_conf.c libvirt-6.1.0/src/qemu/qemu_con
  
      return 0;
  }
-diff -ur libvirt-6.1.0.orig/src/qemu/qemu_conf.h libvirt-6.1.0/src/qemu/qemu_conf.h
---- libvirt-6.1.0.orig/src/qemu/qemu_conf.h    2020-03-06 09:49:35.409000000 +0100
-+++ libvirt-6.1.0/src/qemu/qemu_conf.h 2020-03-06 09:50:04.230000000 +0100
-@@ -118,6 +118,7 @@
+diff -ur libvirt-6.10.0.orig/src/qemu/qemu_conf.h libvirt-6.10.0/src/qemu/qemu_conf.h
+--- libvirt-6.10.0.orig/src/qemu/qemu_conf.h   2021-01-01 20:40:17.375692686 +0100
++++ libvirt-6.10.0/src/qemu/qemu_conf.h        2021-01-01 20:40:45.383692686 +0100
+@@ -116,6 +116,7 @@
      bool vncTLSx509verify;
      bool vncTLSx509verifyPresent;
      bool vncSASL;