summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2015-07-04 06:35:00 (GMT)
committerNed Deily <nad@acm.org>2015-07-04 06:35:00 (GMT)
commit0454d48e0213d0187e63f78673b31639e3ea94ea (patch)
tree923addffccc14d7ff45145aff98b3737687d28db
parenta09ef0389badf6646e1d470d722880e6d5d65f33 (diff)
downloadcpython-0454d48e0213d0187e63f78673b31639e3ea94ea.zip
cpython-0454d48e0213d0187e63f78673b31639e3ea94ea.tar.gz
cpython-0454d48e0213d0187e63f78673b31639e3ea94ea.tar.bz2
Issue #24432: Update OS X 10.5+ installer builds to use OpenSSL 1.0.2c.
-rwxr-xr-xMac/BuildScript/build-installer.py6
-rw-r--r--Mac/BuildScript/openssl_sdk_makedepend.patch2
-rw-r--r--Misc/NEWS6
3 files changed, 6 insertions, 8 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 8728289..7fe5512 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.2a",
- url="https://www.openssl.org/source/openssl-1.0.2a.tar.gz",
- checksum='a06c547dac9044161a477211049f60ef',
+ name="OpenSSL 1.0.2c",
+ url="https://www.openssl.org/source/openssl-1.0.2c.tar.gz",
+ checksum='8c8d81a9ae7005276e486702edbcd4b6',
patches=[
"openssl_sdk_makedepend.patch",
],
diff --git a/Mac/BuildScript/openssl_sdk_makedepend.patch b/Mac/BuildScript/openssl_sdk_makedepend.patch
index 5903afd..74d7121 100644
--- a/Mac/BuildScript/openssl_sdk_makedepend.patch
+++ b/Mac/BuildScript/openssl_sdk_makedepend.patch
@@ -2,7 +2,7 @@
# Parent 25a9af415e8c3faf591c360d5f0e361d049b2b43
# openssl_sdk_makedepend.patch
#
-# using openssl 1.0.2a
+# using openssl 1.0.2c
#
# - support building with an OS X SDK
# - allow "make depend" to use compilers with names other than "gcc"
diff --git a/Misc/NEWS b/Misc/NEWS
index 95a1237..3d4694f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -340,10 +340,8 @@ Build
- Issue #23445: pydebug builds now use "gcc -Og" where possible, to make
the resulting executable faster.
-- Issue #23686: Update OS X 10.5 installer and Windows builds to use
- OpenSSL 1.0.2a.
-
-- Issue #24432: Update Windows builds to use OpenSSL 1.0.2c.
+- Issue #24432: Update Windows builds and OS X 10.5 installer to use OpenSSL
+ 1.0.2c.
C API
-----