rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.414, 1.415 policycoreutils.spec, 1.601, 1.602

[Daniel J Walsh]

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24683

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-10
- Do not print \n, if count < 1000;


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- policycoreutils-rhat.patch	11 Apr 2009 12:22:23 -0000	1.414
+++ policycoreutils-rhat.patch	14 Apr 2009 13:40:09 -0000	1.415
@@ -1029,3 +1029,41 @@
  		if use_file:
                         ddict = self.get_all(locallist)
                         keys = ddict.keys()
+Binary files nsapolicycoreutils/setfiles/restorecon and policycoreutils-2.0.62/setfiles/restorecon differ
+Binary files nsapolicycoreutils/setfiles/setfiles and policycoreutils-2.0.62/setfiles/setfiles differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.62/setfiles/setfiles.c
+--- nsapolicycoreutils/setfiles/setfiles.c	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.62/setfiles/setfiles.c	2009-04-14 09:38:55.000000000 -0400
+@@ -29,6 +29,8 @@
+ static int mass_relabel;
+ static int mass_relabel_errs;
+ 
++#define STAR_COUNT 1000
++
+ static FILE *outfile = NULL;
+ static int force = 0;
+ #define STAT_BLOCK_SIZE 1
+@@ -444,11 +446,11 @@
+ 
+ 	if (progress) {
+ 		count++;
+-		if (count % 80000 == 0) {
++		if (count % (80 * STAR_COUNT) == 0) {
+ 			fprintf(stdout, "\n");
+ 			fflush(stdout);
+ 		}
+-		if (count % 1000 == 0) {
++		if (count % STAR_COUNT == 0) {
+ 			fprintf(stdout, "*");
+ 			fflush(stdout);
+ 		}
+@@ -1017,7 +1019,7 @@
+ 		free(excludeArray[i].directory);
+ 	}
+ 
+-       if (progress)
++       if (progress && count >= STAR_COUNT)
+                printf("\n");
+ 	exit(errors);
+ }
+Binary files nsapolicycoreutils/setfiles/setfiles.o and policycoreutils-2.0.62/setfiles/setfiles.o differ


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.601
retrieving revision 1.602
diff -u -r1.601 -r1.602
--- policycoreutils.spec	11 Apr 2009 12:22:27 -0000	1.601
+++ policycoreutils.spec	14 Apr 2009 13:40:12 -0000	1.602
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.62
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -221,6 +221,9 @@
 fi
 
 %changelog
+* Tue Apr 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-10
+- Do not print \n, if count < 1000;
+
 * Sat Apr 11 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-9
 - Handle case where subs file does not exist