rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.469, 1.470 policycoreutils.spec, 1.681, 1.682
Daniel J Walsh
dwalsh at fedoraproject.org
Thu Feb 11 18:24:57 UTC 2010
Author: dwalsh
Update of /cvs/pkgs/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25090
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
Log Message:
* Thu Feb 11 2010 Dan Walsh <dwalsh at redhat.com> 2.0.78-21
- Fix display of command in sandbox
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 | 359 ++++++++
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, 2630 insertions(+), 605 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -p -r1.469 -r1.470
--- policycoreutils-rhat.patch 3 Feb 2010 20:24:35 -0000 1.469
+++ policycoreutils-rhat.patch 11 Feb 2010 18:24:55 -0000 1.470
@@ -1713,8 +1713,8 @@ diff --exclude-from=exclude --exclude=se
+relabel:
diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.78/sandbox/sandbox
--- nsapolicycoreutils/sandbox/sandbox 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/sandbox/sandbox 2010-01-27 16:39:26.000000000 -0500
-@@ -0,0 +1,357 @@
++++ policycoreutils-2.0.78/sandbox/sandbox 2010-02-11 13:22:58.000000000 -0500
+@@ -0,0 +1,359 @@
+#! /usr/bin/python -E
+# Authors: Dan Walsh <dwalsh at redhat.com>
+# Authors: Josh Cogliati
@@ -1867,12 +1867,13 @@ diff --exclude-from=exclude --exclude=se
+ fd = open(execfile, "w+")
+ fd.write("""
+#! /bin/sh
++#TITLE: %s
+/usr/bin/test -r ~/.xmodmap && /usr/bin/xmodmap ~/.xmodmap
+/usr/bin/matchbox-window-manager -use_titlebar no &
+WM_PID=$!
+%s
+kill -TERM $WM_PID 2> /dev/null
-+""" % command)
++""" % (command, command))
+ fd.close()
+ os.chmod(execfile, 0700)
+
@@ -1880,9 +1881,10 @@ diff --exclude-from=exclude --exclude=se
+ fd = open(execfile, "w+")
+ fd.write("""
+#!/bin/sh
++#TITLE: %s
+/usr/bin/test -r ~/.xmodmap && /usr/bin/xmodmap ~/.xmodmap
+%s
-+""" % command)
++""" % (command, command))
+ fd.close()
+ os.chmod(execfile, 0700)
+
@@ -2493,10 +2495,10 @@ diff --exclude-from=exclude --exclude=se
+keycode 255 =
diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.78/sandbox/sandboxX.sh
--- nsapolicycoreutils/sandbox/sandboxX.sh 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/sandbox/sandboxX.sh 2010-01-27 16:49:23.000000000 -0500
++++ policycoreutils-2.0.78/sandbox/sandboxX.sh 2010-02-11 13:23:15.000000000 -0500
@@ -0,0 +1,14 @@
+#!/bin/bash
-+export TITLE="Sandbox: `/usr/bin/tail -1 ~/.sandboxrc | /usr/bin/cut -b1-70` Running as `secon -t -l -P`"
++export TITLE="Sandbox: `grep ^#TITLE: ~/.sandboxrc | /usr/bin/cut -b8-80` Running as `secon -t -l -P`"
+export SCREENSIZE="1000x700"
+#export SCREENSIZE=`xdpyinfo | awk '/dimensions/ { print $2 }'`
+trap "exit 0" HUP
@@ -2831,7 +2833,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,
@@ -3163,6 +3165,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/pkgs/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.681
retrieving revision 1.682
diff -u -p -r1.681 -r1.682
--- policycoreutils.spec 3 Feb 2010 20:24:37 -0000 1.681
+++ policycoreutils.spec 11 Feb 2010 18:24:57 -0000 1.682
@@ -6,10 +6,10 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.78
-Release: 19%{?dist}
+Release: 21%{?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,12 @@ fi
exit 0
%changelog
+* Thu Feb 11 2010 Dan Walsh <dwalsh at redhat.com> 2.0.78-21
+- Fix display of command in sandbox
+
+* 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