- Upgrade to latest from NSA

Merged fix warnings patch from Karl MacMillan.
Merged libsepol test framework patch from Karl MacMillan.

.cvsignore

@@ -94,3 +94,4 @@ libsepol-1.12.3.tgz
 libsepol-1.12.4.tgz
 libsepol-1.12.5.tgz
 libsepol-1.12.6.tgz
+libsepol-1.12.8.tgz

libsepol-rhat.patch

@@ -1,47 +1,11 @@
-diff -u -p -r1.5 ebitmap.c
+diff --exclude-from=exclude -N -u -r nsalibsepol/Makefile libsepol-1.12.8/Makefile
---- libsepol/src/ebitmap.c	7 Oct 2005 20:10:15 -0000	1.5
+--- nsalibsepol/Makefile	2006-05-08 09:52:40.000000000 -0400
-+++ libsepol/src/ebitmap.c	27 Mar 2006 21:13:45 -0000
++++ libsepol-1.12.8/Makefile	2006-05-08 10:12:29.000000000 -0400
-@@ -12,6 +12,7 @@
+@@ -1,7 +1,6 @@
- #include <sepol/policydb/ebitmap.h>
+ all: 
- #include <sepol/policydb/policydb.h>
+ 	$(MAKE) -C src 
+ 	$(MAKE) -C utils
+-	$(MAKE) -C tests
  
-+#include "debug.h"
+ install: 
- #include "private.h"
+ 	$(MAKE) -C include install
- 
- int ebitmap_or(ebitmap_t * dst, ebitmap_t * e1, ebitmap_t * e2)
-@@ -182,6 +183,10 @@ int ebitmap_set_bit(ebitmap_t * e, unsig
- {
- 	ebitmap_node_t *n, *prev, *new;
- 
-+	if (bit == (unsigned int)-1) {
-+		ERR(NULL, "negative bit position.");
-+		return -EINVAL;
-+	}
- 
- 	prev = 0;
- 	n = e->node;
-Index: libsepol/src/expand.c
-===================================================================
-RCS file: /nfshome/pal/CVS/selinux-usr/libsepol/src/expand.c,v
-retrieving revision 1.23
-diff -u -p -r1.23 expand.c
---- libsepol/src/expand.c	13 Feb 2006 13:59:54 -0000	1.23
-+++ libsepol/src/expand.c	27 Mar 2006 21:17:21 -0000
-@@ -138,6 +138,8 @@ static int attr_convert_callback(hashtab
- 	ebitmap_for_each_bit(&type->types, node, i) {
- 		if (!ebitmap_node_get_bit(node, i))
- 			continue; 
-+		if (!state->typemap[i])
-+			continue;
- 		if (ebitmap_set_bit(&new_type->types,
- 				    state->typemap[i]-1, 1)) {
- 			ERR (state->handle, "out of memory");
-@@ -1441,6 +1443,8 @@ int expand_convert_type_set(policydb_t *
- 	ebitmap_for_each_bit(&tmp, tnode, i) {                
-                 if (!ebitmap_node_get_bit(tnode, i))
-                         continue;
-+		if (!typemap[i])
-+			continue;
-                 if (ebitmap_set_bit(types, typemap[i] - 1, 1))
-                         return -1;
-         }

libsepol.spec

@@ -5,6 +5,7 @@ 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
@@ -37,6 +38,7 @@ needed for developing applications that manipulate binary policies.
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make clean

sources

@@ -1 +1 @@
-70e3e9af48266b020177625a14b838e2  libsepol-1.12.6.tgz
+b6f39095739effc4edd0d542a408700f  libsepol-1.12.8.tgz