f689b5c1ff
- Update to upstream * chcat: cut categories at arbitrary point (25) from Dan Walsh * semodule: use new interfaces in libsemanage for compressed files from Dan Walsh * audit2allow: string changes for usage
34 lines
1.6 KiB
Diff
34 lines
1.6 KiB
Diff
diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.61/sepolgen-1.0.15/src/sepolgen/refparser.py
|
|
--- nsasepolgen/src/sepolgen/refparser.py 2008-08-28 09:34:24.000000000 -0400
|
|
+++ policycoreutils-2.0.61/sepolgen-1.0.15/src/sepolgen/refparser.py 2008-12-15 15:34:55.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.61/sepolgen-1.0.15/src/sepolgen/yacc.py
|
|
--- nsasepolgen/src/sepolgen/yacc.py 2008-08-28 09:34:24.000000000 -0400
|
|
+++ policycoreutils-2.0.61/sepolgen-1.0.15/src/sepolgen/yacc.py 2008-12-15 15:34:55.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.
|
|
|