diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index b8d275a..6fe1368 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -2780,18 +2780,19 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po +} diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.78/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2009-12-01 15:46:50.000000000 -0500 -+++ policycoreutils-2.0.78/scripts/fixfiles 2010-01-29 16:40:10.000000000 -0500 -@@ -75,7 +75,8 @@ - -e 's|\(.*|*|g' \ - -e 's|\[.*|*|g' \ - -e 's|\.\*.*|*|g' \ -- -e 's|\.\+.*|*|g' | \ -+ -e 's|\.\+.*|*|g' \ -+ -e 's,/\*$,,g'| \ - # These two sorts need to be separate commands \ - sort -u | \ - sort -d | \ -@@ -87,11 +88,9 @@ ++++ policycoreutils-2.0.78/scripts/fixfiles 2010-02-03 15:22:51.000000000 -0500 +@@ -35,8 +35,8 @@ + LOGGER=/usr/sbin/logger + SETFILES=/sbin/setfiles + RESTORECON=/sbin/restorecon +-FILESYSTEMSRW=`mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[234]| ext4dev | gfs2 | xfs | jfs | btrfs ).*\(rw/{print $3}';` +-FILESYSTEMSRO=`mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[234]| ext4dev | gfs2 | xfs | jfs | btrfs ).*\(ro/{print $3}';` ++FILESYSTEMSRW=`grep rw,seclabel /proc/self/mounts | awk '{ print $2 }'` ++FILESYSTEMSRO=`grep -v 'rw\|seclabel' /proc/self/mounts | awk '{ print $2 }'` + FILESYSTEMS="$FILESYSTEMSRW $FILESYSTEMSRO" + SELINUXTYPE="targeted" + if [ -e /etc/selinux/config ]; then +@@ -87,11 +87,7 @@ esac; \ fi; \ done | \ @@ -2800,13 +2801,11 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po - \( -wholename /home -o -wholename /root -o -wholename /tmp -wholename /dev \) -prune -o -print0"; \ - done 2> /dev/null | \ - ${RESTORECON} $* -0 -f - -+ xargs -r echo -+#${RESTORECON} -F -R -p -e /home -e /tmp -e /dev -+ ++ ${RESTORECON} -f - -R -p -e /home -e /tmp -r /dev; \ rm -f ${TEMPFILE} ${PREFCTEMPFILE} fi } -@@ -126,13 +125,7 @@ +@@ -126,13 +122,7 @@ exit $? fi if [ ! -z "$FILEPATH" ]; then @@ -2821,7 +2820,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po return fi [ -x /usr/sbin/genhomedircon ] && /usr/sbin/genhomedircon -@@ -146,7 +139,7 @@ +@@ -146,7 +136,7 @@ fullrelabel() { logit "Cleaning out /tmp" diff --git a/policycoreutils.spec b/policycoreutils.spec index e212f42..66e48aa 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.78 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -298,7 +298,7 @@ fi exit 0 %changelog -* Wed Feb 3 2010 Dan Walsh 2.0.78-18 +* Wed Feb 3 2010 Dan Walsh 2.0.78-19 - Fix seobject and fixfiles * Fri Jan 29 2010 Dan Walsh 2.0.78-17