From d7cddef62555d10b9f3738683bd03699c3a01058 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 8 Jan 2008 14:57:29 +0000 Subject: [PATCH] * Tue Jan 8 2008 Dan Walsh 2.0.34-7 - Fix fixfiles to handle no args --- policycoreutils-rhat.patch | 14 +++++++++----- policycoreutils.spec | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 4ce063f..2b876b4 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -69,6 +69,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po if __name__ == "__main__": sys.exit(main()) +Binary files nsapolicycoreutils/audit2why/audit2why and policycoreutils-2.0.34/audit2why/audit2why differ diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2why/audit2why.c policycoreutils-2.0.34/audit2why/audit2why.c --- nsapolicycoreutils/audit2why/audit2why.c 2007-07-16 14:20:41.000000000 -0400 +++ policycoreutils-2.0.34/audit2why/audit2why.c 2008-01-05 08:19:56.000000000 -0500 @@ -781,6 +782,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po +extern void policy_finish(void); +extern int policy_init(const char *init_path); +extern int audit2why(const security_context_t scon, const security_context_t tcon, char *tclassstr, char *permstr, struct boolean_t **bools); +Binary files nsapolicycoreutils/audit2why/audit2why.o and policycoreutils-2.0.34/audit2why/audit2why.o differ diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2why/audit2why.py policycoreutils-2.0.34/audit2why/audit2why.py --- nsapolicycoreutils/audit2why/audit2why.py 1969-12-31 19:00:00.000000000 -0500 +++ policycoreutils-2.0.34/audit2why/audit2why.py 2008-01-05 08:15:10.000000000 -0500 @@ -872,6 +874,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po +audit2why = _audit2why.audit2why + + +Binary files nsapolicycoreutils/audit2why/_audit2why.so and policycoreutils-2.0.34/audit2why/_audit2why.so differ diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2why/audit2whyswig.i policycoreutils-2.0.34/audit2why/audit2whyswig.i --- nsapolicycoreutils/audit2why/audit2whyswig.i 1969-12-31 19:00:00.000000000 -0500 +++ policycoreutils-2.0.34/audit2why/audit2whyswig.i 2008-01-08 05:24:42.000000000 -0500 @@ -4549,6 +4552,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po + SWIG_Python_SetConstant(d, "RBAC",SWIG_From_int((int)(4))); +} + +Binary files nsapolicycoreutils/audit2why/audit2whyswig_wrap.lo and policycoreutils-2.0.34/audit2why/audit2whyswig_wrap.lo differ diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2why/Makefile policycoreutils-2.0.34/audit2why/Makefile --- nsapolicycoreutils/audit2why/Makefile 2007-07-16 14:20:41.000000000 -0400 +++ policycoreutils-2.0.34/audit2why/Makefile 2008-01-05 07:59:15.000000000 -0500 @@ -4664,22 +4668,22 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po gettext.install('policycoreutils') diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.34/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2007-12-10 21:42:28.000000000 -0500 -+++ policycoreutils-2.0.34/scripts/fixfiles 2008-01-08 08:50:11.000000000 -0500 ++++ policycoreutils-2.0.34/scripts/fixfiles 2008-01-08 09:56:34.000000000 -0500 @@ -126,17 +126,15 @@ done exit $? fi -if [ ! -z "$DIRS" ]; then -+if [ ! -z "$PATH" ]; then ++if [ ! -z "$FILEPATH" ]; then if [ -x /usr/bin/find ]; then - for d in ${DIRS} ; do find $d \ -+ /usr/bin/find "$PATH" \ ++ /usr/bin/find "$FILEPATH" \ ! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune -o -print | \ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -f - 2>&1 >> $LOGFILE - done else - ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $DIRS 2>&1 >> $LOGFILE -+ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $PATH 2>&1 >> $LOGFILE ++ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $FILEPATH 2>&1 >> $LOGFILE fi - - exit $? @@ -4722,7 +4726,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po + process $command + else + while [ -n "$1" ]; do -+ PATH=$1 ++ FILEPATH=$1 + process $command + shift + done diff --git a/policycoreutils.spec b/policycoreutils.spec index 69f372a..7345029 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.34 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -193,7 +193,7 @@ if [ "$1" -ge "1" ]; then fi %changelog -* Tue Jan 8 2008 Dan Walsh 2.0.34-6 +* Tue Jan 8 2008 Dan Walsh 2.0.34-7 - Fix fixfiles to handle no args * Mon Dec 31 2007 Dan Walsh 2.0.34-5