rpms/policycoreutils/devel policycoreutils-rhat.patch,1.470,1.471
Daniel J Walsh
dwalsh at fedoraproject.org
Thu Feb 11 21:56:41 UTC 2010
Author: dwalsh
Update of /cvs/pkgs/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23262
Modified Files:
policycoreutils-rhat.patch
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 | 360 ++++++++
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, 2631 insertions(+), 605 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -p -r1.470 -r1.471
--- policycoreutils-rhat.patch 11 Feb 2010 18:24:55 -0000 1.470
+++ policycoreutils-rhat.patch 11 Feb 2010 21:56:38 -0000 1.471
@@ -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-02-11 13:22:58.000000000 -0500
-@@ -0,0 +1,359 @@
++++ policycoreutils-2.0.78/sandbox/sandbox 2010-02-11 16:54:12.000000000 -0500
+@@ -0,0 +1,360 @@
+#! /usr/bin/python -E
+# Authors: Dan Walsh <dwalsh at redhat.com>
+# Authors: Josh Cogliati
@@ -1882,7 +1882,6 @@ diff --exclude-from=exclude --exclude=se
+ fd.write("""
+#!/bin/sh
+#TITLE: %s
-+/usr/bin/test -r ~/.xmodmap && /usr/bin/xmodmap ~/.xmodmap
+%s
+""" % (command, command))
+ fd.close()
@@ -1897,7 +1896,8 @@ diff --exclude-from=exclude --exclude=se
+
+ def usage(message = ""):
+ text = _("""
-+sandbox [-h] [-[X|M] [-S] [-l level ] [-H homedir] [-T tempdir]] [-I includefile ] [[-i file ] ...] [ -t type ] command
++sandbox [-h] [-[X|M] [-l level ] [-H homedir] [-T tempdir]] [-I includefile ] [[-i file ] ...] [ -t type ] command
++sandbox [-h] [-[X|M] [-l level ] [-H homedir] [-T tempdir]] [-I includefile ] [[-i file ] ...] [ -t type ] -S
+""")
+ error_exit("%s\n%s" % (message, text))
+
@@ -1957,16 +1957,17 @@ diff --exclude-from=exclude --exclude=se
+ newhomedir = a
+ if o == "-T" or o == "--tmpdir":
+ existing_temp = True
-+ newtempdir = a
++ newtmpdir = a
+ if o == "-h" or o == "--help":
+ usage(_("Usage"));
+
+ if o == "-S" or o == "--session":
+ session = True
+ homedir=pwd.getpwuid(os.getuid()).pw_dir
-+
++ if setype in (DEFAULT_TYPE, DEFAULT_X_TYPE):
++ setype = selinux.getcon()[1].split(":")[2]
+
-+ if len(cmds) == 0:
++ if len(cmds) == 0 and not session:
+ usage(_("Command required"))
+
+ if (existing_home or existing_temp) and not home_and_temp:
@@ -1974,7 +1975,7 @@ diff --exclude-from=exclude --exclude=se
+ execcon, filecon = gen_context(setype, level)
+ rc = -1
+
-+ if cmds[0][0] != "/" and cmds[0][:2] != "./" and cmds[0][:3] != "../":
++ if not session and cmds[0][0] != "/" and cmds[0][:2] != "./" and cmds[0][:3] != "../":
+ for i in os.environ["PATH"].split(':'):
+ f = "%s/%s" % (i, cmds[0])
+ if os.access(f, os.X_OK):
@@ -2003,8 +2004,8 @@ diff --exclude-from=exclude --exclude=se
+ rc = os.spawnvp(os.P_WAIT, chcon[0], chcon)
+
+ if existing_temp:
-+ if not os.path.isdir(newtempdir):
-+ raise IOError("Temp directory "+newtempdir+" not found")
++ if not os.path.isdir(newtmpdir):
++ raise IOError("Temp directory "+newtmpdir+" not found")
+ if not level and not session:
+ chcon = ("/usr/bin/chcon -R %s %s" % (filecon, newtmpdir)).split()
+ rc = os.spawnvp(os.P_WAIT, chcon[0], chcon)
@@ -2034,7 +2035,7 @@ diff --exclude-from=exclude --exclude=se
+
+ execfile = newhomedir + "/.sandboxrc"
+ if session:
-+ setup_session(execfile, " ".join(paths))
++ setup_session(execfile)
+ else:
+ setup_executable(execfile, " ".join(paths))
+
More information about the scm-commits
mailing list