Policycoreutils fixes for fixfiles

Policycoreutils fixes for fixfiles

[Daniel J Walsh]

[-- Attachment #1: Type: text/plain, Size: 52 bytes --]

Basically a couple of fixes for rpm updates.

-- 



[-- Attachment #2: policycoreutils-rhat.patch --]
[-- Type: text/x-patch, Size: 1291 bytes --]

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-22 17:25:15.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' \
@@ -70,7 +71,9 @@
 	       -e 's|\[.*|*|g' \
                -e 's|\.\*.*|*|g' \
                -e 's|\.\+.*|*|g' | \
-	sort -d -u | \
+	    # These two sorts need to be separate commands \
+	sort -u | \
+	sort -d | \
         while read pattern ; \
 	    do if ! echo "$pattern" | grep -q -f ${TEMPFILE} 2>/dev/null; then \
                   echo "$pattern"; \
@@ -80,7 +83,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
 }