From 7ae04558eec057c4e246eb7f97eead8e79473319 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Tue, 26 Apr 2005 16:33:22 +0000
Subject: [PATCH] - Upgrade to latest from NSA Fixed bug in role hierarchy
 checker.

---
 .cvsignore          |  1 +
 libsepol-rhat.patch | 16 ++--------------
 libsepol.spec       |  2 --
 sources             |  2 +-
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 4bd5be2..232e982 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -12,3 +12,4 @@ libsepol-1.5.1.tgz
 libsepol-1.5.2.tgz
 libsepol-1.5.3.tgz
 libsepol-1.5.5.tgz
+libsepol-1.5.6.tgz
diff --git a/libsepol-rhat.patch b/libsepol-rhat.patch
index b0c6613..da50038 100644
--- a/libsepol-rhat.patch
+++ b/libsepol-rhat.patch
@@ -1,24 +1,12 @@
 diff --exclude-from=exclude -N -u -r nsalibsepol/src/genbools.c libsepol-1.5.5/src/genbools.c
---- nsalibsepol/src/genbools.c	2005-03-29 21:55:26.000000000 -0500
+--- nsalibsepol/src/genbools.c	2005-04-26 12:15:36.000000000 -0400
 +++ libsepol-1.5.5/src/genbools.c	2005-04-25 15:25:55.000000000 -0400
 @@ -195,7 +195,7 @@
  	}
  
  	if (evaluate_conds(&policydb) < 0) {
--		__sepol_debug_printf("%s:  Error while re-evaluating conditionals: %s\n",
+-		__sepol_debug_printf("%s:  Error while re-evaluating conditionals\n",
 +		__sepol_debug_printf("%s: Error while re-evaluating conditionals\n",
  				     __FUNCTION__);
  		errno = EINVAL;
  		goto err;
-diff --exclude-from=exclude -N -u -r nsalibsepol/src/hierarchy.c libsepol-1.5.5/src/hierarchy.c
---- nsalibsepol/src/hierarchy.c	2005-04-14 08:28:00.000000000 -0400
-+++ libsepol-1.5.5/src/hierarchy.c	2005-04-25 15:21:51.000000000 -0400
-@@ -269,7 +269,7 @@
- 	char *parent;
- 	hierarchy_args_t *a;
- 	role_datum_t *r, *rp;
--	ebitmap_t *eb;
-+	ebitmap_t *eb=NULL;
- 
- 	a = (hierarchy_args_t *)args;
- 	r = (role_datum_t *)d;
diff --git a/libsepol.spec b/libsepol.spec
index cfda3cf..c965b5d 100644
--- a/libsepol.spec
+++ b/libsepol.spec
@@ -5,7 +5,6 @@ Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
-Patch: libsepol-rhat.patch
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-buildroot
 Provides: libsepol.so
@@ -37,7 +36,6 @@ needed for developing applications that manipulate binary policies.
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make CFLAGS="%{optflags}"
diff --git a/sources b/sources
index 2877817..ec4f8ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-07bf6ff3b2878e429030494f7b05cad6  libsepol-1.5.5.tgz
+2e936fdd143703f1d16f2605c39e6f7c  libsepol-1.5.6.tgz