summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2016-03-08 06:11:14 (GMT)
committerNed Deily <nad@python.org>2016-03-08 06:11:14 (GMT)
commit3a5e1afb922fb8438f19345ae858515b20d6fd43 (patch)
tree629f884188e1b9025427b8e5741c8c05cebb3cdb
parent686905fe13fdd00bb02d9343e7574e38763b3711 (diff)
parentf4d97ce1008e2f27c9b9ca636434d35d42098a2c (diff)
downloadcpython-3a5e1afb922fb8438f19345ae858515b20d6fd43.zip
cpython-3a5e1afb922fb8438f19345ae858515b20d6fd43.tar.gz
cpython-3a5e1afb922fb8438f19345ae858515b20d6fd43.tar.bz2
Issue #26465: merge from 3.5
-rwxr-xr-xMac/BuildScript/build-installer.py6
-rw-r--r--Misc/NEWS6
2 files changed, 7 insertions, 5 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 9177356b..4e15f2d 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -242,9 +242,9 @@ def library_recipes():
result.extend([
dict(
- name="OpenSSL 1.0.2f",
- url="https://www.openssl.org/source/openssl-1.0.2f.tar.gz",
- checksum='b3bf73f507172be9292ea2a8c28b659d',
+ name="OpenSSL 1.0.2g",
+ url="https://www.openssl.org/source/openssl-1.0.2g.tar.gz",
+ checksum='f3c710c045cdee5fd114feb69feba7aa',
patches=[
"openssl_sdk_makedepend.patch",
],
diff --git a/Misc/NEWS b/Misc/NEWS
index f470f66..734c967 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -806,8 +806,10 @@ Build
Previously it could fail to compile properly if the math and cmath builds
were concurrent.
-- Issue #26268: Update OS X 10.5 installer and Windows builds to use
- OpenSSL 1.0.2f.
+- Issue #26465: Update OS X 10.5+ 32-bit-only installer to build
+ and link with OpenSSL 1.0.2g.
+
+- Issue #26268: Update Windows builds to use OpenSSL 1.0.2f.
- Issue #25136: Support Apple Xcode 7's new textual SDK stub libraries.