rpms/policycoreutils/F-13 policycoreutils-rhat.patch, 1.503, 1.504 policycoreutils.spec, 1.718, 1.719
Daniel J Walsh
dwalsh at fedoraproject.org
Thu Jun 3 15:05:44 UTC 2010
- Previous message: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.475, 1.476 policycoreutils.spec, 1.686, 1.687
- Next message: rpms/krusader/devel krusader-2.2.0-beta1-xz.patch, NONE, 1.1 krusader.spec, 1.31, 1.32 krusader-xz.patch, 1.1, NONE
- 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-serv30908
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
Log Message:
* 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
Resolves: #595796
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 | 74 ++
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, 3098 insertions(+), 756 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-13/policycoreutils-rhat.patch,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -p -r1.503 -r1.504
--- policycoreutils-rhat.patch 27 May 2010 21:22:56 -0000 1.503
+++ policycoreutils-rhat.patch 3 Jun 2010 15:05:42 -0000 1.504
@@ -1595,8 +1595,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-05-27 13:53:57.000000000 -0400
-@@ -0,0 +1,426 @@
++++ policycoreutils-2.0.82/sandbox/sandbox 2010-06-03 11:03:16.000000000 -0400
+@@ -0,0 +1,427 @@
+#! /usr/bin/python -E
+# Authors: Dan Walsh <dwalsh at redhat.com>
+# Authors: Josh Cogliati
@@ -1618,7 +1618,7 @@ diff --exclude-from=exclude --exclude=se
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
-+import os, sys, socket, random, fcntl, shutil, re, subprocess
++import os, stat, sys, socket, random, fcntl, shutil, re, subprocess
+import selinux
+import signal
+from tempfile import mkdtemp
@@ -1666,11 +1666,12 @@ diff --exclude-from=exclude --exclude=se
+def chcon(path, context, recursive=False):
+ """ Restore SELinux context on a given path """
+ mode = os.lstat(path)[stat.ST_MODE]
-+ lsetfilecon(path, context)
++ selinux.lsetfilecon(path, context)
+ if recursive:
-+ os.path.walk(path, lambda arg, dirname, fnames:
-+ map(chcon, [os.path.join(dirname, fname)
-+ for fname in fnames]), context)
++ for root, dirs, files in os.walk(path):
++ for f in files:
++ chcon("%s/%s" % (root, f), context, False)
++
+def copyfile(file, dir, dest):
+ import re
+ if file.startswith(dir):
@@ -1949,7 +1950,7 @@ diff --exclude-from=exclude --exclude=se
+ self.__homedir = mkdtemp(dir=sandboxdir, prefix=".sandbox")
+
+ if self.__options.tmpdir:
-+ chcon(self.__options.homedir, self.__filecon, True)
++ chcon(self.__options.tmpdir, self.__filecon, True)
+ self.__tmpdir = self.__options.tmpdir
+ else:
+ selinux.setfscreatecon(self.__filecon)
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-13/policycoreutils.spec,v
retrieving revision 1.718
retrieving revision 1.719
diff -u -p -r1.718 -r1.719
--- policycoreutils.spec 2 Jun 2010 15:48:41 -0000 1.718
+++ policycoreutils.spec 3 Jun 2010 15:05:44 -0000 1.719
@@ -142,7 +142,6 @@ The policycoreutils-python package conta
%{_mandir}/man1/audit2why.1*
%{_mandir}/man8/chcat.8*
%{_mandir}/ru/man8/chcat.8*
-%{_mandir}/man8/genhomedircon.8*
%{_mandir}/man8/sandbox.8*
%{_mandir}/man8/semanage.8*
%{_mandir}/ru/man8/semanage.8*
@@ -294,6 +293,7 @@ rm -rf %{buildroot}
%{_mandir}/man1/secon.1*
%{_mandir}/ru/man1/secon.1*
%{_mandir}/man8/seunshare.8*
+%{_mandir}/man8/genhomedircon.8*
%preun
if [ $1 -eq 0 ]; then
@@ -313,6 +313,11 @@ fi
exit 0
%changelog
+* 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
+Resolves: #595796
+
* Wed Jun 2 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-26
- Fix listing of booleans from audit2allow
@@ -324,7 +329,6 @@ exit 0
* Thu May 27 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-24
- Man page fixes
- sandbox fixes
-Resolves: #595796
- Move seunshare to base package
* Fri May 21 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-23
- Previous message: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.475, 1.476 policycoreutils.spec, 1.686, 1.687
- Next message: rpms/krusader/devel krusader-2.2.0-beta1-xz.patch, NONE, 1.1 krusader.spec, 1.31, 1.32 krusader-xz.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list