rpms/policycoreutils/F-13 policycoreutils-rhat.patch, 1.485, 1.486 policycoreutils.spec, 1.696, 1.697
Daniel J Walsh
dwalsh at fedoraproject.org
Tue Apr 13 18:13:02 UTC 2010
- Previous message: rpms/selinux-policy/F-13 modules-minimum.conf, 1.62, 1.63 modules-mls.conf, 1.76, 1.77 modules-targeted.conf, 1.171, 1.172 policy-F13.patch, 1.94, 1.95 selinux-policy.spec, 1.998, 1.999
- Next message: rpms/epydoc/devel epydoc-3.0.1-new-docutils.patch, NONE, 1.1 epydoc.spec, 1.17, 1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32489
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
Log Message:
* Tue Apr 13 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-5
- Fix sandbox comment on HOMEDIRS
- Fix sandbox to throw error on bad executable
policycoreutils-rhat.patch:
Makefile | 2
audit2allow/audit2allow | 45 -
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/deliverables/sandbox | 216 +++++++++
sandbox/sandbox | 424 +++++++++++++++++
sandbox/sandbox.8 | 56 ++
sandbox/sandbox.config | 2
sandbox/sandbox.init | 67 ++
sandbox/sandboxX.sh | 15
sandbox/seunshare.c | 265 +++++++++++
sandbox/test.txt | 1
sandbox/test_sandbox.py | 98 ++++
scripts/fixfiles | 44 -
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 | 152 +++++-
semanage/semanage.8 | 128 ++++-
semanage/seobject.py | 422 ++++++++++++++---
setfiles/restore.c | 109 ++++
setfiles/restore.h | 4
setfiles/restorecon.8 | 7
setfiles/setfiles.8 | 3
setfiles/setfiles.c | 78 ---
40 files changed, 2747 insertions(+), 652 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-13/policycoreutils-rhat.patch,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -p -r1.485 -r1.486
--- policycoreutils-rhat.patch 31 Mar 2010 22:27:54 -0000 1.485
+++ policycoreutils-rhat.patch 13 Apr 2010 18:13:00 -0000 1.486
@@ -1676,8 +1676,8 @@ 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-03-24 16:12:21.000000000 -0400
-@@ -0,0 +1,420 @@
++++ policycoreutils-2.0.82/sandbox/sandbox 2010-04-13 10:13:43.000000000 -0400
+@@ -0,0 +1,424 @@
+#! /usr/bin/python -E
+# Authors: Dan Walsh <dwalsh at redhat.com>
+# Authors: Josh Cogliati
@@ -1704,6 +1704,7 @@ diff --exclude-from=exclude --exclude=se
+import signal
+from tempfile import mkdtemp
+import pwd
++import commands
+
+PROGNAME = "policycoreutils"
+HOMEDIR=pwd.getpwuid(os.getuid()).pw_dir
@@ -1851,7 +1852,7 @@ diff --exclude-from=exclude --exclude=se
+ return
+ raise ValueError(_("""
+'%s' is required to be a shared mount point for this tool to run.
-+'%s' can be added to the HOMEDIR variable in /etc/sysconfig/sandbox
++'%s' can be added to the HOMEDIRS variable in /etc/sysconfig/sandbox
+ along with a reboot will fix the problem.
+""" % ((os.path.dirname(homedir)), os.path.dirname(homedir))))
+
@@ -1984,6 +1985,9 @@ diff --exclude-from=exclude --exclude=se
+ if len(cmds) == 0:
+ self.usage(_("Command required"))
+ cmds[0] = fullpath(cmds[0])
++ if not os.access(cmds[0], os.X_OK):
++ self.usage(_("%s is not an executable") % cmds[0] )
++
+ self.__cmds = cmds
+
+ for f in cmds:
@@ -2043,16 +2047,16 @@ 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()
-+ rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
++ 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
-+ rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
++ rc = subprocess.Popen(cmds).wait()
+ return rc
+
+ selinux.setexeccon(self.__execcon)
-+ rc = os.spawnvp(os.P_WAIT, self.__cmds[0], self.__cmds)
++ rc = subprocess.Popen(self.__cmds).wait()
+ selinux.setexeccon(None)
+ return rc
+
@@ -2625,6 +2629,11 @@ diff --exclude-from=exclude --exclude=se
+ unittest.main()
+ else:
+ print "SELinux must be in enforcing mode for this test"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/test.txt policycoreutils-2.0.82/sandbox/test.txt
+--- nsapolicycoreutils/sandbox/test.txt 1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.82/sandbox/test.txt 2010-04-13 07:46:31.000000000 -0400
+@@ -0,0 +1 @@
++1
diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.82/scripts/fixfiles
--- nsapolicycoreutils/scripts/fixfiles 2009-12-01 15:46:50.000000000 -0500
+++ policycoreutils-2.0.82/scripts/fixfiles 2010-03-24 16:12:21.000000000 -0400
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-13/policycoreutils.spec,v
retrieving revision 1.696
retrieving revision 1.697
diff -u -p -r1.696 -r1.697
--- policycoreutils.spec 6 Apr 2010 19:51:45 -0000 1.696
+++ policycoreutils.spec 13 Apr 2010 18:13:02 -0000 1.697
@@ -7,7 +7,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.82
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -305,6 +305,10 @@ fi
exit 0
%changelog
+* Tue Apr 13 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-5
+- Fix sandbox comment on HOMEDIRS
+- Fix sandbox to throw error on bad executable
+
* Tue Apr 6 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-4
- Fix spacing in templates
- Previous message: rpms/selinux-policy/F-13 modules-minimum.conf, 1.62, 1.63 modules-mls.conf, 1.76, 1.77 modules-targeted.conf, 1.171, 1.172 policy-F13.patch, 1.94, 1.95 selinux-policy.spec, 1.998, 1.999
- Next message: rpms/epydoc/devel epydoc-3.0.1-new-docutils.patch, NONE, 1.1 epydoc.spec, 1.17, 1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list