- updated to 1.3.3, fixed broken qemu-acl patch

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

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index fda5d6508f23432b3079a21615d9204b1bf9cb2e..346926c1b8703b17dc85db0890399228eb1a1b64 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,20 +1,20 @@
-diff -urp libvirt-1.3.2.orig/src/qemu/qemu_command.c libvirt-1.3.2/src/qemu/qemu_command.c
---- libvirt-1.3.2.orig/src/qemu/qemu_command.c 2016-02-24 01:55:16.000000000 +0000
-+++ libvirt-1.3.2/src/qemu/qemu_command.c      2016-03-18 12:33:26.562768000 +0000
-@@ -6047,6 +6047,10 @@ qemuBuildGraphicsSPICECommandLine(virQEM
-         } else {
-             virBufferAddLit(&opt, ",disable-agent-file-xfer");
-         }
+diff -urp libvirt-1.3.3.orig/src/qemu/qemu_command.c libvirt-1.3.3/src/qemu/qemu_command.c
+--- libvirt-1.3.3.orig/src/qemu/qemu_command.c 2016-04-14 10:17:35.131170000 +0000
++++ libvirt-1.3.3/src/qemu/qemu_command.c      2016-04-14 10:30:12.861170000 +0000
+@@ -7336,6 +7336,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+             virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
+ 
+         /* TODO: Support ACLs later */
 +
-+        if (cfg->vncACL) 
++        if (cfg->vncACL)
 +           virBufferAddLit(&opt, ",acl");
 +
      }
  
-     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION)) {
-diff -urp libvirt-1.3.2.orig/src/qemu/qemu.conf libvirt-1.3.2/src/qemu/qemu.conf
---- libvirt-1.3.2.orig/src/qemu/qemu.conf      2016-03-18 12:16:11.000000000 +0000
-+++ libvirt-1.3.2/src/qemu/qemu.conf   2016-03-18 12:33:26.556768000 +0000
+     virCommandAddArg(cmd, "-vnc");
+diff -urp libvirt-1.3.3.orig/src/qemu/qemu.conf libvirt-1.3.3/src/qemu/qemu.conf
+--- libvirt-1.3.3.orig/src/qemu/qemu.conf      2016-04-14 10:17:35.131170000 +0000
++++ libvirt-1.3.3/src/qemu/qemu.conf   2016-04-14 10:18:01.034170000 +0000
 @@ -80,6 +80,15 @@
  #vnc_sasl = 1
  
@@ -31,9 +31,9 @@ diff -urp libvirt-1.3.2.orig/src/qemu/qemu.conf libvirt-1.3.2/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-1.3.2.orig/src/qemu/qemu_conf.c libvirt-1.3.2/src/qemu/qemu_conf.c
---- libvirt-1.3.2.orig/src/qemu/qemu_conf.c    2016-02-24 01:55:16.000000000 +0000
-+++ libvirt-1.3.2/src/qemu/qemu_conf.c 2016-03-18 12:33:26.563768000 +0000
+diff -urp libvirt-1.3.3.orig/src/qemu/qemu_conf.c libvirt-1.3.3/src/qemu/qemu_conf.c
+--- libvirt-1.3.3.orig/src/qemu/qemu_conf.c    2016-04-14 10:17:35.130170000 +0000
++++ libvirt-1.3.3/src/qemu/qemu_conf.c 2016-04-14 10:18:01.034170000 +0000
 @@ -536,6 +536,7 @@ int virQEMUDriverConfigLoadFile(virQEMUD
      GET_VALUE_STR("vnc_sasl_dir", cfg->vncSASLdir);
      GET_VALUE_BOOL("vnc_allow_host_audio", cfg->vncAllowHostAudio);
@@ -42,9 +42,9 @@ diff -urp libvirt-1.3.2.orig/src/qemu/qemu_conf.c libvirt-1.3.2/src/qemu/qemu_co
  
      p = virConfGetValue(conf, "security_driver");
      if (p && p->type == VIR_CONF_LIST) {
-diff -urp libvirt-1.3.2.orig/src/qemu/qemu_conf.h libvirt-1.3.2/src/qemu/qemu_conf.h
---- libvirt-1.3.2.orig/src/qemu/qemu_conf.h    2016-01-10 01:57:37.000000000 +0000
-+++ libvirt-1.3.2/src/qemu/qemu_conf.h 2016-03-18 12:33:26.563768000 +0000
+diff -urp libvirt-1.3.3.orig/src/qemu/qemu_conf.h libvirt-1.3.3/src/qemu/qemu_conf.h
+--- libvirt-1.3.3.orig/src/qemu/qemu_conf.h    2016-04-14 10:17:35.130170000 +0000
++++ libvirt-1.3.3/src/qemu/qemu_conf.h 2016-04-14 10:18:01.035170000 +0000
 @@ -112,6 +112,7 @@ struct _virQEMUDriverConfig {
      bool vncTLS;
      bool vncTLSx509verify;