* Mon Dec 1 2008 Dan Walsh <dwalsh@redhat.com> 2.0.60-1

- Update to upstream
	* semanage: use semanage_mls_enabled() from Stephen Smalley.

.cvsignore

@@ -191,3 +191,5 @@ policycoreutils-2.0.56.tgz
 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

@@ -19,18 +19,6 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po
      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

@@ -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
+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/policygen.py	2008-08-28 09:34:24.000000000 -0400
+--- nsasepolgen/src/sepolgen/access.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
++++ policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/access.py	2008-12-01 11:41:09.000000000 -0500
-@@ -134,6 +134,10 @@
+@@ -314,7 +314,7 @@
-             m.refpolicy = False
  
-     def get_module(self):
+     def __len__(self):
-+        # Generate the requires
+         """Return the unique number of role allow statements."""
-+        if self.gen_requires:
+-        return len(self.roles)
-+            gen_requires(self.module)
++        return len(self.role_type.keys())
-+
-         """Return the generated module"""
-         return self.module
  
-@@ -163,18 +167,10 @@
+     def add(self, role, type):
-         # Generate the raw allow rules from the filtered list
+         if self.role_types.has_key(role):
-         self.__add_allow_rules(raw_allow)
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/refparser.py
- 
--        # 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
 --- 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 = []

policycoreutils.spec

@@ -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
+Version: 2.0.60
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,10 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Mon Dec 1 2008 Dan Walsh <dwalsh@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@gmail.com> - 2.0.59-2
 - Rebuild for Python 2.6
 

sources

@@ -1,2 +1,2 @@
-b6756a012c26f414e4a5f8f438ce2188  sepolgen-1.0.13.tgz
+53c9e85e3807a80e3ccca2bfd42e787d  policycoreutils-2.0.60.tgz
-52d3b44666096f3cce20696ff3fbce17  policycoreutils-2.0.59.tgz
+df57d9d33c940c60994c6cbaa9f8e4a3  sepolgen-1.0.14.tgz