diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index d69383d..8d19220 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -2782,8 +2782,18 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po Binary files nsapolicycoreutils/sandbox/seunshare.o and policycoreutils-2.0.78/sandbox/seunshare.o differ 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 14:02:43.000000000 -0500 -@@ -87,11 +87,9 @@ ++++ 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 @@ esac; \ fi; \ done | \ @@ -2792,13 +2802,13 @@ 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 - -+ while read pattern ; do \ -+ ${RESTORECON} -f -R -v $pattern -e /home -e /tmp -r /dev; \ -+ done ++ xargs -r echo ++#${RESTORECON} -F -R -p -e /home -e /tmp -e /dev ++ rm -f ${TEMPFILE} ${PREFCTEMPFILE} fi } -@@ -126,13 +124,7 @@ +@@ -126,13 +125,7 @@ exit $? fi if [ ! -z "$FILEPATH" ]; then @@ -2813,7 +2823,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 +138,7 @@ +@@ -146,7 +139,7 @@ fullrelabel() { logit "Cleaning out /tmp" @@ -3192,7 +3202,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po # Change apache to a permissive domain diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.78/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2009-11-20 10:51:25.000000000 -0500 -+++ policycoreutils-2.0.78/semanage/seobject.py 2010-01-29 13:44:51.000000000 -0500 ++++ policycoreutils-2.0.78/semanage/seobject.py 2010-02-03 11:39:44.000000000 -0500 @@ -29,47 +29,12 @@ import gettext gettext.bindtextdomain(PROGNAME, "/usr/share/locale") @@ -3237,7 +3247,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po - semanage_handle_destroy(handle) - raise ValueError(_("Could not test MLS enabled status")) +import gettext -+translation=gettext.translation(PROGNAME, localedir = "/usr/share/locale", unicode = 1) ++translation=gettext.translation(PROGNAME, localedir = "/usr/share/locale", fallback=True) +_=translation.ugettext - return handle