From ca78a38d4d740bb516632da684706b3779535129 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:52:41 +0000 Subject: import python-ply-3.4-11.el7 --- diff --git a/SOURCES/0001-Replace-md5-in-signature-calculation.patch b/SOURCES/0001-Replace-md5-in-signature-calculation.patch new file mode 100644 index 0000000..49478cc --- /dev/null +++ b/SOURCES/0001-Replace-md5-in-signature-calculation.patch @@ -0,0 +1,35 @@ +diff -u ply/yacc.py ply.mine/yacc.py +--- ply/yacc.py 2011-02-18 04:52:28.000000000 +0100 ++++ ply.mine/yacc.py 2017-03-03 16:01:13.609507492 +0100 +@@ -2794,24 +2794,20 @@ + + # Compute a signature over the grammar + def signature(self): ++ parts = [] + try: +- from hashlib import md5 +- except ImportError: +- from md5 import md5 +- try: +- sig = md5() + if self.start: +- sig.update(self.start.encode('latin-1')) ++ parts.append(self.start) + if self.prec: +- sig.update("".join(["".join(p) for p in self.prec]).encode('latin-1')) ++ parts.append(''.join([''.join(p) for p in self.prec])) + if self.tokens: +- sig.update(" ".join(self.tokens).encode('latin-1')) ++ parts.append(' '.join(self.tokens)) + for f in self.pfuncs: + if f[3]: +- sig.update(f[3].encode('latin-1')) +- except (TypeError,ValueError): ++ parts.append(f[3]) ++ except (TypeError, ValueError): + pass +- return sig.digest() ++ return ''.join(parts) + + # ----------------------------------------------------------------------------- + # validate_file() diff --git a/SPECS/python-ply.spec b/SPECS/python-ply.spec index 0f2e17c..d189e1f 100644 --- a/SPECS/python-ply.spec +++ b/SPECS/python-ply.spec @@ -7,11 +7,12 @@ Name: python-ply Summary: Python Lex-Yacc Version: 3.4 -Release: 10%{?dist} +Release: 11%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.dabeaz.com/ply/ Source0: http://www.dabeaz.com/ply/ply-%{version}.tar.gz +Patch0: 0001-Replace-md5-in-signature-calculation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -58,6 +59,7 @@ essential features: %prep %setup -q -n ply-%{version} +%patch0 -p0 sed -i 's|/usr/local/bin/python|/usr/bin/python|g' example/yply/yply.py chmod -x example/yply/yply.py example/newclasscalc/calc.py example/classcalc/calc.py example/cleanup.sh @@ -115,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT %endif # with_python3 %changelog +* Tue Mar 7 2017 Stanislav Laznicka 3.4-11 +- Replace md5 in signature calculation in order to allow use in FIPS + * Fri Jun 12 2015 Martin Kosek 3.4-10 - Increase Release number to get a clean upgrade path from EPEL 7