From 70b2ff10d07c8ce2f1bbf891a3f50c7c48c1f1bf Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Thu, 3 Jun 2010 21:14:18 +0000
Subject: [PATCH] * Thu Jun 3 2010 Dan Walsh <dwalsh@redhat.com> 2.0.82-28 -
 Fix sandbox init script - Add dbus-launch to sandbox -X Resolve: #599599

---
 policycoreutils-rhat.patch | 12 +++++-------
 policycoreutils.spec       |  7 ++++++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 2a5da76..c47ab2a 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -1595,7 +1595,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
 +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@redhat.com>
@@ -1827,7 +1827,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
 +/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=sepolgen-1.0.23 --exclude=gui --exclude=po
 +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=sepolgen-1.0.23 --exclude=gui --exclude=po
 +base=${0##*/}
 +
 +case "$1" in
-+    restart)
-+    start)
++    restart | start)
 +	[ -f "$LOCKFILE" ] && exit 0
 +
 +	touch $LOCKFILE
@@ -2170,7 +2169,6 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
 +	rm -f $LOCKFILE
 +	exit 0
 +	;;
-+
 +    *)
 +	echo $"Usage: $0 {start|stop|status|restart}"
 +	exit 3
diff --git a/policycoreutils.spec b/policycoreutils.spec
index be71ccd..7054e5a 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.82
-Release: 26%{?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@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@redhat.com> 2.0.82-27
 - Move genhomedircon.8 to same package as genhomedircon
 - Fix sandbox to pass unit test