policycoreutils/policycoreutils-rhat.patch

Binary files nsapolicycoreutils/restorecon/restorecon and policycoreutils-1.26/restorecon/restorecon differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.26/restorecon/restorecon.c
--- nsapolicycoreutils/restorecon/restorecon.c	2005-09-12 16:33:30.000000000 -0400
+++ policycoreutils-1.26/restorecon/restorecon.c	2005-09-13 12:26:38.452608000 -0400
@@ -259,7 +259,6 @@
 int main(int argc, char **argv) {
   int i=0;
   char *file_name=NULL;
-  int errors=0;
   int file=0;
   int opt;
   char buf[PATH_MAX];
Binary files nsapolicycoreutils/restorecon/restorecon.o and policycoreutils-1.26/restorecon/restorecon.o differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.26/scripts/fixfiles
--- nsapolicycoreutils/scripts/fixfiles	2005-09-12 16:33:30.000000000 -0400
+++ policycoreutils-1.26/scripts/fixfiles	2005-09-13 12:24:33.357828000 -0400
@@ -61,7 +61,11 @@
 if [ -f ${PREFC} -a -x /usr/bin/diff ]; then
 	TEMPFILE=`mktemp ${FC}.XXXXXXXXXX`
 	test -z "$TEMPFILE" && exit
-	/usr/bin/diff $PREFC $FC | grep '^[<>]'|cut -c3-| grep ^/ | \
+	PREFCTEMPFILE=`mktemp ${PREFC}.XXXXXXXXXX`
+	sed -r -e 's,:s0[[:space:]], ,g' $PREFC > ${PREFCTEMPFILE}
+	sed -r -e 's,:s0[[:space:]], ,g' $FC | \
+	/usr/bin/diff -b ${PREFCTEMPFILE} - | \
+	    grep '^[<>]'|cut -c3-| grep ^/ | \
 	    egrep -v '(^/home|^/root|^/tmp|^/dev)' |\
 	sed -r -e 's,[[:blank:]].*,,g' \
                -e 's|\(([/[:alnum:]]+)\)\?|{\1,}|g' \
@@ -85,7 +89,7 @@
 	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)' |\
 	 ${RESTORECON} $2 -v -f - 
-	rm -f ${TEMPFILE}
+	rm -f ${TEMPFILE} ${PREFCTEMPFILE}
 fi
 }
 #
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-1.26/setfiles/setfiles.8
--- nsapolicycoreutils/setfiles/setfiles.8	2005-09-12 16:33:30.000000000 -0400
+++ policycoreutils-1.26/setfiles/setfiles.8	2005-09-13 12:24:33.362823000 -0400
@@ -35,6 +35,9 @@
 .B \-q
 suppress non-error output.
 .TP 
+.B \-r   
+use an alternate root path
+.TP 
 .B \-e directory
 directory to exclude (repeat option for more than one directory.)
 .TP 
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-1.26/setfiles/setfiles.c
--- nsapolicycoreutils/setfiles/setfiles.c	2005-09-12 16:33:30.000000000 -0400
+++ policycoreutils-1.26/setfiles/setfiles.c	2005-09-13 12:24:33.369820000 -0400
@@ -198,8 +198,8 @@
 void usage(const char * const name)
 {
 	fprintf(stderr,
-		"usage:  %s [-dnqvW] [-o filename] spec_file pathname...\n"
-		"usage:  %s [-c policyfile] spec_file\n"
+		"usage:  %s [-dnqvW] [-o filename] [-r alt_root_path ] spec_file pathname...\n"
+		"usage:  %s -c policyfile spec_file\n"
 		"usage:  %s -s [-dnqvW] [-o filename ] spec_file\n", name, name, name);
 	exit(1);
 }