rpms/policycoreutils/devel policycoreutils-sepolgen.patch, 1.17, 1.18 policycoreutils.spec, 1.576, 1.577

[Daniel J Walsh]

Author: dwalsh

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

Modified Files:
	policycoreutils-sepolgen.patch policycoreutils.spec 
Log Message:
* Sat Dec 6 2008 Dan Walsh <dwalsh at redhat.com> 2.0.60-4
- Change md5 to hashlib.md5 in sepolgen


policycoreutils-sepolgen.patch:

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- policycoreutils-sepolgen.patch	1 Dec 2008 16:49:50 -0000	1.17
+++ policycoreutils-sepolgen.patch	6 Dec 2008 12:28:04 -0000	1.18
@@ -1,7 +1,7 @@
 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:41:09.000000000 -0500
-@@ -314,7 +314,7 @@
++++ 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."""
@@ -12,7 +12,7 @@
          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:26:20.000000000 -0500
++++ 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 = []
@@ -22,3 +22,24 @@
  
      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.
+ 


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.576
retrieving revision 1.577
diff -u -r1.576 -r1.577
--- policycoreutils.spec	4 Dec 2008 17:20:47 -0000	1.576
+++ policycoreutils.spec	6 Dec 2008 12:28:04 -0000	1.577
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.60
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Sat Dec 6 2008 Dan Walsh <dwalsh at redhat.com> 2.0.60-4
+- Change md5 to hashlib.md5 in sepolgen
+
 * Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.0.60-3
 - Rebuild for Python 2.6