rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.476, 1.477 policycoreutils.spec, 1.688, 1.689
Daniel J Walsh
dwalsh at fedoraproject.org
Thu Jun 3 21:14:19 UTC 2010
Author: dwalsh
Update of /cvs/pkgs/rpms/policycoreutils/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4564
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
Log Message:
* Thu Jun 3 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-28
- Fix sandbox init script
- Add dbus-launch to sandbox -X
Resolve: #599599
policycoreutils-rhat.patch:
Makefile | 2
audit2allow/Makefile | 1
audit2allow/audit2allow | 53 --
audit2allow/audit2allow.1 | 3
audit2allow/sepolgen-ifgen | 89 ---
newrole/newrole.c | 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 | 7
restorecond/restorecond_user.conf | 2
restorecond/user.c | 239 +++++++++
restorecond/watch.c | 260 ++++++++++
sandbox/Makefile | 42 +
sandbox/deliverables/README | 32 +
sandbox/deliverables/basicwrapper | 4
sandbox/deliverables/run-in-sandbox.py | 49 +
sandbox/sandbox | 427 ++++++++++++++++
sandbox/sandbox.8 | 64 ++
sandbox/sandbox.config | 2
sandbox/sandbox.init | 72 ++
sandbox/sandboxX.sh | 15
sandbox/seunshare.8 | 29 +
sandbox/seunshare.c | 313 ++++++++++++
sandbox/test.txt | 1
sandbox/test_sandbox.py | 98 +++
scripts/Makefile | 1
scripts/fixfiles | 46 -
scripts/genhomedircon.8 | 38 +
semanage/default_encoding/Makefile | 8
semanage/default_encoding/default_encoding.c | 59 ++
semanage/default_encoding/policycoreutils/__init__.py | 17
semanage/default_encoding/setup.py | 38 +
semanage/semanage | 162 +++++-
semanage/semanage.8 | 128 +++--
semanage/seobject.py | 458 ++++++++++++++----
sepolgen-ifgen/Makefile | 26 +
sepolgen-ifgen/sepolgen-ifgen | 131 +++++
sepolgen-ifgen/sepolgen-ifgen-attr-helper.c | 230 +++++++++
setfiles/restore.c | 109 +++-
setfiles/restore.h | 4
setfiles/restorecon.8 | 7
setfiles/setfiles.8 | 3
setfiles/setfiles.c | 78 ---
48 files changed, 3096 insertions(+), 756 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -p -r1.476 -r1.477
--- policycoreutils-rhat.patch 3 Jun 2010 15:04:49 -0000 1.476
+++ policycoreutils-rhat.patch 3 Jun 2010 21:14:18 -0000 1.477
@@ -1595,7 +1595,7 @@ diff --exclude-from=exclude --exclude=se
+relabel:
diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.82/sandbox/sandbox
--- nsapolicycoreutils/sandbox/sandbox 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.82/sandbox/sandbox 2010-06-03 11:03:16.000000000 -0400
++++ policycoreutils-2.0.82/sandbox/sandbox 2010-06-03 16:30:17.000000000 -0400
@@ -0,0 +1,427 @@
+#! /usr/bin/python -E
+# Authors: Dan Walsh <dwalsh at redhat.com>
@@ -1827,7 +1827,7 @@ diff --exclude-from=exclude --exclude=se
+/usr/bin/test -r ~/.xmodmap && /usr/bin/xmodmap ~/.xmodmap
+%s &
+WM_PID=$!
-+%s
++dbus-launch %s
+kill -TERM $WM_PID 2> /dev/null
+""" % (command, wm, command))
+ fd.close()
@@ -2100,8 +2100,8 @@ diff --exclude-from=exclude --exclude=se
+HOMEDIRS="/home"
diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.init policycoreutils-2.0.82/sandbox/sandbox.init
--- nsapolicycoreutils/sandbox/sandbox.init 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.82/sandbox/sandbox.init 2010-05-19 10:24:59.000000000 -0400
-@@ -0,0 +1,74 @@
++++ policycoreutils-2.0.82/sandbox/sandbox.init 2010-06-03 17:11:59.000000000 -0400
+@@ -0,0 +1,72 @@
+#!/bin/bash
+## BEGIN INIT INFO
+# Provides: sandbox
@@ -2139,8 +2139,7 @@ diff --exclude-from=exclude --exclude=se
+base=${0##*/}
+
+case "$1" in
-+ restart)
-+ start)
++ restart | start)
+ [ -f "$LOCKFILE" ] && exit 0
+
+ touch $LOCKFILE
@@ -2170,7 +2169,6 @@ diff --exclude-from=exclude --exclude=se
+ rm -f $LOCKFILE
+ exit 0
+ ;;
-+
+ *)
+ echo $"Usage: $0 {start|stop|status|restart}"
+ exit 3
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.688
retrieving revision 1.689
diff -u -p -r1.688 -r1.689
--- policycoreutils.spec 3 Jun 2010 15:08:37 -0000 1.688
+++ policycoreutils.spec 3 Jun 2010 21:14:19 -0000 1.689
@@ -7,7 +7,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.82
-Release: 27%{?dist}
+Release: 28%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -313,6 +313,11 @@ fi
exit 0
%changelog
+* Thu Jun 3 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-28
+- Fix sandbox init script
+- Add dbus-launch to sandbox -X
+Resolve: #599599
+
* Thu Jun 3 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-27
- Move genhomedircon.8 to same package as genhomedircon
- Fix sandbox to pass unit test
More information about the scm-commits
mailing list