46 lines
2.2 KiB
Diff
46 lines
2.2 KiB
Diff
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:47:09.000000000 -0500
|
|
@@ -313,7 +313,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.60/sepolgen-1.0.14/src/sepolgen/refparser.py 2008-12-01 11:47:09.000000000 -0500
|
|
@@ -919,7 +919,7 @@
|
|
def list_headers(root):
|
|
modules = []
|
|
support_macros = None
|
|
- blacklist = ["init.if", "inetd.if", "uml.if", "thunderbird.if"]
|
|
+ blacklist = ["uml.if", "thunderbird.if"]
|
|
|
|
for dirpath, dirnames, filenames in os.walk(root):
|
|
for name in filenames:
|
|
diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/yacc.py policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/yacc.py
|
|
--- nsasepolgen/src/sepolgen/yacc.py 2008-08-28 09:34:24.000000000 -0400
|
|
+++ policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/yacc.py 2008-12-06 07:26:04.000000000 -0500
|
|
@@ -67,7 +67,7 @@
|
|
|
|
error_count = 3 # Number of symbols that must be shifted to leave recovery mode
|
|
|
|
-import re, types, sys, cStringIO, md5, os.path
|
|
+import re, types, sys, cStringIO, hashlib, os.path
|
|
|
|
# Exception raised for yacc-related errors
|
|
class YaccError(Exception): pass
|
|
@@ -506,7 +506,7 @@
|
|
|
|
Errorfunc = None # User defined error handler
|
|
|
|
- Signature = md5.new() # Digital signature of the grammar rules, precedence
|
|
+ Signature = hashlib.md5() # Digital signature of the grammar rules, precedence
|
|
# and other information. Used to determined when a
|
|
# parsing table needs to be regenerated.
|
|
|