summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2015-02-06 03:16:29 (GMT)
committerNed Deily <nad@acm.org>2015-02-06 03:16:29 (GMT)
commitd0a8f57ef915b2e5b30e3b0dfddd8ec40c850694 (patch)
tree0a5c377de4fa5ff68640fecb0937a13c8469073c
parentf92766c3b27d4c1fef95809412f2989aebf0b545 (diff)
parent9125fe2e50965f14d0472792caaf46e58392aed7 (diff)
downloadcpython-d0a8f57ef915b2e5b30e3b0dfddd8ec40c850694.zip
cpython-d0a8f57ef915b2e5b30e3b0dfddd8ec40c850694.tar.gz
cpython-d0a8f57ef915b2e5b30e3b0dfddd8ec40c850694.tar.bz2
Issue #23212: merge from 3.4
-rwxr-xr-xMac/BuildScript/build-installer.py6
-rw-r--r--Misc/NEWS2
2 files changed, 4 insertions, 4 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 379cb95..16576d5 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -237,9 +237,9 @@ def library_recipes():
result.extend([
dict(
- name="OpenSSL 1.0.1k",
- url="https://www.openssl.org/source/openssl-1.0.1k.tar.gz",
- checksum='d4f002bd22a56881340105028842ae1f',
+ name="OpenSSL 1.0.1l",
+ url="https://www.openssl.org/source/openssl-1.0.1l.tar.gz",
+ checksum='cdb22925fc9bc97ccbf1e007661f2aa6',
patches=[
"openssl_sdk_makedepend.patch",
],
diff --git a/Misc/NEWS b/Misc/NEWS
index 8d69d6b..9d80d9e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1555,7 +1555,7 @@ Build
- Issue #21236: Build _msi.pyd with cabinet.lib instead of fci.lib
-- Issue #17128: Use private version of OpenSSL for 2.7.9 OS X 10.5+ installer.
+- Issue #17128: Use private version of OpenSSL for OS X 10.5+ installer.
C API
-----