cpython: 399d49d4acae (original) (raw)

Mercurial > cpython

changeset 102060:399d49d4acae 2.7

Issue #26930: Update Windows build to OpenSSL 1.0.2h [#26930]

Zachary Ware zachary.ware@gmail.com
date Wed, 15 Jun 2016 17:12:38 -0500
parents c388b0751290
children e04c054beb53
files Misc/NEWS PC/VS9.0/pyproject.vsprops PC/VS9.0/readme.txt PCbuild/get_externals.bat PCbuild/python.props PCbuild/readme.txt
diffstat 6 files changed, 10 insertions(+), 5 deletions(-)[+] [-] Misc/NEWS 5 PC/VS9.0/pyproject.vsprops 2 PC/VS9.0/readme.txt 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 @@ -28,6 +28,11 @@ Documentation resulting links to use lowercase. Patch by Sean Rodman, test by Kaushik Nadikuditi. +Build +----- + +- Issue #26930: Update Windows builds to use OpenSSL 1.0.2h. + What's New in Python 2.7.12 release candidate 1? ================================================

--- a/PC/VS9.0/pyproject.vsprops +++ b/PC/VS9.0/pyproject.vsprops @@ -82,7 +82,7 @@ /> <UserMacro Name="opensslDir" - Value="$(externalsDir)\openssl-1.0.2g" + Value="$(externalsDir)\openssl-1.0.2h" /> <UserMacro Name="tcltkDir"

--- a/PC/VS9.0/readme.txt +++ b/PC/VS9.0/readme.txt @@ -132,7 +132,7 @@ bz2 Get the source code through

** NOTE: if you use the PCbuild\get_externals.bat approach for obtaining external sources then you don't need to manually get the source

--- 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.2g +if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2h set libraries=%libraries% sqlite-3.8.11.0 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.8.11.0</sqlite3Dir> $(ExternalsDir)bzip2-1.0.6</bz2Dir> $(ExternalsDir)db-4.7.25.0

--- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -183,7 +183,7 @@ are: Homepage: http://www.bzip.org/[](#l6.5) _ssl