rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.388, 1.389 policycoreutils.spec, 1.552, 1.553

[Daniel J Walsh]

Author: dwalsh

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

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Sep 8 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-4
- Fix fixfiles to correct unlabeled_t files and remove .? files


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- policycoreutils-rhat.patch	8 Sep 2008 17:47:59 -0000	1.388
+++ policycoreutils-rhat.patch	8 Sep 2008 18:09:36 -0000	1.389
@@ -71,19 +71,22 @@
  	strings_list_free(list1);
 diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.55/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/scripts/fixfiles	2008-09-08 13:45:29.000000000 -0400
-@@ -141,12 +141,13 @@
++++ policycoreutils-2.0.55/scripts/fixfiles	2008-09-08 14:08:57.000000000 -0400
+@@ -139,14 +139,14 @@
+ LogReadOnly
+ ${SETFILES} -q ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
  rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-*
- find /tmp -context "*:file_t*" -exec chcon -t tmp_t {} \;
- find /var/tmp -context "*:file_t*" -exec chcon -t tmp_t {} \;
-+find /var/tmp -context "*:unlabeled_t*" -exec chcon -t tmp_t {} \;
+-find /tmp -context "*:file_t*" -exec chcon -t tmp_t {} \;
+-find /var/tmp -context "*:file_t*" -exec chcon -t tmp_t {} \;
++find /tmp \( -context "*:file_t*" -o -context "*:unlabeled_t*" \) -exec chcon -t tmp_t {} \;
++find /var/tmp \( -context "*:file_t*" -o -context "*:unlabeled_t*" \) -exec chcon -t tmp_t {} \;
  exit $?
  }
  
  fullrelabel() {
      logit "Cleaning out /tmp"
 -    rm -rf /tmp/.??* /tmp/*
-+    rm -rf /tmp/.[^.]* /tmp/*
++    find /tmp/ -mindepth 1 -print0 | xargs -0 /bin/rm -f
      LogReadOnly
      restore
  }


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.552
retrieving revision 1.553
diff -u -r1.552 -r1.553
--- policycoreutils.spec	8 Sep 2008 17:48:01 -0000	1.552
+++ policycoreutils.spec	8 Sep 2008 18:09:38 -0000	1.553
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.55
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,7 +192,7 @@
 fi
 
 %changelog
-* Mon Sep 8 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-3
+* Mon Sep 8 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-4
 - Fix fixfiles to correct unlabeled_t files and remove .? files
 
 * Wed Sep 3 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-2