rpms/policycoreutils/F-13 policycoreutils-rhat.patch, 1.499, 1.500 policycoreutils.spec, 1.712, 1.713

Daniel J Walsh dwalsh at fedoraproject.org
Wed May 19 20:04:34 UTC 2010


Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22465

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Wed May 19 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-20
- Fixes from upstream for sandbox command


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                                      |   41 +
 sandbox/deliverables/README                           |   32 +
 sandbox/deliverables/basicwrapper                     |    4 
 sandbox/deliverables/run-in-sandbox.py                |   49 +
 sandbox/sandbox                                       |  430 ++++++++++++++++
 sandbox/sandbox.8                                     |   57 ++
 sandbox/sandbox.config                                |    2 
 sandbox/sandbox.init                                  |   74 ++
 sandbox/sandboxX.sh                                   |   15 
 sandbox/seunshare.c                                   |  304 +++++++++++
 sandbox/test.txt                                      |    1 
 sandbox/test_sandbox.py                               |   98 +++
 scripts/fixfiles                                      |   46 -
 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 ---
 45 files changed, 3016 insertions(+), 756 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-13/policycoreutils-rhat.patch,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -p -r1.499 -r1.500
--- policycoreutils-rhat.patch	19 May 2010 18:55:32 -0000	1.499
+++ policycoreutils-rhat.patch	19 May 2010 20:04:32 -0000	1.500
@@ -1594,7 +1594,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-05-19 13:57:42.000000000 -0400
++++ policycoreutils-2.0.82/sandbox/sandbox	2010-05-19 15:44:55.000000000 -0400
 @@ -0,0 +1,430 @@
 +#! /usr/bin/python -E
 +# Authors: Dan Walsh <dwalsh at redhat.com>
@@ -1970,12 +1970,12 @@ diff --exclude-from=exclude --exclude=se
 +
 +                         self.__setup_sandboxrc(self.__options.wm)
 +                         
-+                         cmds =  ('/usr/sbin/seunshare -t "%s" -h "%s" -- %s /usr/share/sandbox/sandboxX.sh' % (self.__tmpdir, self.__homedir, self.__execcon)).split()
++                         cmds = [ '/usr/sbin/seunshare', "-t", self.__tmpdir, "-h", self.__homedir, "--", self.__execcon, "/usr/share/sandbox/sandboxX.sh" ]
 +                         rc = subprocess.Popen(cmds).wait()
 +                         return rc
 +
 +                  if self.__mount:
-+                         cmds =  ('/usr/sbin/seunshare -t "%s" -h "%s" -- %s ' % (self.__tmpdir, self.__homedir, self.__execcon)).split()+self.__paths
++                         cmds =  [ '/usr/sbin/seunshare', "-t", self.__tmpdir, "-h", self.__homedir, "--", self.__execcon ] + self.__paths
 +                         rc = subprocess.Popen(cmds).wait()
 +                         return rc
 +
@@ -2173,7 +2173,7 @@ diff --exclude-from=exclude --exclude=se
 +esac
 diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.82/sandbox/sandboxX.sh
 --- nsapolicycoreutils/sandbox/sandboxX.sh	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.82/sandbox/sandboxX.sh	2010-04-28 17:12:19.000000000 -0400
++++ policycoreutils-2.0.82/sandbox/sandboxX.sh	2010-05-19 15:36:19.000000000 -0400
 @@ -0,0 +1,15 @@
 +#!/bin/bash 
 +context=`id -Z | secon -t -l -P`
@@ -2184,7 +2184,7 @@ diff --exclude-from=exclude --exclude=se
 +
 +(/usr/bin/Xephyr -title "$TITLE" -terminate -screen $SCREENSIZE -displayfd 5 5>&1 2>/dev/null) | while read D; do 
 +    export DISPLAY=:$D
-+    python -c 'import gtk, os; os.system("%s/.sandboxrc" % os.environ["HOME"])'
++    python -c 'import gtk, os, commands; commands.getstatusoutput("%s/.sandboxrc" % os.environ["HOME"])'
 +    export EXITCODE=$?
 +    kill -HUP 0
 +    break


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-13/policycoreutils.spec,v
retrieving revision 1.712
retrieving revision 1.713
diff -u -p -r1.712 -r1.713
--- policycoreutils.spec	19 May 2010 18:57:34 -0000	1.712
+++ policycoreutils.spec	19 May 2010 20:04:33 -0000	1.713
@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.82
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:  http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -307,7 +307,7 @@ fi
 exit 0
 
 %changelog
-* Wed May 19 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-19
+* Wed May 19 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-20
 - Fixes from upstream for sandbox command
 
 * Thu May 13 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-18



More information about the scm-commits mailing list