diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index cd42fc2..067e2bb 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,5 +1,5 @@ --- policycoreutils-1.13.3/setfiles/setfiles.c.rhat 2004-06-23 09:21:44.000000000 -0400 -+++ policycoreutils-1.13.3/setfiles/setfiles.c 2004-06-23 09:49:12.009189088 -0400 ++++ policycoreutils-1.13.3/setfiles/setfiles.c 2004-06-23 09:49:12.000000000 -0400 @@ -12,7 +12,7 @@ * the user. The program does not cross file system boundaries. * @@ -81,7 +81,7 @@ QPRINTF("%s: Done.\n", argv[0]); --- policycoreutils-1.13.3/setfiles/setfiles.8.rhat 2004-06-23 09:21:44.000000000 -0400 -+++ policycoreutils-1.13.3/setfiles/setfiles.8 2004-06-23 09:46:15.975950208 -0400 ++++ policycoreutils-1.13.3/setfiles/setfiles.8 2004-06-23 09:46:15.000000000 -0400 @@ -4,8 +4,7 @@ .SH "SYNOPSIS" @@ -102,8 +102,49 @@ .B \-s take a list of files from standard input instead of using a pathname on the command line. +--- policycoreutils-1.13.3/scripts/fixfiles.rhat 2004-06-23 09:21:44.000000000 -0400 ++++ policycoreutils-1.13.3/scripts/fixfiles 2004-06-24 13:11:07.359579384 -0400 +@@ -32,7 +32,7 @@ + + checkLabels () { + echo "logging to $LOGFILE" +-if [ $1 != "" ]; then ++if [ "x$1" != "x" ]; then + for i in `echo $1 | sed 's/,/ /g'`; do + rpm -q -l $i | restorecon -n -v -f - 2>&1 | tee $LOGFILE + done +@@ -43,7 +43,7 @@ + + restoreLabels () { + echo "logging to $LOGFILE" +-if [ $1 != "" ]; then ++if [ "x$1" != "x" ]; then + for i in `echo $1 | sed 's/,/ /g'`; do + rpm -q -l $i | restorecon -v -f - 2>&1 | tee $LOGFILE + done +@@ -56,7 +56,7 @@ + echo "logging to $LOGFILE" + echo "Cleaning out /tmp" + rm -rf /tmp/.??* /tmp/* +-if [ $1 != "" ]; then ++if [ "x$1" != "x" ]; then + for i in `echo $1 | sed 's/,/ /g'`; do + rpm -q -l $i | restorecon -v -f - 2>&1 | tee $LOGFILE + done +@@ -73,9 +73,9 @@ + Do you wish to clean out the /tmp directory [N]? " + read answer + if [ "$answer" = y -o "$answer" = Y ]; then +- relabel $1 ++ relabel "$1" + else +- restoreLabels $1 ++ restoreLabels "$1" + fi + + } --- policycoreutils-1.13.3/restorecon/restorecon.8.rhat 2004-06-23 09:21:44.000000000 -0400 -+++ policycoreutils-1.13.3/restorecon/restorecon.8 2004-06-23 09:46:48.081069488 -0400 ++++ policycoreutils-1.13.3/restorecon/restorecon.8 2004-06-23 09:46:48.000000000 -0400 @@ -4,7 +4,10 @@ .SH "SYNOPSIS" @@ -133,7 +174,7 @@ show changes in file labels. .TP --- policycoreutils-1.13.3/restorecon/restorecon.c.rhat 2004-06-23 09:21:44.000000000 -0400 -+++ policycoreutils-1.13.3/restorecon/restorecon.c 2004-06-23 09:48:44.411384592 -0400 ++++ policycoreutils-1.13.3/restorecon/restorecon.c 2004-06-23 09:48:44.000000000 -0400 @@ -12,6 +12,7 @@ * * -n Do not change any file labels. diff --git a/policycoreutils.spec b/policycoreutils.spec index 4dcd9cd..3e8a954 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -1,7 +1,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.13.3 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -73,6 +73,9 @@ rm -rf ${RPM_BUILD_ROOT} %config(noreplace) %{_sysconfdir}/sestatus.conf %changelog +* Thu Jun 24 2004 Dan Walsh 1.13.3-2 +- Fix fixfiles to handle no rpm file on relabel + * Wed Jun 23 2004 Dan Walsh 1.13.3-1 - Update latest from NSA - Add -o option to setfiles to save output of any files with incorrect context.