diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2016-06-15 22:16:16 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2016-06-15 22:16:16 (GMT) |
| commit | 0475ffa64db2901864c5410feef589372989c34e (patch) | |
| tree | a5fbbc188247c7b29864c74fa133f2d02f74cb20 | |
| parent | 6df108b4bea9e6f2e6a20c9b3f13c6b3313993c1 (diff) | |
| parent | f88d83b922d3525ec65dbfe03e27f197ef1a9021 (diff) | |
| download | cpython-0475ffa64db2901864c5410feef589372989c34e.zip cpython-0475ffa64db2901864c5410feef589372989c34e.tar.gz cpython-0475ffa64db2901864c5410feef589372989c34e.tar.bz2 | |
Issue #26930: Merge with 3.5
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/python.props | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 |
4 files changed, 5 insertions, 3 deletions
@@ -47,6 +47,8 @@ IDLE Build ----- +- Issue #26930: Update Windows builds to use OpenSSL 1.0.2h. + - Issue #23968: Rename the platform directory from plat-$(MACHDEP) to plat-$(PLATFORM_TRIPLET). Rename the config directory (LIBPL) from config-$(LDVERSION) to diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 63ba282..9b2a084 100644 --- 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.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-core-8.6.4.2
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2
diff --git a/PCbuild/python.props b/PCbuild/python.props index 07acfab..843771d 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -41,7 +41,7 @@ <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir> - <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 ba26927..2046af9 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -169,7 +169,7 @@ _lzma Homepage:
http://tukaani.org/xz/
_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/
|