diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 095ea1c..1408f0b 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -238,7 +238,7 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts # diff --exclude-from=exclude --exclude='*.po' -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-08 09:12:12.000000000 -0400 ++++ policycoreutils-1.30.28/scripts/fixfiles 2006-09-13 06:32:03.000000000 -0400 @@ -117,8 +117,8 @@ exit $? fi @@ -263,6 +263,27 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts fi exit $? +@@ -170,9 +170,9 @@ + } + + usage() { +- echo $"Usage: $0 [-l logfile ] [-o outputfile ] { check | restore|[-F] relabel } [[dir] ... ] " ++ echo $"Usage: $0 [-l logfile ] [-o] { check | restore|[-F] relabel } [[dir] ... ] " + echo or +- echo $"Usage: $0 -R rpmpackage[,rpmpackage...] -C PREVIOUS_FILECONTEXT [-l logfile ] [-o outputfile ] { check | restore }" ++ echo $"Usage: $0 -R rpmpackage[,rpmpackage...] -C PREVIOUS_FILECONTEXT [-l logfile ] [-o] { check | restore }" + } + + if [ $# = 0 ]; then +@@ -181,7 +181,7 @@ + fi + + # See how we were called. +-while getopts "C:Ffo:R:l:" i; do ++while getopts "C:FfoR:l:" i; do + case "$i" in + f) + fullFlag=1 @@ -190,7 +190,7 @@ RPMFILES=$OPTARG ;; @@ -281,6 +302,32 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts if [ $OPTIND -le $# ]; then usage fi +diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-1.30.28/scripts/fixfiles.8 +--- nsapolicycoreutils/scripts/fixfiles.8 2006-08-28 16:58:19.000000000 -0400 ++++ policycoreutils-1.30.28/scripts/fixfiles.8 2006-09-13 06:31:17.000000000 -0400 +@@ -3,9 +3,9 @@ + fixfiles \- fix file security contexts. + + .SH "SYNOPSIS" +-.B fixfiles [-F] [ -R rpmpackagename[,rpmpackagename...] ] [ -C PREVIOUS_FILECONTEXT ] [-l logfile ] [-o outputfile ] { check | restore | [-F] relabel }" ++.B fixfiles [-F] [ -R rpmpackagename[,rpmpackagename...] ] [ -C PREVIOUS_FILECONTEXT ] [-l logfile ] [-o] { check | restore | [-F] relabel }" + +-.B fixfiles [-F] [-l logfile ] [-o outputfile ] { check | restore|[-f] relabel } [[dir/file] ... ] ++.B fixfiles [-F] [-l logfile ] [-o] { check | restore|[-f] relabel } [[dir/file] ... ] + + .SH "DESCRIPTION" + This manual page describes the +@@ -26,8 +26,8 @@ + .B -l logfile + Save the output to the specified logfile + .TP +-.B -o outputfile +-Save all files that have file_context that differs from the default, in outputfile. ++.B -o ++Print all files that have file_context that differs from the default. + + .TP + .B -F diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.30.28/scripts/genhomedircon --- nsapolicycoreutils/scripts/genhomedircon 2006-08-28 16:58:19.000000000 -0400 +++ policycoreutils-1.30.28/scripts/genhomedircon 2006-09-08 09:12:12.000000000 -0400 diff --git a/policycoreutils.spec b/policycoreutils.spec index 5864e2a..b3a932c 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.30.28 -Release: 7 +Release: 8 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -122,6 +122,9 @@ fi [ -x /sbin/service ] && /sbin/service restorecond condrestart %changelog +* Wed Sep 13 2006 Dan Walsh 1.30.28-8 +- Fix fixfiles handling of -o + * Mon Sep 11 2006 Dan Walsh 1.30.28-7 - Make restorecon return the number of changes files if you use the -n flag