changeset: 97046:78254d483573 branch: 3.5 parent: 97042:b45077269aaa parent: 97045:436b8902b305 user: Ned Deily date: Fri Jul 24 16:24:47 2015 -0700 files: Mac/BuildScript/build-installer.py Misc/NEWS description: Issue #24603: merge from 3.4 diff -r b45077269aaa -r 78254d483573 Mac/BuildScript/build-installer.py --- a/Mac/BuildScript/build-installer.py Fri Jul 24 17:36:21 2015 +0300 +++ b/Mac/BuildScript/build-installer.py Fri Jul 24 16:24:47 2015 -0700 @@ -237,9 +237,9 @@ result.extend([ dict( - name="OpenSSL 1.0.2c", - url="https://www.openssl.org/source/openssl-1.0.2c.tar.gz", - checksum='8c8d81a9ae7005276e486702edbcd4b6', + name="OpenSSL 1.0.2d", + url="https://www.openssl.org/source/openssl-1.0.2d.tar.gz", + checksum='38dd619b2e77cbac69b99f52a053d25a', patches=[ "openssl_sdk_makedepend.patch", ], diff -r b45077269aaa -r 78254d483573 Mac/BuildScript/openssl_sdk_makedepend.patch --- a/Mac/BuildScript/openssl_sdk_makedepend.patch Fri Jul 24 17:36:21 2015 +0300 +++ b/Mac/BuildScript/openssl_sdk_makedepend.patch Fri Jul 24 16:24:47 2015 -0700 @@ -2,7 +2,7 @@ # Parent 25a9af415e8c3faf591c360d5f0e361d049b2b43 # openssl_sdk_makedepend.patch # -# using openssl 1.0.2c +# using openssl 1.0.2d # # - support building with an OS X SDK # - allow "make depend" to use compilers with names other than "gcc" diff -r b45077269aaa -r 78254d483573 Misc/NEWS --- a/Misc/NEWS Fri Jul 24 17:36:21 2015 +0300 +++ b/Misc/NEWS Fri Jul 24 16:24:47 2015 -0700 @@ -70,7 +70,8 @@ Build ----- -- Issue #24603: Update the Windows build to use OpenSSL 1.0.2d. +- Issue #24603: Update Windows builds and OS X 10.5 installer to use OpenSSL + 1.0.2d. What's New in Python 3.5.0 beta 3?