From 3f542ebbedbff63ff07a4fea3b7f6ee1696a949f Mon Sep 17 00:00:00 2001
From: Dan Walsh <dwalsh@redhat.com>
Date: Thu, 22 Sep 2011 09:38:06 -0400
Subject: [PATCH] Handle situation where selinux=0 passed to the kernel and
 both /selinux and

---
 libselinux-rhat.patch | 13 +++++++++++++
 libselinux.spec       |  7 +++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch
index d8d8550..6fd8710 100644
--- a/libselinux-rhat.patch
+++ b/libselinux-rhat.patch
@@ -164,6 +164,19 @@ index 3b8346d..02f3f98 100644
  				     pass, ++lineno) != 0)
  					goto finish;
  			}
+diff --git a/libselinux/src/load_policy.c b/libselinux/src/load_policy.c
+index 868660f..7fa6383 100644
+--- a/libselinux/src/load_policy.c
++++ b/libselinux/src/load_policy.c
+@@ -380,7 +380,7 @@ int selinux_init_load_policy(int *enforce)
+ 	}
+ 
+ 	if (! mntpoint ) {
+-		if (errno == ENODEV) {
++		if (errno == ENODEV || errno == ENOENT) {
+ 			/*
+ 			 * SELinux was disabled in the kernel, either
+ 			 * omitted entirely or disabled at boot via selinux=0.
 diff --git a/libselinux/src/matchpathcon.c b/libselinux/src/matchpathcon.c
 index 5914afa..df83b30 100644
 --- a/libselinux/src/matchpathcon.c
diff --git a/libselinux.spec b/libselinux.spec
index f563d98..fb4c1e5 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -1,13 +1,13 @@
 %global with_python3 1
 
 %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
-%define libsepolver 2.1.2-3
+%define libsepolver 2.1.3-1
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tgz
@@ -231,6 +231,9 @@ rm -rf %{buildroot}
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Thu Sep 22 2011 Dan Walsh <dwalsh@redhat.com> - 2.1.6-2
+- Handle situation where selinux=0 passed to the kernel and both /selinux and 
+
 * Mon Sep 19 2011 Dan Walsh <dwalsh@redhat.com> - 2.1.6-1
 -Update to upstream
 	* utils: matchpathcon: remove duplicate declaration