rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.463, 1.464 policycoreutils.spec, 1.672, 1.673
Daniel J Walsh
dwalsh at fedoraproject.org
Tue Jan 19 17:25:38 UTC 2010
Author: dwalsh
Update of /cvs/pkgs/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1632
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 | 19 +
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, 2229 insertions(+), 583 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -p -r1.463 -r1.464
--- policycoreutils-rhat.patch 14 Jan 2010 21:34:51 -0000 1.463
+++ policycoreutils-rhat.patch 19 Jan 2010 17:25:36 -0000 1.464
@@ -1700,7 +1700,7 @@ 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-14 13:44:46.000000000 -0500
++++ policycoreutils-2.0.78/sandbox/sandbox 2010-01-19 11:58:50.000000000 -0500
@@ -0,0 +1,323 @@
+#! /usr/bin/python -E
+# Authors: Dan Walsh <dwalsh at redhat.com>
@@ -1978,7 +1978,7 @@ diff --exclude-from=exclude --exclude=se
+ if X_ind:
+ xmodmapfile = newhomedir + "/.xmodmap"
+ xd = open(xmodmapfile,"w")
-+ subprocess.Popen(["/usr/bin/xmodmap","-pke"],stdout=xd.wait()
++ subprocess.Popen(["/usr/bin/xmodmap","-pke"],stdout=xd).wait()
+ xd.close()
+
+ execfile = newhomedir + "/.sandboxrc"
@@ -2081,11 +2081,13 @@ 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 2010-01-14 13:42:00.000000000 -0500
-@@ -0,0 +1,16 @@
++++ policycoreutils-2.0.78/sandbox/sandboxX.sh 2010-01-19 12:20:41.000000000 -0500
+@@ -0,0 +1,19 @@
+#!/bin/bash
+export TITLE="Sandbox: `/usr/bin/tail -1 ~/.sandboxrc | /usr/bin/cut -b1-70`"
+
++trap "exit 0" HUP
++
+(/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) &
@@ -2095,13 +2097,14 @@ diff --exclude-from=exclude --exclude=se
+ CLIENT_PID=$!
+ wait $CLIENT_PID
+ export EXITCODE=$?
-+ kill -TERM $WM_PID
++ kill -TERM $WM_PID 2> /dev/null
+ kill -HUP 0
+ break
+done
++exit 0
diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.78/sandbox/seunshare.c
--- nsapolicycoreutils/sandbox/seunshare.c 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/sandbox/seunshare.c 2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/sandbox/seunshare.c 2010-01-19 12:15:41.000000000 -0500
@@ -0,0 +1,265 @@
+#include <signal.h>
+#include <sys/types.h>
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.672
retrieving revision 1.673
diff -u -p -r1.672 -r1.673
--- policycoreutils.spec 14 Jan 2010 21:34:52 -0000 1.672
+++ policycoreutils.spec 19 Jan 2010 17:25:38 -0000 1.673
@@ -1,6 +1,6 @@
%define libauditver 1.4.2-1
%define libsepolver 2.0.41-1
-%define libsemanagever 2.0.43-2
+%define libsemanagever 2.0.43-3
%define libselinuxver 2.0.90-1
%define sepolgenver 1.0.19
Summary: SELinux policy core utilities
@@ -26,7 +26,7 @@ Patch3: policycoreutils-gui.patch
Patch4: policycoreutils-sepolgen.patch
Obsoletes: policycoreutils < 2.0.61-2
-BuildRequires: pam-devel libsepol-static >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver} libcap-devel audit-libs-devel >= %{libauditver} gettext
+BuildRequires: pam-devel libsepol-static >= %{libsepolver} libsemanage-static >= %{libsemanagever} libselinux-devel >= %{libselinuxver} libcap-devel audit-libs-devel >= %{libauditver} gettext
BuildRequires: desktop-file-utils dbus-devel dbus-glib-devel
Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff rpm /bin/sed
Requires: libsepol >= %{libsepolver} coreutils checkpolicy libselinux-utils >= %{libselinuxver}
More information about the scm-commits
mailing list