Add patch for OpenSSL 1.1.0

This commit is contained in:
Miro Hrončok 2017-01-01 13:25:48 +01:00
parent f375de3d55
commit c632071485
2 changed files with 1332 additions and 5 deletions

File diff suppressed because it is too large Load Diff

View File

@ -98,7 +98,7 @@
Summary: Version 3.5 of the Python programming language
Name: python%{pyshortver}
Version: %{pybasever}.2
Release: 3%{?dist}
Release: 4%{?dist}
License: Python
Group: Development/Languages
@ -385,6 +385,13 @@ Patch242: 00242-CVE-2016-1000110-httpoxy.patch
# Fedora needs the default mips64-linux-gnu
Patch243: 00243-fix-mips64-triplet.patch
# 00247 #
# Port ssl and hashlib modules to OpenSSL 1.1.0.
# As of F26, OpenSSL is rebased to 1.1.0, so in order for python
# to not FTBFS we need to backport this patch from 3.5.3
# FIXED UPSTREAM: https://bugs.python.org/issue26470
Patch247: 00247-port-ssl-and-hashlib-to-OpenSSL-1.1.0.patch
# (New patches go here ^^^)
#
# When adding new patches to "python" and "python3" in Fedora, EL, etc.,
@ -452,6 +459,8 @@ done
# Remove embedded copy of zlib:
rm -r Modules/zlib || exit 1
## Disabling hashlib patch for now as it needs to be reimplemented
## for OpenSSL 1.1.0.
# Don't build upstream Python's implementation of these crypto algorithms;
# instead rely on _hashlib and OpenSSL.
#
@ -459,9 +468,9 @@ rm -r Modules/zlib || exit 1
# OpenSSL (and thus respects FIPS mode), and does not fall back to _md5
# TODO: there seems to be no OpenSSL support in Python for sha3 so far
# when it is there, also remove _sha3/ dir
for f in md5module.c sha1module.c sha256module.c sha512module.c; do
rm Modules/$f
done
#for f in md5module.c sha1module.c sha256module.c sha512module.c; do
# rm Modules/$f
#done
#
# Apply patches:
@ -480,7 +489,7 @@ done
%patch132 -p1
%patch137 -p1
%patch143 -p1 -b .tsc-on-ppc
%patch146 -p1
#patch146 -p1
%patch155 -p1
%patch157 -p1
%patch160 -p1
@ -496,6 +505,7 @@ done
%patch209 -p1
%patch242 -p1
%patch243 -p1
%patch247 -p1
# Currently (2010-01-15), http://docs.python.org/library is for 2.6, and there
# are many differences between 2.6 and the Python 3 library.
@ -1022,6 +1032,9 @@ CheckPython optimized
# ======================================================
%changelog
* Sun Jan 01 2017 Miro Hrončok <mhroncok@redhat.com> - 3.5.2-4
- Add patch for OpenSSL 1.1.0
* Fri Oct 21 2016 Miro Hrončok <mhroncok@redhat.com> - 3.5.2-3
- Reword the description