- updated to 1.0.3

- updated sasl,qemu-acl patches

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 5b30199919478dd04bbc0711062a57b2e7b24182..67972d2600a749b59625883bb29a8362fb2ab838 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -41,32 +41,29 @@ index 7dd8e03..0ffeaab 100644
 -                /* TODO: Support ACLs later */
              }
 +
-+          if (driver->vncACL) 
++          if (cfg->vncACL) 
 +              virBufferAddLit(&opt, ",acl");
 +          
          }
  
          virCommandAddArg(cmd, "-vnc");
---- libvirt-1.0.1/src/qemu/qemu_conf.c.orig    2013-01-08 20:41:45.877258478 +0100
-+++ libvirt-1.0.1/src/qemu/qemu_conf.c 2013-01-08 21:27:27.817201325 +0100
-@@ -170,6 +170,7 @@
-     GET_VALUE_LONG("vnc_sasl", driver->vncSASL);
-     GET_VALUE_STR("vnc_sasl_dir", driver->vncSASLdir);
-     GET_VALUE_LONG("vnc_allow_host_audio", driver->vncAllowHostAudio);
-+    GET_VALUE_LONG("vnc_acl", driver->vncACL);
+--- libvirt-1.0.3/src/qemu/qemu_conf.c.orig    2013-03-09 13:10:30.059751685 +0100
++++ libvirt-1.0.3/src/qemu/qemu_conf.c 2013-03-09 13:53:45.779640951 +0100
+@@ -365,6 +365,7 @@
+     GET_VALUE_BOOL("vnc_sasl", cfg->vncSASL);
+     GET_VALUE_STR("vnc_sasl_dir", cfg->vncSASLdir);
+     GET_VALUE_BOOL("vnc_allow_host_audio", cfg->vncAllowHostAudio);
++    GET_VALUE_LONG("vnc_acl", cfg->vncACL);
  
      p = virConfGetValue(conf, "security_driver");
      if (p && p->type == VIR_CONF_LIST) {
-diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
-index 83ddedd..3e7506d 100644
---- a/src/qemu/qemu_conf.h
-+++ b/src/qemu/qemu_conf.h
-@@ -85,6 +85,7 @@ struct qemud_driver {
-     unsigned int vncTLS : 1;
-     unsigned int vncTLSx509verify : 1;
-     unsigned int vncSASL : 1;
-+    unsigned int vncACL : 1;
+--- libvirt-1.0.3/src/qemu/qemu_conf.h.orig    2013-03-09 13:10:30.059751685 +0100
++++ libvirt-1.0.3/src/qemu/qemu_conf.h 2013-03-09 13:54:17.296308093 +0100
+@@ -102,6 +102,7 @@
+     bool vncTLS;
+     bool vncTLSx509verify;
+     bool vncSASL;
++    bool vncACL;
      char *vncTLSx509certdir;
      char *vncListen;
      char *vncPassword;
-

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index d54dbe739ac2816be591614a144eefcccfb22607..bc0d6f0e0f64a84aef2f4b1e73c41f0850b995b7 100644 (file)
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -155,18 +155,6 @@ diff -ru libvirt-0.8.8/tests/confdata/libvirtd.out libvirt-0.8.8-sasl/tests/conf
  auth_tcp = "sasl"
  # Change the authentication scheme for TLS sockets.
  #
-diff -ru libvirt-0.8.8/tests/qemuargv2xmltest.c libvirt-0.8.8-sasl/tests/qemuargv2xmltest.c
---- libvirt-0.8.8/tests/qemuargv2xmltest.c     2011-01-24 03:59:21.000000000 +0100
-+++ libvirt-0.8.8-sasl/tests/qemuargv2xmltest.c        2011-04-28 11:45:46.964741165 +0200
-@@ -181,7 +181,7 @@
-     DO_TEST("graphics-vnc-socket");
- 
-     driver.vncSASL = 1;
--    driver.vncSASLdir = strdup("/root/.sasl2");
-+    driver.vncSASLdir = strdup("/root/.sasl");
-     DO_TEST("graphics-vnc-sasl");
-     driver.vncTLS = 1;
-     driver.vncTLSx509verify = 1;
 diff -ru libvirt-0.8.8/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-0.8.8-sasl/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
 --- libvirt-0.8.8/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args   2011-02-03 15:05:31.000000000 +0100
 +++ libvirt-0.8.8-sasl/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args      2011-04-28 11:45:46.860741165 +0200
@@ -187,14 +175,14 @@ diff -ru libvirt-0.8.8/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
  -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
  /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \
  127.0.0.1:3,tls,x509verify=/etc/pki/tls/qemu,sasl
---- libvirt-0.10.1/tests/qemuxml2argvtest.c.orig       2012-08-22 05:19:44.000000000 +0200
-+++ libvirt-0.10.1/tests/qemuxml2argvtest.c    2012-09-02 14:17:43.448454451 +0200
-@@ -507,7 +507,7 @@
-     DO_TEST("graphics-vnc-socket", NONE);
+--- libvirt-1.0.3/tests/qemuxml2argvtest.c.orig        2013-03-09 13:09:01.983088716 +0100
++++ libvirt-1.0.3/tests/qemuxml2argvtest.c     2013-03-09 13:09:34.166420510 +0100
+@@ -563,7 +563,7 @@
  
-     driver.vncSASL = 1;
--    driver.vncSASLdir = strdup("/root/.sasl2");
-+    driver.vncSASLdir = strdup("/root/.sasl");
+     driver.config->vncSASL = 1;
+     VIR_FREE(driver.config->vncSASLdir);
+-    driver.config->vncSASLdir = strdup("/root/.sasl2");
++    driver.config->vncSASLdir = strdup("/root/.sasl");
      DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_VGA);
-     driver.vncTLS = 1;
-     driver.vncTLSx509verify = 1;
+     driver.config->vncTLS = 1;
+     driver.config->vncTLSx509verify = 1;

diff --git a/libvirt.spec b/libvirt.spec
index 7acd14bec5f868b27378ca0d07c65d9764eee42d..f247f55258ca8e6340ae564c2115099329d8d24e 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -30,12 +30,12 @@
 Summary:       Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):     Narzędzia współpracujące z funkcjami wirtualizacji
 Name:          libvirt
-Version:       1.0.2
+Version:       1.0.3
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
-# Source0-md5: 7e268ed702c4331d393e5b43449cae13
+# Source0-md5: 3d9f85d586c9aa3d819b626622f3fc97
 Source1:       %{name}.init
 Source2:       %{name}.tmpfiles
 Patch0:                %{name}-sasl.patch