From cde1f7723795d3aef0a2a8968f03066dd0c34aba Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Jan 13 2006 22:36:39 +0000
Subject: *** empty log message ***


---

diff --git a/.cvsignore b/.cvsignore
index d08f473..2454851 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -46,3 +46,5 @@ libsemanage-1.5.4.tgz
 libsemanage-1.5.6.tgz
 libsemanage-1.5.8.tgz
 libsemanage-1.5.9.tgz
+libsemanage-1.5.11.tgz
+libsemanage-1.5.14.tgz
diff --git a/libsemanage-rhat.patch b/libsemanage-rhat.patch
index 318ace4..1143165 100644
--- a/libsemanage-rhat.patch
+++ b/libsemanage-rhat.patch
@@ -1,11 +1,45 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/database_llist.c libsemanage-1.5.4/src/database_llist.c
---- nsalibsemanage/src/database_llist.c	2006-01-04 12:18:17.000000000 -0500
-+++ libsemanage-1.5.4/src/database_llist.c	2006-01-04 16:26:39.000000000 -0500
-@@ -136,6 +136,7 @@
- 	if (dbase_llist_cache_prepend(handle, dbase, data) < 0)
- 		goto err;
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/fcontext_record.c libsemanage-1.5.9/src/fcontext_record.c
+--- nsalibsemanage/src/fcontext_record.c	2006-01-06 10:33:10.000000000 -0500
++++ libsemanage-1.5.9/src/fcontext_record.c	2006-01-06 13:40:38.000000000 -0500
+@@ -81,8 +81,18 @@
+ 	const semanage_fcontext_t* fcontext, 
+ 	const semanage_fcontext_key_t* key) {
  
-+	dbase->modified = 1;
- 	return STATUS_SUCCESS;
+-	return strcmp(fcontext->expr, key->expr) && 
+-		(fcontext->type == key->type);
++	int rv = strcmp(fcontext->expr, key->expr);
++	if (rv != 0)
++		return rv;
++	else {
++		if (fcontext->type < key->type)	
++			return -1;
++	
++		else if (key->type < fcontext->type)
++			return 1;
++	
++		else return 0;
++	}
+ }
+ hidden_def(semanage_fcontext_compare)
+ 
+@@ -90,8 +100,18 @@
+ 	const semanage_fcontext_t* fcontext,
+ 	const semanage_fcontext_t* fcontext2) {
+ 
+-	return strcmp(fcontext->expr, fcontext2->expr) &&
+-		(fcontext->type == fcontext2->type);
++	int rv = strcmp(fcontext->expr, fcontext2->expr);
++	if (rv != 0)
++		return rv;
++	else {
++		if (fcontext->type < fcontext2->type)
++			return -1;
++
++		else if (fcontext2->type < fcontext->type)
++			return 1;
++
++		else return 0;
++	}
+ }
+ hidden_def(semanage_fcontext_compare2)
  
- 	err:
diff --git a/libsemanage.spec b/libsemanage.spec
index 3826ad0..581eedf 100644
--- a/libsemanage.spec
+++ b/libsemanage.spec
@@ -7,7 +7,6 @@ Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
-Patch: libsemanage-rhat.patch 
 
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildRequires: libselinux-devel >= %{libselinuxver} 
@@ -40,7 +39,6 @@ needed for developing applications that manipulate binary policies.
 
 %prep
 %setup -q
-%patch -p 1 -b .rhat
 
 %build
 make clean
diff --git a/sources b/sources
index da1338c..e9facca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4b27bec1cb92dac96c2fda30b4c6cafe  libsemanage-1.5.9.tgz
+6a136bd40751507a05a6a6f0996cb4cc  libsemanage-1.5.14.tgz