From c72dd1cc4d051705b0bf2ef90b18fdb356c6d093 Mon Sep 17 00:00:00 2001
From: James Antill <james@fedoraproject.org>
Date: Jul 10 2008 21:18:25 +0000
Subject: - Allow hashlib to work, if the linked openssl doesn't (Fed-9 update)

- Resolves: bug#454179

---

diff --git a/python-2.5.1-setup-sha256-bad-openssl.patch b/python-2.5.1-setup-sha256-bad-openssl.patch
new file mode 100644
index 0000000..50016bd
--- /dev/null
+++ b/python-2.5.1-setup-sha256-bad-openssl.patch
@@ -0,0 +1,12 @@
+diff -rup Python-2.5.1-orig/setup.py Python-2.5.1/setup.py
+--- Python-2.5.1-orig/setup.py	2008-07-10 13:33:18.000000000 -0400
++++ Python-2.5.1/setup.py	2008-07-10 13:34:59.000000000 -0400
+@@ -586,7 +586,7 @@ class PyBuildExt(build_ext):
+                             sources = ['md5module.c', 'md5.c'],
+                             depends = ['md5.h']) )
+ 
+-        if (openssl_ver < 0x00908000):
++        if True or (openssl_ver < 0x00908000): # So it works if OSSL breaks
+             # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
+             exts.append( Extension('_sha256', ['sha256module.c']) )
+             exts.append( Extension('_sha512', ['sha512module.c']) )
diff --git a/python.spec b/python.spec
index 5e5cadf..e34a9dc 100644
--- a/python.spec
+++ b/python.spec
@@ -20,7 +20,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: 2.5.1
-Release: 26%{?dist}
+Release: 26%{?dist}.2
 License: Python Software Foundation License v2 
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -60,6 +60,8 @@ Patch260: python2.6-set_wakeup_fd4.patch
 
 Patch999: python-2.5.CVE-2007-4965-int-overflow.patch
 
+# Fix for openssl ABI breakage on Fed-9 update
+Patch800: python-2.5.1-setup-sha256-bad-openssl.patch
 
 %if %{main_python}
 Obsoletes: Distutils
@@ -218,6 +220,8 @@ code that uses more than just unittest and/or test_support.py.
 
 %patch260 -p1 -b .set_wakeup_fd
 
+%patch800 -p1 -b .setup-sha256-bad-openssl
+
 %patch999 -p1 -b .cve2007-4965
 
 # This shouldn't be necesarry, but is right now (2.2a3)
@@ -507,6 +511,10 @@ rm -fr $RPM_BUILD_ROOT
 %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so
 
 %changelog
+* Thu Jul 10 2008 James Antill <jantill@redhat.com> - 2.5.1-26.fc8.2
+- Allow hashlib to work, if the linked openssl doesn't (Fed-9 update)
+- Resolves: bug#454179
+
 * Sun Jun 15 2008 James Antill <jantill@redhat.com> - 2.5.1-26
 - Fix sporadic listdir problem
 - Resolves: bug#451494