rpms/policycoreutils/FC-4 policycoreutils-fixfiles.patch, NONE, 1.1 policycoreutils.spec, 1.121, 1.122

[fedora-cvs-commits at redhat.com]

Author: dwalsh

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

Modified Files:
	policycoreutils.spec 
Added Files:
	policycoreutils-fixfiles.patch 
Log Message:
* Sat May 28 2005 Dan Walsh <dwalsh at redhat.com> 1.23.11-3.1
- Change fixfiles to not process /home, /tmp ...


policycoreutils-fixfiles.patch:
 fixfiles |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE policycoreutils-fixfiles.patch ---
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.25.5/scripts/fixfiles
--- nsapolicycoreutils/scripts/fixfiles	2005-05-20 13:15:12.000000000 -0400
+++ policycoreutils-1.25.5/scripts/fixfiles	2005-08-17 10:58:52.000000000 -0400
@@ -62,6 +62,7 @@
 	TEMPFILE=`mktemp ${FC}.XXXXXXXXXX`
 	test -z "$TEMPFILE" && exit
 	/usr/bin/diff $PREFC $FC | grep '^[<>]'|cut -c3-| grep ^/ | \
+	    egrep -v '(^/home|^/root|^/tmp|^/dev)' |\
 	sed -r -e 's,[[:blank:]].*,,g' \
                -e 's|\(([/[:alnum:]]+)\)\?|{\1,}|g' \
 	       -e 's|([/[:alnum:]])\?|{\1,}|g' \
@@ -80,7 +81,7 @@
                fi; \
             done | \
 	while read pattern ; do find $pattern \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -print; done 2> /dev/null | \
-	 ${RESTORECON} $2 -v -e /root -e /home -e /tmp -e /var/tmp -e /dev -f - 
+	 ${RESTORECON} $2 -v -f - 
 	rm -f ${TEMPFILE}
 fi
 }


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-4/policycoreutils.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- policycoreutils.spec	28 May 2005 05:29:19 -0000	1.121
+++ policycoreutils.spec	22 Aug 2005 18:20:31 -0000	1.122
@@ -3,11 +3,12 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.23.11
-Release: 3
+Release: 3.1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
 Patch: policycoreutils-rhat.patch
+Patch1: policycoreutils-fixfiles.patch
 
 Prefix: %{_prefix}
 BuildRequires: libselinux-devel >= %{libselinuxver} pam-devel libsepol-devel >= %{libsepolver}
@@ -35,6 +36,7 @@
 %prep
 %setup -q
 %patch -p1 -b .rhat
+%patch1 -p1 -b .fixfiles
 
 %build
 make LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all 
@@ -84,6 +86,9 @@
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
 %changelog
+* Sat May 28 2005 Dan Walsh <dwalsh at redhat.com> 1.23.11-3.1
+- Change fixfiles to not process /home, /tmp ...
+
 * Sat May 28 2005 Dan Walsh <dwalsh at redhat.com> 1.23.11-3
 - Add Ivan's patch for user role changes in genhomedircon