packages: libvirt/libvirt.spec, libvirt/lxc-without-selinux.patch (NEW)=?UTF-8?Q?=20?=- r...

[baggins]

Author: baggins                      Date: Sat Mar 17 20:01:20 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 8
- fix running lxc on systems without selinux enabled

---- Files affected:
packages/libvirt:
   libvirt.spec (1.69 -> 1.70) , lxc-without-selinux.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libvirt/libvirt.spec
diff -u packages/libvirt/libvirt.spec:1.69 packages/libvirt/libvirt.spec:1.70
--- packages/libvirt/libvirt.spec:1.69	Tue Mar  6 22:19:09 2012
+++ packages/libvirt/libvirt.spec	Sat Mar 17 21:01:14 2012
@@ -31,7 +31,7 @@
 Summary(pl.UTF-8):	Narzędzia współpracujące z funkcjami wirtualizacji
 Name:		libvirt
 Version:	0.9.10
-Release:	7
+Release:	8
 License:	LGPL v2.1+
 Group:		Base/Kernel
 Source0:	ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
@@ -42,6 +42,7 @@
 Patch1:		%{name}-lxc.patch
 Patch2:		libvirt-qemu-acl.patch
 Patch3:		libvirt-xend.patch
+Patch4:		lxc-without-selinux.patch
 URL:		http://www.libvirt.org/
 BuildRequires:	audit-libs-devel
 BuildRequires:	augeas-devel
@@ -250,6 +251,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # weird translations
 %{__rm} po/{my,eu_ES}.{po,gmo}
@@ -492,6 +494,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.70  2012/03/17 20:01:14  baggins
+- rel 8
+- fix running lxc on systems without selinux enabled
+
 Revision 1.69  2012/03/06 21:19:09  wiget
 - rel. 7
 

================================================================
Index: packages/libvirt/lxc-without-selinux.patch
diff -u /dev/null packages/libvirt/lxc-without-selinux.patch:1.1
--- /dev/null	Sat Mar 17 21:01:20 2012
+++ packages/libvirt/lxc-without-selinux.patch	Sat Mar 17 21:01:14 2012
@@ -0,0 +1,22 @@
+--- libvirt-0.9.10/src/lxc/lxc_container.c~	2012-02-13 08:06:23.000000000 +0100
++++ libvirt-0.9.10/src/lxc/lxc_container.c	2012-03-17 20:40:10.960883236 +0100
+@@ -501,7 +501,7 @@
+     if (pivotRoot) {
+ #if HAVE_SELINUX
+         if (getfilecon("/", &con) < 0 &&
+-            errno != ENOTSUP) {
++            errno != ENOTSUP && errno != ENODATA) {
+             virReportSystemError(errno, "%s",
+                                  _("Failed to query file context on /"));
+             goto cleanup;
+--- libvirt-0.9.10/src/lxc/lxc_controller.c~	2012-03-17 20:14:16.117479754 +0100
++++ libvirt-0.9.10/src/lxc/lxc_controller.c	2012-03-17 20:41:17.730886249 +0100
+@@ -1492,7 +1492,7 @@
+ 
+ #if HAVE_SELINUX
+         if (getfilecon(root->src, &con) < 0 &&
+-            errno != ENOTSUP) {
++            errno != ENOTSUP && errno != ENODATA) {
+             virReportSystemError(errno,
+                                  _("Failed to query file context on %s"),
+                                  root->src);
================================================================

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