rpms/policycoreutils/devel .cvsignore, 1.190, 1.191 policycoreutils-rhat.patch, 1.402, 1.403 policycoreutils-sepolgen.patch, 1.16, 1.17 policycoreutils.spec, 1.573, 1.574 sources, 1.195, 1.196
Daniel J Walsh
dwalsh at fedoraproject.org
Mon Dec 1 16:50:21 UTC 2008
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32228
Modified Files:
.cvsignore policycoreutils-rhat.patch
policycoreutils-sepolgen.patch policycoreutils.spec sources
Log Message:
* Mon Dec 1 2008 Dan Walsh <dwalsh at redhat.com> 2.0.60-1
- Update to upstream
* semanage: use semanage_mls_enabled() from Stephen Smalley.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- .cvsignore 11 Nov 2008 21:18:08 -0000 1.190
+++ .cvsignore 1 Dec 2008 16:49:49 -0000 1.191
@@ -191,3 +191,5 @@
policycoreutils-2.0.57.tgz
policycoreutils-2.0.58.tgz
policycoreutils-2.0.59.tgz
+policycoreutils-2.0.60.tgz
+sepolgen-1.0.14.tgz
policycoreutils-rhat.patch:
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- policycoreutils-rhat.patch 11 Nov 2008 21:18:09 -0000 1.402
+++ policycoreutils-rhat.patch 1 Dec 2008 16:49:49 -0000 1.403
@@ -19,18 +19,6 @@
return newcats
def translate(cats):
-diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.58/semanage/seobject.py
---- nsapolicycoreutils/semanage/seobject.py 2008-11-11 16:13:18.000000000 -0500
-+++ policycoreutils-2.0.58/semanage/seobject.py 2008-11-10 08:59:16.000000000 -0500
-@@ -35,7 +35,7 @@
- import __builtin__
- __builtin__.__dict__['_'] = unicode
-
--is_mls_enabled = selinux.is_selinux_mls_enabled()
-+is_mls_enabled = not selinux.is_selinux_enabled() or selinux.is_selinux_mls_enabled()
-
- import syslog
-
diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.58/semodule/semodule.c
--- nsapolicycoreutils/semodule/semodule.c 2008-08-28 09:34:24.000000000 -0400
+++ policycoreutils-2.0.58/semodule/semodule.c 2008-11-10 08:57:34.000000000 -0500
policycoreutils-sepolgen.patch:
Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- policycoreutils-sepolgen.patch 11 Sep 2008 13:55:11 -0000 1.16
+++ policycoreutils-sepolgen.patch 1 Dec 2008 16:49:50 -0000 1.17
@@ -1,39 +1,18 @@
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/policygen.py policycoreutils-2.0.55/sepolgen-1.0.13/src/sepolgen/policygen.py
---- nsasepolgen/src/sepolgen/policygen.py 2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/sepolgen-1.0.13/src/sepolgen/policygen.py 2008-09-11 09:26:52.000000000 -0400
-@@ -134,6 +134,10 @@
- m.refpolicy = False
-
- def get_module(self):
-+ # Generate the requires
-+ if self.gen_requires:
-+ gen_requires(self.module)
-+
- """Return the generated module"""
- return self.module
-
-@@ -163,18 +167,10 @@
- # Generate the raw allow rules from the filtered list
- self.__add_allow_rules(raw_allow)
-
-- # Generate the requires
-- if self.gen_requires:
-- gen_requires(self.module)
--
- def add_role_types(self, role_type_set):
- for role_type in role_type_set:
- self.module.children.append(role_type)
-
-- # Generate the requires
-- if self.gen_requires:
-- gen_requires(self.module)
--
- def explain_access(av, ml=None, verbosity=SHORT_EXPLANATION):
- """Explain why a policy statement was generated.
-
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.55/sepolgen-1.0.13/src/sepolgen/refparser.py
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/access.py policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/access.py
+--- nsasepolgen/src/sepolgen/access.py 2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/access.py 2008-12-01 11:41:09.000000000 -0500
+@@ -314,7 +314,7 @@
+
+ def __len__(self):
+ """Return the unique number of role allow statements."""
+- return len(self.roles)
++ return len(self.role_type.keys())
+
+ def add(self, role, type):
+ if self.role_types.has_key(role):
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/refparser.py
--- nsasepolgen/src/sepolgen/refparser.py 2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.55/sepolgen-1.0.13/src/sepolgen/refparser.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/refparser.py 2008-12-01 11:26:20.000000000 -0500
@@ -919,7 +919,7 @@
def list_headers(root):
modules = []
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.573
retrieving revision 1.574
diff -u -r1.573 -r1.574
--- policycoreutils.spec 29 Nov 2008 17:56:27 -0000 1.573
+++ policycoreutils.spec 1 Dec 2008 16:49:50 -0000 1.574
@@ -2,11 +2,11 @@
%define libsepolver 2.0.19-1
%define libsemanagever 2.0.28-2
%define libselinuxver 2.0.46-5
-%define sepolgenver 1.0.13
+%define sepolgenver 1.0.14
Summary: SELinux policy core utilities
Name: policycoreutils
-Version: 2.0.59
-Release: 2%{?dist}
+Version: 2.0.60
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,10 @@
fi
%changelog
+* Mon Dec 1 2008 Dan Walsh <dwalsh at redhat.com> 2.0.60-1
+- Update to upstream
+ * semanage: use semanage_mls_enabled() from Stephen Smalley.
+
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.0.59-2
- Rebuild for Python 2.6
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- sources 11 Nov 2008 21:18:11 -0000 1.195
+++ sources 1 Dec 2008 16:49:50 -0000 1.196
@@ -1,2 +1,2 @@
-b6756a012c26f414e4a5f8f438ce2188 sepolgen-1.0.13.tgz
-52d3b44666096f3cce20696ff3fbce17 policycoreutils-2.0.59.tgz
+53c9e85e3807a80e3ccca2bfd42e787d policycoreutils-2.0.60.tgz
+df57d9d33c940c60994c6cbaa9f8e4a3 sepolgen-1.0.14.tgz
More information about the fedora-extras-commits
mailing list