cpython: cc5006dab787 (original) (raw)
Mercurial > cpython
changeset 104450:cc5006dab787 3.6
Issue #28248: Merge with 3.5 [#28248]
| Zachary Ware zachary.ware@gmail.com | |
|---|---|
| date | Mon, 10 Oct 2016 22:22:27 -0500 |
| parents | cd5f20f75857(current diff)5fa74d8c987b(diff) |
| children | fea9ff9e745d b7e068d6c53f |
| files | Misc/NEWS PCbuild/get_externals.bat PCbuild/pyproject.props PCbuild/python.props PCbuild/readme.txt |
| diffstat | 4 files changed, 8 insertions(+), 3 deletions(-)[+] [-] Misc/NEWS 5 PCbuild/get_externals.bat 2 PCbuild/python.props 2 PCbuild/readme.txt 2 |
line wrap: on
line diff
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,6 +13,11 @@ Core and Builtins Library ------- +Build +----- + +- Issue #28248: Update Windows build to use OpenSSL 1.0.2j. + What's New in Python 3.6.0 beta 2 =================================
--- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -54,7 +54,7 @@ echo.Fetching external libraries... set libraries= set libraries=%libraries% bzip2-1.0.6 if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06 -if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2h +if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2j set libraries=%libraries% sqlite-3.14.1.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0
--- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -45,7 +45,7 @@ $(ExternalsDir)sqlite-3.14.1.0</sqlite3Dir> $(ExternalsDir)bzip2-1.0.6</bz2Dir> $(ExternalsDir)xz-5.2.2</lzmaDir>
- $(ExternalsDir)openssl-1.0.2j</opensslDir> $(opensslDir)include32 $(opensslDir)include64 $(ExternalsDir)\nasm-2.11.06</nasmDir>
--- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -169,7 +169,7 @@ are: Homepage: http://tukaani.org/xz/[](#l5.5) _ssl
- Python wrapper for version 1.0.2j of the OpenSSL secure sockets library, which is built by ssl.vcxproj Homepage: http://www.openssl.org/[](#l5.11)