packages: libvirt/libvirt.spec, libvirt/libvirt-xend.patch (NEW)=?UTF-8?Q?=20?=- rel 5 -=?UTF-8?Q?=20?=...

[baggins]

Author: baggins                      Date: Tue Mar  6 13:38:40 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5
- check if xend is running our way 

---- Files affected:
packages/libvirt:
   libvirt.spec (1.66 -> 1.67) , libvirt-xend.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libvirt/libvirt.spec
diff -u packages/libvirt/libvirt.spec:1.66 packages/libvirt/libvirt.spec:1.67
--- packages/libvirt/libvirt.spec:1.66	Mon Mar  5 15:02:49 2012
+++ packages/libvirt/libvirt.spec	Tue Mar  6 14:38:35 2012
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-# xenapi (libxenserver), xenlight (libxenlight)?
-# --with-driver-modules ?
 #
 # Conditional build:
 %bcond_without	xen		# xen
@@ -33,7 +31,7 @@
 Summary(pl.UTF-8):	Narzędzia współpracujące z funkcjami wirtualizacji
 Name:		libvirt
 Version:	0.9.10
-Release:	4
+Release:	5
 License:	LGPL v2.1+
 Group:		Base/Kernel
 Source0:	ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
@@ -43,6 +41,7 @@
 Patch0:		%{name}-sasl.patch
 Patch1:		%{name}-lxc.patch
 Patch2:		libvirt-qemu-acl.patch
+Patch3:		libvirt-xend.patch
 URL:		http://www.libvirt.org/
 BuildRequires:	audit-libs-devel
 BuildRequires:	augeas-devel
@@ -250,6 +249,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # weird translations
 %{__rm} po/{my,eu_ES}.{po,gmo}
@@ -491,6 +491,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2012/03/06 13:38:35  baggins
+- rel 5
+- check if xend is running our way
+
 Revision 1.66  2012/03/05 14:02:49  baggins
 - rel 4
 

================================================================
Index: packages/libvirt/libvirt-xend.patch
diff -u /dev/null packages/libvirt/libvirt-xend.patch:1.1
--- /dev/null	Tue Mar  6 14:38:40 2012
+++ packages/libvirt/libvirt-xend.patch	Tue Mar  6 14:38:35 2012
@@ -0,0 +1,44 @@
+--- libvirt-0.9.10/src/xen/xen_driver.c~	2012-02-13 08:06:23.000000000 +0100
++++ libvirt-0.9.10/src/xen/xen_driver.c	2012-03-06 14:03:45.273637374 +0100
+@@ -240,7 +240,7 @@
+     int status;
+     int ret = 0;
+ 
+-    cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
++    cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL);
+     if (virCommandRun(cmd, &status) == 0 && status == 0)
+         ret = 1;
+     virCommandFree(cmd);
+--- libvirt-0.9.10/src/libxl/libxl_driver.c~	2012-02-06 03:50:50.000000000 +0100
++++ libvirt-0.9.10/src/libxl/libxl_driver.c	2012-03-06 14:27:35.983701925 +0100
+@@ -840,7 +840,7 @@
+     }
+ 
+     /* Disable driver 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.");
+--- libvirt-0.9.10/tests/statstest.c~	2011-11-22 02:52:24.000000000 +0100
++++ libvirt-0.9.10/tests/statstest.c	2012-03-06 14:36:59.970394039 +0100
+@@ -56,7 +56,7 @@
+     uname(&ut);
+     if (strstr(ut.release, "xen") == NULL)
+         return EXIT_AM_SKIP;
+-    cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
++    cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL);
+     if (virCommandRun(cmd, &status) != 0 || status != 0) {
+         virCommandFree(cmd);
+         return EXIT_AM_SKIP;
+--- libvirt-0.9.10/tests/reconnect.c~	2011-11-22 02:52:24.000000000 +0100
++++ libvirt-0.9.10/tests/reconnect.c	2012-03-06 14:37:27.777061955 +0100
+@@ -29,7 +29,7 @@
+     uname(&ut);
+     if (strstr(ut.release, "xen") == NULL)
+         return EXIT_AM_SKIP;
+-    cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
++    cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL);
+     if (virCommandRun(cmd, &status) != 0 || status != 0) {
+         virCommandFree(cmd);
+         return EXIT_AM_SKIP;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libvirt/libvirt.spec?r1=1.66&r2=1.67&f=u