rpms/policycoreutils/devel policycoreutils-sepolgen.patch, 1.15, 1.16 policycoreutils.spec, 1.556, 1.557

[Daniel J Walsh]

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7091

Modified Files:
	policycoreutils-sepolgen.patch policycoreutils.spec 
Log Message:
* Thu Sep 11 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-8
- Only call gen_requires once in sepolgen


policycoreutils-sepolgen.patch:

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- policycoreutils-sepolgen.patch	29 Jul 2008 14:40:15 -0000	1.15
+++ policycoreutils-sepolgen.patch	11 Sep 2008 13:55:11 -0000	1.16
@@ -1,6 +1,39 @@
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.52/sepolgen-1.0.13/src/sepolgen/refparser.py
---- nsasepolgen/src/sepolgen/refparser.py	2008-06-13 23:25:26.000000000 -0400
-+++ policycoreutils-2.0.52/sepolgen-1.0.13/src/sepolgen/refparser.py	2008-07-29 09:06:29.000000000 -0400
+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
+--- 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
 @@ -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.556
retrieving revision 1.557
diff -u -r1.556 -r1.557
--- policycoreutils.spec	9 Sep 2008 19:14:39 -0000	1.556
+++ policycoreutils.spec	11 Sep 2008 13:55:11 -0000	1.557
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.55
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Thu Sep 11 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-8
+- Only call gen_requires once in sepolgen
+
 * Tue Sep 9 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-7
 - Change Requires line to gnome-python2-gnome
 - Fix spelling mistakes