* Thu Sep 11 2008 Dan Walsh <dwalsh@redhat.com> 2.0.55-8
- Only call gen_requires once in sepolgen
This commit is contained in:
parent
88dfc26d3c
commit
8bd2afcec2
@ -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 = []
|
||||
|
@ -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 @@ if [ "$1" -ge "1" ]; then
|
||||
fi
|
||||
|
||||
%changelog
|
||||
* Thu Sep 11 2008 Dan Walsh <dwalsh@redhat.com> 2.0.55-8
|
||||
- Only call gen_requires once in sepolgen
|
||||
|
||||
* Tue Sep 9 2008 Dan Walsh <dwalsh@redhat.com> 2.0.55-7
|
||||
- Change Requires line to gnome-python2-gnome
|
||||
- Fix spelling mistakes
|
||||
|
Loading…
Reference in New Issue
Block a user