rpms/libsepol/FC-4 libsepol-rhat.patch, 1.9, 1.10 libsepol.spec, 1.36, 1.37

[fedora-cvs-commits at redhat.com]

Author: dwalsh

Update of /cvs/dist/rpms/libsepol/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv10601

Modified Files:
	libsepol-rhat.patch libsepol.spec 
Log Message:
* Tue Jul 21 2005 Dan Walsh <dwalsh at redhat.com> 1.5.10-1.1
- Fix reset booleans warning message again


libsepol-rhat.patch:
 genbools.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Index: libsepol-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libsepol/FC-4/libsepol-rhat.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libsepol-rhat.patch	26 May 2005 15:00:01 -0000	1.9
+++ libsepol-rhat.patch	21 Jul 2005 16:10:27 -0000	1.10
@@ -1,12 +1,22 @@
-diff --exclude-from=exclude -N -u -r nsalibsepol/src/genbools.c libsepol-1.5.9/src/genbools.c
---- nsalibsepol/src/genbools.c	2005-05-17 08:07:47.000000000 -0400
-+++ libsepol-1.5.9/src/genbools.c	2005-05-26 10:54:03.000000000 -0400
-@@ -194,7 +194,7 @@
- 	for (i = 0; i < nel; i++) {
- 		datum = hashtab_search(policydb.p_bools.table, names[i]);
- 		if (!datum) {
--			__sepol_debug_printf("%s:  unknown boolean %s\n", 
-+			__sepol_debug_printf("%s:  boolean %s no longer in policy\n", 
- 					     __FUNCTION__, names[i]);
- 			errors++;
- 			continue;
+--- libsepol-1.5.10/src/genbools.c.rhat	2005-07-21 12:08:19.000000000 -0400
++++ libsepol-1.5.10/src/genbools.c	2005-07-21 12:08:19.000000000 -0400
+@@ -73,7 +73,8 @@
+ 		if (ret==1) {
+ 			datum = hashtab_search(policydb->p_bools.table, name);
+ 			if (!datum) {
+-				fprintf(stderr,"unknown boolean %s\n", name);
++				__sepol_debug_printf("%s:  boolean %s no longer in policy\n", 
++  					     __FUNCTION__, name);
+ 				errors++;
+ 				continue;
+ 			}
+@@ -92,7 +93,8 @@
+ 			if (ret==1) {
+ 				datum = hashtab_search(policydb->p_bools.table, name);
+ 				if (!datum) {
+-					fprintf(stderr,"unknown boolean %s\n", name);
++					__sepol_debug_printf("%s:  boolean %s no longer in policy\n", 
++							     __FUNCTION__, name);
+ 					errors++;
+ 					continue;
+ 				}


Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/FC-4/libsepol.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libsepol.spec	26 May 2005 15:00:01 -0000	1.36
+++ libsepol.spec	21 Jul 2005 16:10:27 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
 Version: 1.5.10
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
@@ -73,8 +73,12 @@
 /%{_lib}/libsepol.so.1
 
 %changelog
+* Tue Jul 21 2005 Dan Walsh <dwalsh at redhat.com> 1.5.10-1.1
+- Fix reset booleans warning message again
+
 * Tue May 17 2005 Dan Walsh <dwalsh at redhat.com> 1.5.10-1
 - Fix reset booleans warning message
+
 - Upgrade to latest from NSA
 	* License changed to LGPL v2.1, see COPYING.