rpms/policycoreutils/F-12 policycoreutils-rhat.patch, 1.457, 1.458 policycoreutils.spec, 1.664, 1.665
Daniel J Walsh
dwalsh at fedoraproject.org
Thu Jan 14 21:34:48 UTC 2010
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31795
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
Log Message:
* Thu Jan 14 2010 Dan Walsh <dwalsh at redhat.com> 2.0.78-11
- Run with the same xdmodmap in sandbox as outside
- Patch from Josh Cogliati
policycoreutils-rhat.patch:
Makefile | 2
audit2allow/audit2allow | 64 +---
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/Makefile | 31 ++
sandbox/deliverables/README | 32 ++
sandbox/deliverables/basicwrapper | 4
sandbox/deliverables/run-in-sandbox.py | 49 +++
sandbox/deliverables/sandbox | 216 ++++++++++++++
sandbox/sandbox | 323 +++++++++++++++++++++
sandbox/sandbox.8 | 50 +++
sandbox/sandboxX.sh | 16 +
sandbox/seunshare.c | 265 +++++++++++++++++
semanage/semanage | 124 ++++++--
semanage/semanage.8 | 10
semanage/seobject.py | 397 ++++++++++++++++++++-----
semodule/semodule.8 | 6
semodule/semodule.c | 53 +++
setfiles/restore.c | 73 ++++
setfiles/restore.h | 3
setfiles/restorecon.8 | 7
setfiles/setfiles.8 | 3
setfiles/setfiles.c | 73 ----
32 files changed, 2226 insertions(+), 583 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-rhat.patch,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -p -r1.457 -r1.458
--- policycoreutils-rhat.patch 8 Jan 2010 14:38:30 -0000 1.457
+++ policycoreutils-rhat.patch 14 Jan 2010 21:34:46 -0000 1.458
@@ -1700,8 +1700,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 2009-12-17 13:50:15.000000000 -0500
-@@ -0,0 +1,318 @@
++++ policycoreutils-2.0.78/sandbox/sandbox 2010-01-14 13:44:46.000000000 -0500
+@@ -0,0 +1,323 @@
+#! /usr/bin/python -E
+# Authors: Dan Walsh <dwalsh at redhat.com>
+# Authors: Josh Cogliati
@@ -1723,7 +1723,7 @@ diff --exclude-from=exclude --exclude=se
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
-+import os, sys, getopt, socket, random, fcntl, shutil, re
++import os, sys, getopt, socket, random, fcntl, shutil, re, subprocess
+import selinux
+import signal
+from tempfile import mkdtemp
@@ -1976,6 +1976,11 @@ diff --exclude-from=exclude --exclude=se
+
+ copyfiles(newhomedir, newtmpdir, init_files + paths)
+ if X_ind:
++ xmodmapfile = newhomedir + "/.xmodmap"
++ xd = open(xmodmapfile,"w")
++ subprocess.Popen(["/usr/bin/xmodmap","-pke"],stdout=xd.wait()
++ xd.close()
++
+ execfile = newhomedir + "/.sandboxrc"
+ fd = open(execfile, "w+")
+ fd.write("""#! /bin/sh
@@ -2076,14 +2081,14 @@ diff --exclude-from=exclude --exclude=se
+.PP
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 2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/sandbox/sandboxX.sh 2010-01-14 13:42:00.000000000 -0500
@@ -0,0 +1,16 @@
+#!/bin/bash
+export TITLE="Sandbox: `/usr/bin/tail -1 ~/.sandboxrc | /usr/bin/cut -b1-70`"
-+export SCREEN=`/usr/bin/xdpyinfo -display $DISPLAY | /bin/awk '/dimensions/ { print $2 }'`
+
+(/usr/bin/Xephyr -title "$TITLE" -terminate -screen 1000x700 -displayfd 5 5>&1 2>/dev/null) | while read D; do
+ export DISPLAY=:$D
++ (/usr/bin/test -r ~/.xmodmap && /usr/bin/xmodmap ~/.xmodmap) &
+ /usr/bin/matchbox-window-manager -use_titlebar no &
+ WM_PID=$!
+ ~/.sandboxrc &
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v
retrieving revision 1.664
retrieving revision 1.665
diff -u -p -r1.664 -r1.665
--- policycoreutils.spec 8 Jan 2010 15:23:05 -0000 1.664
+++ policycoreutils.spec 14 Jan 2010 21:34:48 -0000 1.665
@@ -6,7 +6,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.78
-Release: 10%{?dist}
+Release: 11%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -297,6 +297,10 @@ fi
exit 0
%changelog
+* Thu Jan 14 2010 Dan Walsh <dwalsh at redhat.com> 2.0.78-11
+- Run with the same xdmodmap in sandbox as outside
+- Patch from Josh Cogliati
+
* Fri Jan 8 2010 Dan Walsh <dwalsh at redhat.com> 2.0.78-10
- Fix sepolgen to not generate user sh section on non user policy
More information about the scm-commits
mailing list