cpython: 195ce1f4f54b (original) (raw)
Mercurial > cpython
changeset 100460:195ce1f4f54b 2.7
Issue #26465: Update Windows builds to use OpenSSL 1.0.2g. [#26465]
| Steve Dower steve.dower@microsoft.com | |
|---|---|
| date | Tue, 08 Mar 2016 10:26:39 -0800 |
| parents | 5fbd16326353 |
| children | e7065fc4a6c2 |
| files | Misc/NEWS PCbuild/get_externals.bat PCbuild/python.props PCbuild/readme.txt |
| diffstat | 4 files changed, 5 insertions(+), 3 deletions(-)[+] [-] Misc/NEWS 2 PCbuild/get_externals.bat 2 PCbuild/python.props 2 PCbuild/readme.txt 2 |
line wrap: on
line diff
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -163,6 +163,8 @@ Tests Build ----- +- Issue #26465: Update Windows builds to use OpenSSL 1.0.2g. +
- Issue #24421: Compile Modules/_math.c once, before building extensions. Previously it could fail to compile properly if the math and cmath builds were concurrent.
--- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -58,7 +58,7 @@ set libraries= set libraries=%libraries% bzip2-1.0.6 if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% db-4.7.25.0 if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06 -if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2f +if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2g set libraries=%libraries% sqlite-3.6.21 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0
--- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -35,7 +35,7 @@ $(ExternalsDir)sqlite-3.6.21</sqlite3Dir> $(ExternalsDir)bzip2-1.0.6</bz2Dir> $(ExternalsDir)db-4.7.25.0
- $(ExternalsDir)openssl-1.0.2g</opensslDir> $(opensslDir)include32 $(opensslDir)include64 $(ExternalsDir)\nasm-2.11.06</nasmDir>
--- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -183,7 +183,7 @@ are: Homepage: http://www.bzip.org/[](#l4.5) _ssl
- Python wrapper for version 1.0.2g of the OpenSSL secure sockets library, which is built by ssl.vcxproj Homepage: http://www.openssl.org/[](#l4.11)