rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.441, 1.442 policycoreutils.spec, 1.641, 1.642

[Daniel J Walsh]

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9809

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Sep 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-5
- Fix sandbox to handle relative paths


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    2 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  422 +++---------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   18 
 restorecond/restorecond.init                |    5 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  237 ++++++++++
 restorecond/watch.c                         |  254 +++++++++++
 sandbox/Makefile                            |   31 +
 sandbox/sandbox                             |  202 ++++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   16 
 sandbox/seunshare.c                         |  203 ++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 semanage/semanage                           |   27 +
 semanage/seobject.py                        |   11 
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   51 +-
 setfiles/Makefile                           |    4 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/setfiles.c                         |  643 +++-------------------------
 28 files changed, 1836 insertions(+), 951 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -p -r1.441 -r1.442
--- policycoreutils-rhat.patch	14 Sep 2009 19:39:17 -0000	1.441
+++ policycoreutils-rhat.patch	16 Sep 2009 19:48:49 -0000	1.442
@@ -1222,8 +1222,8 @@ diff --exclude-from=exclude --exclude=se
 +relabel:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.73/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/sandbox	2009-09-09 17:05:42.000000000 -0400
-@@ -0,0 +1,200 @@
++++ policycoreutils-2.0.73/sandbox/sandbox	2009-09-16 15:46:50.000000000 -0400
+@@ -0,0 +1,202 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
 +import selinux
@@ -1307,7 +1307,6 @@ diff --exclude-from=exclude --exclude=se
 +def copyfiles(newhomedir, newtmpdir, files):
 +       import pwd
 +       homedir=pwd.getpwuid(os.getuid()).pw_dir
-+       
 +       for f in files:
 +              copyfile(f,homedir, newhomedir)
 +              copyfile(f,"/tmp", newtmpdir)
@@ -1389,12 +1388,15 @@ diff --exclude-from=exclude --exclude=se
 +                         os.mkdir(newtmpdir)
 +                         selinux.setfilecon(newtmpdir, filecon)
 +                         warnings.resetwarnings()
-+                         copyfiles(newhomedir, newtmpdir, init_files + cmds)
++                         paths = []
++                         for i in cmds:
++                                paths.append(os.path.realpath(i))
++                         copyfiles(newhomedir, newtmpdir, init_files + paths)
 +                         execfile = newhomedir + "/.sandboxrc"
 +                         fd = open(execfile, "w+")
 +                         fd.write("""#! /bin/sh
 +%s
-+""" % " ".join(cmds))
++""" % " ".join(paths))
 +                         fd.close()
 +                         os.chmod(execfile, 0700)
 +                         


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.641
retrieving revision 1.642
diff -u -p -r1.641 -r1.642
--- policycoreutils.spec	15 Sep 2009 21:36:51 -0000	1.641
+++ policycoreutils.spec	16 Sep 2009 19:48:51 -0000	1.642
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.73
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -297,6 +297,9 @@ fi
 exit 0
 
 %changelog
+* Mon Sep 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-5
+- Fix sandbox to handle relative paths
+
 * Mon Sep 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-4
 - Add symbolic link to load_policy