diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 2319e7f..2deecd5 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,5 +1,5 @@ --- policycoreutils-1.15.2/scripts/fixfiles.cron.rhat 2004-07-16 14:52:18.000000000 -0400 -+++ policycoreutils-1.15.2/scripts/fixfiles.cron 2004-07-19 12:05:45.000000000 -0400 ++++ policycoreutils-1.15.2/scripts/fixfiles.cron 2004-07-20 10:49:57.000000000 -0400 @@ -16,7 +16,14 @@ OUTFILE=`mktemp ${INVALIDFILE}.XXXXXXXXXX` || exit 1 /sbin/fixfiles -l /dev/null -o $OUTFILE $CRONTYPE @@ -17,8 +17,28 @@ fi - rm -f $OUTFILE fi +--- policycoreutils-1.15.2/scripts/fixfiles.rhat 2004-07-16 14:52:18.000000000 -0400 ++++ policycoreutils-1.15.2/scripts/fixfiles 2004-07-26 14:20:08.824584240 -0400 +@@ -55,7 +55,7 @@ + echo "Warning: Skipping the following R/O filesystems:" + echo "$FILESYSTEMSRO" + fi +- ${SETFILES} ${OUTFILES} -v ${FC} ${FILESYSTEMSRW} 2>&1 | tee $LOGFILE ++ ${SETFILES} ${OUTFILES} -n -v ${FC} ${FILESYSTEMSRW} 2>&1 | tee $LOGFILE + fi + } + +@@ -169,7 +169,7 @@ + fi + if [ $relabelFlag = 1 ]; then + if [ $fullFlag = 1 ]; then +- relabelLabels $rpmFiles ++ relabel $rpmFiles + else + relabelCheck $rpmFiles + fi --- policycoreutils-1.15.2/scripts/genhomedircon.rhat 2004-07-16 14:52:18.000000000 -0400 -+++ policycoreutils-1.15.2/scripts/genhomedircon 2004-07-19 11:59:05.000000000 -0400 ++++ policycoreutils-1.15.2/scripts/genhomedircon 2004-07-20 10:49:57.000000000 -0400 @@ -25,7 +25,6 @@ import commands, sys, os, pwd, string @@ -41,7 +61,7 @@ prefixes = getPrefixes() --- policycoreutils-1.15.2/restorecon/restorecon.c.rhat 2004-07-16 14:52:18.000000000 -0400 -+++ policycoreutils-1.15.2/restorecon/restorecon.c 2004-07-20 08:14:14.761612849 -0400 ++++ policycoreutils-1.15.2/restorecon/restorecon.c 2004-07-20 10:49:57.000000000 -0400 @@ -109,7 +109,7 @@ int change=1; int verbose=0; diff --git a/policycoreutils.spec b/policycoreutils.spec index 2c37335..124ca12 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -1,7 +1,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.15.2 -Release: 3 +Release: 4 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -75,6 +75,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Mon Jul 26 2004 Dan Walsh 1.15.2-4 +- Change fixfiles to not change when running a check + * Tue Jul 20 2004 Dan Walsh 1.15.2-3 - Fix restorecon getopt call to stop hang on IBM Arches