* Fri Nov 16 2007 Dan Walsh <dwalsh@redhat.com> 2.0.31-16
- Fix fixfiles argument parsing
This commit is contained in:
parent
d2285e6e8b
commit
f51cda3313
@ -137,7 +137,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po
|
|||||||
close(fd);
|
close(fd);
|
||||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.31/scripts/fixfiles
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.31/scripts/fixfiles
|
||||||
--- nsapolicycoreutils/scripts/fixfiles 2007-08-23 16:52:26.000000000 -0400
|
--- nsapolicycoreutils/scripts/fixfiles 2007-08-23 16:52:26.000000000 -0400
|
||||||
+++ policycoreutils-2.0.31/scripts/fixfiles 2007-11-06 14:57:22.000000000 -0500
|
+++ policycoreutils-2.0.31/scripts/fixfiles 2007-11-16 10:54:53.000000000 -0500
|
||||||
@@ -92,7 +92,7 @@
|
@@ -92,7 +92,7 @@
|
||||||
! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune -o \
|
! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune -o \
|
||||||
\( -wholename /home -o -wholename /root -o -wholename /tmp -wholename /dev \) -prune -o -print; \
|
\( -wholename /home -o -wholename /root -o -wholename /tmp -wholename /dev \) -prune -o -print; \
|
||||||
@ -147,6 +147,69 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po
|
|||||||
rm -f ${TEMPFILE} ${PREFCTEMPFILE}
|
rm -f ${TEMPFILE} ${PREFCTEMPFILE}
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@@ -189,21 +189,27 @@
|
||||||
|
case "$i" in
|
||||||
|
f)
|
||||||
|
fullFlag=1
|
||||||
|
+ shift 1
|
||||||
|
;;
|
||||||
|
R)
|
||||||
|
RPMFILES=$OPTARG
|
||||||
|
+ shift 2
|
||||||
|
;;
|
||||||
|
o)
|
||||||
|
OUTFILES=$OPTARG
|
||||||
|
+ shift 2
|
||||||
|
;;
|
||||||
|
l)
|
||||||
|
LOGFILE=$OPTARG
|
||||||
|
+ shift 2
|
||||||
|
;;
|
||||||
|
C)
|
||||||
|
PREFC=$OPTARG
|
||||||
|
+ shift 2
|
||||||
|
;;
|
||||||
|
F)
|
||||||
|
FORCEFLAG="-F"
|
||||||
|
+ shift 1
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
usage
|
||||||
|
@@ -211,10 +217,8 @@
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
-
|
||||||
|
# Check for the command
|
||||||
|
-eval command=\$${OPTIND}
|
||||||
|
-let OPTIND=$OPTIND+1
|
||||||
|
+command=$1
|
||||||
|
if [ -z $command ]; then
|
||||||
|
usage
|
||||||
|
fi
|
||||||
|
@@ -223,17 +227,16 @@
|
||||||
|
# check if they specified both DIRS and RPMFILES
|
||||||
|
#
|
||||||
|
|
||||||
|
+shift 1
|
||||||
|
if [ ! -z "$RPMFILES" ]; then
|
||||||
|
- if [ $OPTIND -le $# ]; then
|
||||||
|
+ if [ $# -gt 0 ]; then
|
||||||
|
+ echo broken
|
||||||
|
usage
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
- while [ $OPTIND -le $# ]; do
|
||||||
|
- eval DIR=\$${OPTIND}
|
||||||
|
- DIRS="$DIRS $DIR"
|
||||||
|
- let OPTIND=$OPTIND+1
|
||||||
|
- done
|
||||||
|
+ DIRS=$*
|
||||||
|
fi
|
||||||
|
+
|
||||||
|
#
|
||||||
|
# Make sure they specified one of the three valid commands
|
||||||
|
#
|
||||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.31/semanage/semanage
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.31/semanage/semanage
|
||||||
--- nsapolicycoreutils/semanage/semanage 2007-10-05 13:09:53.000000000 -0400
|
--- nsapolicycoreutils/semanage/semanage 2007-10-05 13:09:53.000000000 -0400
|
||||||
+++ policycoreutils-2.0.31/semanage/semanage 2007-11-02 15:54:42.000000000 -0400
|
+++ policycoreutils-2.0.31/semanage/semanage 2007-11-02 15:54:42.000000000 -0400
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
Summary: SELinux policy core utilities
|
Summary: SELinux policy core utilities
|
||||||
Name: policycoreutils
|
Name: policycoreutils
|
||||||
Version: 2.0.31
|
Version: 2.0.31
|
||||||
Release: 15%{?dist}
|
Release: 16%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
||||||
@ -207,6 +207,9 @@ if [ "$1" -ge "1" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Nov 16 2007 Dan Walsh <dwalsh@redhat.com> 2.0.31-16
|
||||||
|
- Fix fixfiles argument parsing
|
||||||
|
|
||||||
* Thu Nov 15 2007 Dan Walsh <dwalsh@redhat.com> 2.0.31-15
|
* Thu Nov 15 2007 Dan Walsh <dwalsh@redhat.com> 2.0.31-15
|
||||||
- Fix File Labeling add
|
- Fix File Labeling add
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user