diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 8ae2c7c..c30710f 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -4455,7 +4455,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycore # diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.28/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2006-09-01 22:32:11.000000000 -0400 -+++ policycoreutils-1.30.28/scripts/fixfiles 2006-09-06 10:51:54.000000000 -0400 ++++ policycoreutils-1.30.28/scripts/fixfiles 2006-09-06 11:53:37.000000000 -0400 @@ -117,8 +117,8 @@ exit $? fi @@ -4463,7 +4463,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policyc - for i in `echo $RPMFILES | sed 's/,/ /g'`; do - rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* -f - 2>&1 >> $LOGFILE + for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do -+ rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -i -R $* -f - 2>&1 >> $LOGFILE ++ rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -i $* -f - 2>&1 >> $LOGFILE done exit $? fi diff --git a/policycoreutils.spec b/policycoreutils.spec index 45efcc8..d75855b 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.30.28 -Release: 3 +Release: 4 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -119,6 +119,9 @@ fi [ -x /sbin/service ] && /sbin/service restorecond condrestart %changelog +* Wed Sep 6 2006 Dan Walsh 1.30.28-4 +- Remove recursive switch when using rpm + * Wed Sep 6 2006 Dan Walsh 1.30.28-3 - Fix fixfiles to handle multiple rpm and make -o work