[packages/libvirt] - updated to 1.2.4 - updated xend patch

[qboosh]

commit 521fc25f2c649aa5d9da6003b954c958c163ba5c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon May 26 17:29:27 2014 +0200

    - updated to 1.2.4
    - updated xend patch

 libvirt-xend.patch | 40 ++++++++++++++++++++--------------------
 libvirt.spec       |  9 ++++-----
 2 files changed, 24 insertions(+), 25 deletions(-)
---
diff --git a/libvirt.spec b/libvirt.spec
index c8a8865..270b8fe 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -38,12 +38,12 @@
 Summary:	Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):	Narzędzia współpracujące z funkcjami wirtualizacji
 Name:		libvirt
-Version:	1.2.3
-Release:	4
+Version:	1.2.4
+Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
-# Source0-md5:	ad1602a2fcc3609c83b885a28f3eecbd
+# Source0-md5:	da7a9ca519df45a460659189fe0024e6
 Source1:	%{name}.init
 Source2:	%{name}.tmpfiles
 Patch0:		%{name}-sasl.patch
@@ -780,8 +780,7 @@ fi
 %{_datadir}/libvirt/schemas/nodedev.rng
 %{_datadir}/libvirt/schemas/nwfilter.rng
 %{_datadir}/libvirt/schemas/secret.rng
-%{_datadir}/libvirt/schemas/storageencryption.rng
-%{_datadir}/libvirt/schemas/storagefilefeatures.rng
+%{_datadir}/libvirt/schemas/storagecommon.rng
 %{_datadir}/libvirt/schemas/storagepool.rng
 %{_datadir}/libvirt/schemas/storagevol.rng
 
diff --git a/libvirt-xend.patch b/libvirt-xend.patch
index 08dbc67..a6d4d5b 100644
--- a/libvirt-xend.patch
+++ b/libvirt-xend.patch
@@ -1,25 +1,25 @@
---- libvirt-1.2.3/src/xen/xen_driver.c.orig	2014-04-04 15:57:05.069436605 +0200
-+++ libvirt-1.2.3/src/xen/xen_driver.c	2014-04-04 15:58:59.119434226 +0200
-@@ -318,7 +318,7 @@
-     virCommandPtr cmd;
-     bool ret = false;
+--- libvirt-1.2.4/src/xen/xen_driver.c.orig	2014-05-25 21:03:34.237326121 +0200
++++ libvirt-1.2.4/src/xen/xen_driver.c	2014-05-25 21:25:26.260632109 +0200
+@@ -320,7 +320,7 @@
+     if (virFileExists("/usr/sbin/xend")) {
+         virCommandPtr cmd;
  
--    cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
-+    cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL);
-     if (virCommandRun(cmd, NULL) == 0)
-         ret = true;
-     virCommandFree(cmd);
---- libvirt-1.1.3/src/libxl/libxl_driver.c.orig	2013-10-22 20:46:08.195357964 +0200
-+++ libvirt-1.1.3/src/libxl/libxl_driver.c	2013-10-22 21:17:55.935277904 +0200
-@@ -797,7 +797,7 @@
-     }
+-        cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
++        cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL);
+         if (virCommandRun(cmd, NULL) == 0)
+             ret = true;
+         virCommandFree(cmd);
+--- libvirt-1.2.4/src/libxl/libxl_driver.c.orig	2014-05-25 21:03:34.447326117 +0200
++++ libvirt-1.2.4/src/libxl/libxl_driver.c	2014-05-25 21:28:23.317295096 +0200
+@@ -258,7 +258,7 @@
+     if (virFileExists("/usr/sbin/xend")) {
+         virCommandPtr cmd;
  
-     /* Don't load if legacy xen toolstack (xend) is in use */
--    cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
-+    cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL);
-     if (virCommandRun(cmd, &status) == 0 && status == 0) {
-         VIR_INFO("Legacy xen tool stack seems to be in use, disabling "
-                   "libxenlight driver.");
+-        cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
++        cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL);
+         if (virCommandRun(cmd, NULL) == 0) {
+             VIR_INFO("Legacy xen tool stack seems to be in use, disabling "
+                      "libxenlight driver.");
 --- libvirt-1.2.3/tests/statstest.c.orig	2014-04-04 15:57:05.109436604 +0200
 +++ libvirt-1.2.3/tests/statstest.c	2014-04-04 16:00:09.836099420 +0200
 @@ -49,7 +49,7 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libvirt.git/commitdiff/521fc25f2c649aa5d9da6003b954c958c163ba5c