- updated to 3.0.0, TLDized virtlockd and virtlogd init scripts

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

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index e2de6e56806e13b835e38e018345cf727e1c3676..f4a30bcad0c6c941b77657f06a0e72723474a1e4 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-2.1.0.orig/src/qemu/qemu_command.c libvirt-2.1.0/src/qemu/qemu_command.c
---- libvirt-2.1.0.orig/src/qemu/qemu_command.c 2016-08-20 10:12:37.332554000 +0000
-+++ libvirt-2.1.0/src/qemu/qemu_command.c      2016-08-20 10:13:30.288554000 +0000
-@@ -7519,6 +7519,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+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
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,10 +12,10 @@ diff -urp libvirt-2.1.0.orig/src/qemu/qemu_command.c libvirt-2.1.0/src/qemu/qemu
      }
  
      virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.0/src/qemu/qemu.conf
---- libvirt-2.1.0.orig/src/qemu/qemu.conf      2016-08-20 10:12:37.337554000 +0000
-+++ libvirt-2.1.0/src/qemu/qemu.conf   2016-08-20 10:13:30.289554000 +0000
-@@ -80,6 +80,15 @@
+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 @@
  #vnc_sasl = 1
  
  
@@ -31,10 +31,10 @@ diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.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 -urp libvirt-2.1.0.orig/src/qemu/qemu_conf.c libvirt-2.1.0/src/qemu/qemu_conf.c
---- libvirt-2.1.0.orig/src/qemu/qemu_conf.c    2016-08-20 10:12:37.334554000 +0000
-+++ libvirt-2.1.0/src/qemu/qemu_conf.c 2016-08-20 10:15:22.160554000 +0000
-@@ -425,6 +425,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
+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;
@@ -43,10 +43,10 @@ diff -urp libvirt-2.1.0.orig/src/qemu/qemu_conf.c libvirt-2.1.0/src/qemu/qemu_co
  
  
      if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
-diff -urp libvirt-2.1.0.orig/src/qemu/qemu_conf.h libvirt-2.1.0/src/qemu/qemu_conf.h
---- libvirt-2.1.0.orig/src/qemu/qemu_conf.h    2016-08-20 10:12:37.334554000 +0000
-+++ libvirt-2.1.0/src/qemu/qemu_conf.h 2016-08-20 10:13:30.294554000 +0000
-@@ -113,6 +113,7 @@ struct _virQEMUDriverConfig {
+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;
      bool vncTLSx509verify;
      bool vncSASL;