traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #23212: merge from 3.4

This commit is contained in:
Ned Deily 2015-02-06 14:16:29 +11:00
parent f92766c3b2 9125fe2e50
commit d0a8f57ef9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mac/BuildScript/build-installer.py
View File

@ -237,9 +237,9 @@ def library_recipes():
result.extend([ result.extend([
dict( dict(
name="OpenSSL 1.0.1k", name="OpenSSL 1.0.1l",
url="https://www.openssl.org/source/openssl-1.0.1k.tar.gz", url="https://www.openssl.org/source/openssl-1.0.1l.tar.gz",
checksum='d4f002bd22a56881340105028842ae1f', checksum='cdb22925fc9bc97ccbf1e007661f2aa6',
patches=[ patches=[
"openssl_sdk_makedepend.patch", "openssl_sdk_makedepend.patch",
], ],

2
Misc/NEWS
View File

@ -1555,7 +1555,7 @@ Build
- Issue #21236: Build _msi.pyd with cabinet.lib instead of fci.lib - 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 C API
----- -----