X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-qemu-acl.patch;h=ce711ac8d27ae587fee550816ba4fa7d8c45e0fe;hb=ed907d1a766e1396c86568c499a5a1687c0c02f9;hp=afb752e68d067dbcaff19ac950b68c54829527f4;hpb=220284abd9e3eba309f18d911bc9f86d1293d677;p=packages%2Flibvirt.git

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index afb752e..ce711ac 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-2.3.0.orig/src/qemu/qemu_command.c libvirt-2.3.0/src/qemu/qemu_command.c
---- libvirt-2.3.0.orig/src/qemu/qemu_command.c	2016-10-28 19:15:31.893715000 +0000
-+++ libvirt-2.3.0/src/qemu/qemu_command.c	2016-10-28 19:15:54.915715000 +0000
-@@ -7536,6 +7536,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+diff -urp libvirt-4.2.0.orig/src/qemu/qemu_command.c libvirt-4.2.0/src/qemu/qemu_command.c
+--- libvirt-4.2.0.orig/src/qemu/qemu_command.c	2018-04-12 12:47:51.427576965 +0000
++++ libvirt-4.2.0/src/qemu/qemu_command.c	2018-04-12 12:48:01.793576849 +0000
+@@ -7893,6 +7893,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,10 +12,10 @@ diff -urp libvirt-2.3.0.orig/src/qemu/qemu_command.c libvirt-2.3.0/src/qemu/qemu
      }
  
      virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-2.3.0.orig/src/qemu/qemu.conf libvirt-2.3.0/src/qemu/qemu.conf
---- libvirt-2.3.0.orig/src/qemu/qemu.conf	2016-10-28 19:15:31.898715000 +0000
-+++ libvirt-2.3.0/src/qemu/qemu.conf	2016-10-28 19:15:54.916715000 +0000
-@@ -104,6 +104,15 @@
+diff -urp libvirt-4.2.0.orig/src/qemu/qemu.conf libvirt-4.2.0/src/qemu/qemu.conf
+--- libvirt-4.2.0.orig/src/qemu/qemu.conf	2018-04-12 12:47:51.430576965 +0000
++++ libvirt-4.2.0/src/qemu/qemu.conf	2018-04-12 12:48:01.794576849 +0000
+@@ -135,6 +135,15 @@
  #vnc_sasl = 1
  
  
@@ -31,10 +31,10 @@ diff -urp libvirt-2.3.0.orig/src/qemu/qemu.conf libvirt-2.3.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-2.3.0.orig/src/qemu/qemu_conf.c libvirt-2.3.0/src/qemu/qemu_conf.c
---- libvirt-2.3.0.orig/src/qemu/qemu_conf.c	2016-10-28 19:15:31.894715000 +0000
-+++ libvirt-2.3.0/src/qemu/qemu_conf.c	2016-10-28 19:15:54.917715000 +0000
-@@ -468,6 +468,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
+diff -urp libvirt-4.2.0.orig/src/qemu/qemu_conf.c libvirt-4.2.0/src/qemu/qemu_conf.c
+--- libvirt-4.2.0.orig/src/qemu/qemu_conf.c	2018-04-12 12:47:51.428576965 +0000
++++ libvirt-4.2.0/src/qemu/qemu_conf.c	2018-04-12 12:48:01.794576849 +0000
+@@ -524,6 +524,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
          goto cleanup;
      if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
          goto cleanup;
@@ -43,10 +43,10 @@ diff -urp libvirt-2.3.0.orig/src/qemu/qemu_conf.c libvirt-2.3.0/src/qemu/qemu_co
  
  
      if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
-diff -urp libvirt-2.3.0.orig/src/qemu/qemu_conf.h libvirt-2.3.0/src/qemu/qemu_conf.h
---- libvirt-2.3.0.orig/src/qemu/qemu_conf.h	2016-10-28 19:15:31.894715000 +0000
-+++ libvirt-2.3.0/src/qemu/qemu_conf.h	2016-10-28 19:15:54.917715000 +0000
-@@ -116,6 +116,7 @@ struct _virQEMUDriverConfig {
+diff -urp libvirt-4.2.0.orig/src/qemu/qemu_conf.h libvirt-4.2.0/src/qemu/qemu_conf.h
+--- libvirt-4.2.0.orig/src/qemu/qemu_conf.h	2018-04-12 12:47:51.428576965 +0000
++++ libvirt-4.2.0/src/qemu/qemu_conf.h	2018-04-12 12:48:01.794576849 +0000
+@@ -121,6 +121,7 @@ struct _virQEMUDriverConfig {
      bool vncTLS;
      bool vncTLSx509verify;
      bool vncSASL;