diff options
| author | Ned Deily <nad@acm.org> | 2015-07-03 23:47:02 -0700 |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2015-07-03 23:47:02 -0700 |
| commit | a84e1e929fda8cf93e45442d5a4967eab7013c62 (patch) | |
| tree | 70c880c58b1e30830dc7e108f15e52e65b5ad792 | |
| parent | b322326f48b03acfcd1bafe7b37a7061e7207058 (diff) | |
| parent | 704dde196c9cfe327bd6c40c576158d5c09545cd (diff) | |
| download | cpython-git-a84e1e929fda8cf93e45442d5a4967eab7013c62.tar.gz | |
Issue #24432: merge from 3.5
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 6 | ||||
| -rw-r--r-- | Mac/BuildScript/openssl_sdk_makedepend.patch | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 47cbe3db9e..46ce84f8eb 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 5903afdbff..74d712115b 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" @@ -119,7 +119,8 @@ Documentation Build ----- -- 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. What's New in Python 3.5.0 beta 2? |