From c391d58b0bc78e8f26909b67ad29d500d6786418 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 07:43:41 +0000
Subject: [PATCH] auto-import changelog data from libselinux-1.15.1-1.src.rpm
 Thu Jul 08 2004 Dan Walsh <dwalsh@redhat.com> 1.15.1-1 - Update to latest
 from NSA - Add fix to only get old path if file_context file exists in old
 location

---
 .cvsignore            |  2 +-
 libselinux-rhat.patch | 17 +++++++++++++++++
 libselinux.spec       |  8 +++++++-
 sources               |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 libselinux-rhat.patch

diff --git a/.cvsignore b/.cvsignore
index 8c3d262..11254b3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libselinux-1.14.1.tgz
+libselinux-1.15.1.tgz
diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch
new file mode 100644
index 0000000..1bb1627
--- /dev/null
+++ b/libselinux-rhat.patch
@@ -0,0 +1,17 @@
+--- libselinux-1.15.1/src/selinux_config.c.rhat	2004-07-08 09:13:49.000000000 -0400
++++ libselinux-1.15.1/src/selinux_config.c	2004-07-08 09:18:47.110934853 -0400
+@@ -91,9 +91,11 @@
+   FILE *cfg;
+   if (selinux_policyroot) return;
+   if (access(SELINUXDIR, F_OK) != 0) {
+-	  selinux_policyroot = SECURITYDIR;
+-	  active_file_paths = compat_file_paths;
+-	  return;
++	  if (access(SECURITYDIR "/selinux/file_contexts", F_OK) == 0) {
++		  selinux_policyroot = SECURITYDIR;
++		  active_file_paths = compat_file_paths;
++		  return;
++	  }
+   }
+   cfg = fopen(SELINUXCONFIG,"r");
+   if (cfg) {
diff --git a/libselinux.spec b/libselinux.spec
index 630f394..65c72a5 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -1,10 +1,11 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.14.1
+Version: 1.15.1
 Release: 1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libselinux-%{version}.tgz
+Patch: libselinux-rhat.patch
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-buildroot
 Provides: libselinux.so
@@ -35,6 +36,7 @@ needed for developing SELinux applications.
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make 
@@ -69,6 +71,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*
 
 %changelog
+* Thu Jul 8 2004 Dan Walsh <dwalsh@redhat.com> 1.15.1-1
+- Update to latest from NSA
+- Add fix to only get old path if file_context file exists in old location
+
 * Wed Jun 30 2004 Dan Walsh <dwalsh@redhat.com> 1.14.1-1
 - Update to latest from NSA
 
diff --git a/sources b/sources
index 1f91960..89c83f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad2875ad1d3b539a4f05004210e014b5  libselinux-1.14.1.tgz
+18bb23feda3f076801cbf50c145bde45  libselinux-1.15.1.tgz