rpms/policycoreutils/F-12 policycoreutils-rhat.patch, 1.460, 1.461 policycoreutils.spec, 1.672, 1.673
Daniel J Walsh
dwalsh at fedoraproject.org
Wed Feb 10 19:30:30 UTC 2010
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1746
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
Log Message:
* Fri Feb 5 2010 Dan Walsh <dwalsh at redhat.com> 2.0.78-20
- Catch OSError in semanage
policycoreutils-rhat.patch:
Makefile | 2
audit2allow/audit2allow | 64 -
audit2allow/audit2allow.1 | 3
restorecond/Makefile | 24
restorecond/org.selinux.Restorecond.service | 3
restorecond/restorecond.8 | 15
restorecond/restorecond.c | 429 +---------
restorecond/restorecond.conf | 5
restorecond/restorecond.desktop | 7
restorecond/restorecond.h | 19
restorecond/restorecond.init | 5
restorecond/restorecond_user.conf | 2
restorecond/user.c | 239 +++++
restorecond/watch.c | 260 ++++++
sandbox/.sandboxSKnKBc/.esd_auth | 1
sandbox/.sandboxSKnKBc/.gconf/apps/panel/applets/clock/prefs/%gconf.xml | 24
sandbox/.sandboxSKnKBc/.gconf/apps/panel/applets/window_list/prefs/%gconf.xml | 8
sandbox/.sandboxSKnKBc/.gconf/apps/panel/applets/workspace_switcher/prefs/%gconf.xml | 6
sandbox/.sandboxSKnKBc/.gconf/desktop/gnome/accessibility/keyboard/%gconf.xml | 23
sandbox/.sandboxSKnKBc/.gconf/desktop/gnome/interface/%gconf.xml | 6
sandbox/.sandboxSKnKBc/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml | 4
sandbox/.sandboxSKnKBc/.gconf/desktop/gnome/peripherals/keyboard/general/%gconf.xml | 8
sandbox/.sandboxSKnKBc/.xmodmap | 248 +++++
sandbox/Makefile | 31
sandbox/deliverables/README | 32
sandbox/deliverables/basicwrapper | 4
sandbox/deliverables/run-in-sandbox.py | 49 +
sandbox/deliverables/sandbox | 216 +++++
sandbox/sandbox | 357 ++++++++
sandbox/sandbox.8 | 50 +
sandbox/sandboxX.sh | 14
sandbox/seunshare.c | 265 ++++++
scripts/fixfiles | 20
semanage/semanage | 126 ++
semanage/semanage.8 | 10
semanage/seobject.py | 406 +++++++--
semodule/semodule.8 | 6
semodule/semodule.c | 53 +
setfiles/restore.c | 97 ++
setfiles/restore.h | 4
setfiles/restorecon.8 | 7
setfiles/setfiles.8 | 3
setfiles/setfiles.c | 78 -
43 files changed, 2628 insertions(+), 605 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-rhat.patch,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -p -r1.460 -r1.461
--- policycoreutils-rhat.patch 3 Feb 2010 16:49:00 -0000 1.460
+++ policycoreutils-rhat.patch 10 Feb 2010 19:30:27 -0000 1.461
@@ -2780,18 +2780,19 @@ diff --exclude-from=exclude --exclude=se
+}
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=se
- \( -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=se
return
fi
[ -x /usr/sbin/genhomedircon ] && /usr/sbin/genhomedircon
-@@ -146,7 +139,7 @@
+@@ -146,7 +136,7 @@
fullrelabel() {
logit "Cleaning out /tmp"
@@ -2832,7 +2831,7 @@ diff --exclude-from=exclude --exclude=se
}
diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.78/semanage/semanage
--- nsapolicycoreutils/semanage/semanage 2009-11-18 17:06:03.000000000 -0500
-+++ policycoreutils-2.0.78/semanage/semanage 2010-01-08 09:24:07.000000000 -0500
++++ policycoreutils-2.0.78/semanage/semanage 2010-02-05 15:04:10.000000000 -0500
@@ -32,25 +32,34 @@
try:
gettext.install(PROGNAME,
@@ -3164,6 +3163,12 @@ diff --exclude-from=exclude --exclude=se
process_args(mkargv(l))
trans.finish()
else:
+@@ -467,3 +549,5 @@
+ errorExit(_("Invalid value %s") % error.args[0])
+ except IOError, error:
+ errorExit(error.args[1])
++ except OSError, error:
++ errorExit(error.args[1])
diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.78/semanage/semanage.8
--- nsapolicycoreutils/semanage/semanage.8 2009-11-18 17:06:03.000000000 -0500
+++ policycoreutils-2.0.78/semanage/semanage.8 2010-01-08 09:32:28.000000000 -0500
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v
retrieving revision 1.672
retrieving revision 1.673
diff -u -p -r1.672 -r1.673
--- policycoreutils.spec 4 Feb 2010 21:13:10 -0000 1.672
+++ policycoreutils.spec 10 Feb 2010 19:30:29 -0000 1.673
@@ -6,10 +6,10 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.78
-Release: 19%{?dist}
+Release: 20%{?dist}
License: GPLv2+
Group: System Environment/Base
-Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
+Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
Source1: http://www.nsa.gov/selinux/archives/sepolgen-%{sepolgenver}.tgz
URL: http://www.selinuxproject.org
Source2: system-config-selinux.png
@@ -298,6 +298,9 @@ fi
exit 0
%changelog
+* Fri Feb 5 2010 Dan Walsh <dwalsh at redhat.com> 2.0.78-20
+- Catch OSError in semanage
+
* Wed Feb 3 2010 Dan Walsh <dwalsh at redhat.com> 2.0.78-19
- Fix seobject and fixfiles
More information about the scm-commits
mailing list