53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.25.7/scripts/fixfiles
|
|
--- nsapolicycoreutils/scripts/fixfiles 2005-08-25 16:18:08.000000000 -0400
|
|
+++ policycoreutils-1.25.7/scripts/fixfiles 2005-09-01 11:48:00.000000000 -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.25.7/setfiles/setfiles.8
|
|
--- nsapolicycoreutils/setfiles/setfiles.8 2005-03-17 10:29:50.000000000 -0500
|
|
+++ policycoreutils-1.25.7/setfiles/setfiles.8 2005-09-01 11:48:00.000000000 -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.25.7/setfiles/setfiles.c
|
|
--- nsapolicycoreutils/setfiles/setfiles.c 2005-09-01 11:26:48.000000000 -0400
|
|
+++ policycoreutils-1.25.7/setfiles/setfiles.c 2005-09-01 11:48:00.000000000 -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);
|
|
}
|