diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2016-06-15 22:12:38 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2016-06-15 22:12:38 (GMT) |
| commit | 0ffd26f7ff66b0c97ec380547de3daf742479d8f (patch) | |
| tree | 2de6e793a81deb4e9e9d0a1f574b71310a91b6fa | |
| parent | 7ae0a6dfda188287cbc74d0b312aaf7d872b7123 (diff) | |
| download | cpython-0ffd26f7ff66b0c97ec380547de3daf742479d8f.zip cpython-0ffd26f7ff66b0c97ec380547de3daf742479d8f.tar.gz cpython-0ffd26f7ff66b0c97ec380547de3daf742479d8f.tar.bz2 | |
Issue #26930: Update Windows build to OpenSSL 1.0.2h
| -rw-r--r-- | Misc/NEWS | 9 | ||||
| -rw-r--r-- | PC/VS9.0/pyproject.vsprops | 2 | ||||
| -rw-r--r-- | PC/VS9.0/readme.txt | 2 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/python.props | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 |
6 files changed, 14 insertions, 5 deletions
@@ -2,6 +2,15 @@ Python News +++++++++++ +What's New in Python 2.7.12? +============================ + +Build +----- + +- Issue #26930: Update Windows builds to use OpenSSL 1.0.2h. + + What's New in Python 2.7.12 release candidate 1? ================================================ diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops index 8fa5d70..4901251 100644 --- 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"
diff --git a/PC/VS9.0/readme.txt b/PC/VS9.0/readme.txt index 42b1536..3345af9 100644 --- a/PC/VS9.0/readme.txt +++ b/PC/VS9.0/readme.txt @@ -132,7 +132,7 @@ _ssl Get the source code through
- svn export http://svn.python.org/projects/external/openssl-1.0.2g
+ svn export http://svn.python.org/projects/external/openssl-1.0.2h
** NOTE: if you use the PCbuild\get_externals.bat approach for
obtaining external sources then you don't need to manually get the source
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 9a40992..90b1068 100644 --- 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
diff --git a/PCbuild/python.props b/PCbuild/python.props index abfb826..e40751a 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -35,7 +35,7 @@ <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir> - <opensslDir>$(ExternalsDir)openssl-1.0.2g\</opensslDir> + <opensslDir>$(ExternalsDir)openssl-1.0.2h\</opensslDir> <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir> <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 8f9e805..7fee48f 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -183,7 +183,7 @@ _bz2 Homepage:
http://www.bzip.org/
_ssl
- Python wrapper for version 1.0.2g of the OpenSSL secure sockets
+ Python wrapper for version 1.0.2h of the OpenSSL secure sockets
library, which is built by ssl.vcxproj
Homepage:
http://www.openssl.org/
|