rpms/policycoreutils/F-13 policycoreutils-rhat.patch, 1.490, 1.491 policycoreutils.spec, 1.701, 1.702
Daniel J Walsh
dwalsh at fedoraproject.org
Tue Apr 27 14:11:22 UTC 2010
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30515
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
Log Message:
* Tue Apr 27 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-10
- Make sepolgen-ifgen be quiet
policycoreutils-rhat.patch:
Makefile | 2
audit2allow/Makefile | 1
audit2allow/audit2allow | 45 -
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/deliverables/sandbox | 216 +++++++++
sandbox/sandbox | 411 +++++++++++++++++
sandbox/sandbox.8 | 56 ++
sandbox/sandbox.config | 2
sandbox/sandbox.init | 67 ++
sandbox/sandboxX.sh | 15
sandbox/seunshare.c | 290 ++++++++++++
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 | 422 ++++++++++++++---
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, 3153 insertions(+), 747 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-13/policycoreutils-rhat.patch,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -p -r1.490 -r1.491
--- policycoreutils-rhat.patch 27 Apr 2010 12:34:59 -0000 1.490
+++ policycoreutils-rhat.patch 27 Apr 2010 14:11:17 -0000 1.491
@@ -4259,8 +4259,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/sepolgen-ifgen/sepolgen-ifgen policycoreutils-2.0.82/sepolgen-ifgen/sepolgen-ifgen
--- nsapolicycoreutils/sepolgen-ifgen/sepolgen-ifgen 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.82/sepolgen-ifgen/sepolgen-ifgen 2010-04-27 08:30:57.000000000 -0400
-@@ -0,0 +1,128 @@
++++ policycoreutils-2.0.82/sepolgen-ifgen/sepolgen-ifgen 2010-04-27 10:10:28.000000000 -0400
+@@ -0,0 +1,131 @@
+#! /usr/bin/python -E
+#
+# Authors: Karl MacMillan <kmacmillan at mentalrootkit.com>
@@ -4324,12 +4324,15 @@ diff --exclude-from=exclude --exclude=se
+ return options
+
+def get_attrs():
-+ policy_path = selinux.selinux_binary_policy_path() + "." + str(selinux.security_policyvers())
+ try:
++ policy_path = selinux.selinux_binary_policy_path() + "." + str(selinux.security_policyvers())
+ outfile = tempfile.NamedTemporaryFile()
+ except IOError, e:
+ sys.stderr.write("could not open attribute output file\n")
+ return None
++ except OSError:
++ # SELinux Disabled Machine
++ return None
+
+ fd = open("/dev/null","w")
+ ret = subprocess.Popen([ATTR_HELPER, policy_path, outfile.name], stdout=fd).wait()
@@ -4368,7 +4371,7 @@ diff --exclude-from=exclude --exclude=se
+ attrs = get_attrs()
+ if attrs is None:
+ return 1
-+
++
+ # Parse the headers
+ try:
+ headers = refparser.parse_headers(options.headers, output=log, debug=options.debug)
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-13/policycoreutils.spec,v
retrieving revision 1.701
retrieving revision 1.702
diff -u -p -r1.701 -r1.702
--- policycoreutils.spec 27 Apr 2010 12:35:04 -0000 1.701
+++ policycoreutils.spec 27 Apr 2010 14:11:21 -0000 1.702
@@ -7,7 +7,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.82
-Release: 9%{?dist}
+Release: 10%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -143,7 +143,7 @@ The policycoreutils-python package conta
%{_mandir}/ru/man8/semanage.8*
%post python
-[ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen
+selinuxenabled && [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen
exit 0
%package sandbox
@@ -167,7 +167,7 @@ The policycoreutils-python package conta
%{_datadir}/sandbox/sandboxX.sh
%triggerin python -- selinux-policy
-[ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen
+selinuxenabled && [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen
exit 0
%post sandbox
@@ -306,7 +306,7 @@ fi
exit 0
%changelog
-* Tue Apr 27 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-9
+* Tue Apr 27 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-10
- Make sepolgen-ifgen be quiet
* Wed Apr 21 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-8
More information about the scm-commits
mailing list