rpms/policycoreutils/FC-4 policycoreutils-rhat.patch, 1.95, 1.96 policycoreutils.spec, 1.127, 1.128

[fedora-cvs-commits at redhat.com]

Author: dwalsh

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

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Wed Sep 28 2005 Dan Walsh <dwalsh at redhat.com> 1.27.2-1.2
- Update to rawhide version


policycoreutils-rhat.patch:
 Makefile            |    2 +-
 scripts/fixfiles    |   10 ++++++----
 setfiles/setfiles.c |    9 +--------
 3 files changed, 8 insertions(+), 13 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-4/policycoreutils-rhat.patch,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- policycoreutils-rhat.patch	23 Sep 2005 17:58:24 -0000	1.95
+++ policycoreutils-rhat.patch	28 Sep 2005 14:52:38 -0000	1.96
@@ -1,13 +1,42 @@
---- policycoreutils-1.27.2/Makefile~	2005-09-21 14:12:06.000000000 -0400
-+++ policycoreutils-1.27.2/Makefile	2005-09-23 14:01:10.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.27.2/Makefile
+--- nsapolicycoreutils/Makefile	2005-09-21 14:12:06.000000000 -0400
++++ policycoreutils-1.27.2/Makefile	2005-09-28 10:51:40.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS=setfiles load_policy newrole run_init restorecon audit2allow audit2why scripts po sestatus semodule_link semodule_expand semodule_package semodule
 +SUBDIRS=setfiles load_policy newrole run_init restorecon audit2allow audit2why scripts po sestatus
  
  all install relabel clean: 
  	@for subdir in $(SUBDIRS); do \
---- policycoreutils-1.27.2/setfiles/setfiles.c~	2005-09-21 14:12:06.000000000 -0400
-+++ policycoreutils-1.27.2/setfiles/setfiles.c	2005-09-23 13:46:17.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.27.2/scripts/fixfiles
+--- nsapolicycoreutils/scripts/fixfiles	2005-09-21 14:12:06.000000000 -0400
++++ policycoreutils-1.27.2/scripts/fixfiles	2005-09-28 10:51:58.000000000 -0400
+@@ -62,8 +62,8 @@
+ 	TEMPFILE=`mktemp ${FC}.XXXXXXXXXX`
+ 	test -z "$TEMPFILE" && exit
+ 	PREFCTEMPFILE=`mktemp ${PREFC}.XXXXXXXXXX`
+-	sed -r -e 's,:s0[[:space:]], ,g' $PREFC > ${PREFCTEMPFILE}
+-	sed -r -e 's,:s0[[:space:]], ,g' $FC | \
++	sed -r -e 's,:s0, ,g' $PREFC > ${PREFCTEMPFILE}
++	sed -r -e 's,:s0, ,g' $FC | \
+ 	/usr/bin/diff -b ${PREFCTEMPFILE} - | \
+ 	    grep '^[<>]'|cut -c3-| grep ^/ | \
+ 	    egrep -v '(^/home|^/root|^/tmp|^/dev)' |\
+@@ -86,8 +86,10 @@
+                   esac; \
+                fi; \
+             done | \
+-	while read pattern ; do find $pattern \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -print; done 2> /dev/null | \
+-	    egrep -v '(^/home|^/root|^/tmp|^/dev)' |\
++	while read pattern ; do find $pattern \
++		      ! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune  -o \
++		      \( -wholename /home -o -wholename /root -o -wholename /tmp -wholename /dev \) -prune -o -print; \
++		      done 2> /dev/null | \
+ 	 ${RESTORECON} $2 -v -f - 
+ 	rm -f ${TEMPFILE} ${PREFCTEMPFILE}
+ fi
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-1.27.2/setfiles/setfiles.c
+--- nsapolicycoreutils/setfiles/setfiles.c	2005-09-21 14:12:06.000000000 -0400
++++ policycoreutils-1.27.2/setfiles/setfiles.c	2005-09-28 10:51:40.000000000 -0400
 @@ -385,15 +385,8 @@
  int invalidcon(const char *path, unsigned lineno, char *context)
  {


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-4/policycoreutils.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- policycoreutils.spec	23 Sep 2005 18:15:15 -0000	1.127
+++ policycoreutils.spec	28 Sep 2005 14:52:38 -0000	1.128
@@ -3,7 +3,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.27.2
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -84,6 +84,9 @@
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
 %changelog
+* Wed Sep 28 2005 Dan Walsh <dwalsh at redhat.com> 1.27.2-1.2
+- Update to rawhide version
+
 * Fri Sep 23 2005 Dan Walsh <dwalsh at redhat.com> 1.27.2-1.1
 - Update to rawhide version