Commit c08bb6c
committed
Issue python#28248: Merge with 3.5
4 files changed
Lines changed: 8 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13,6 +13,11 @@ Core and Builtins | |||
| 13 | 13 | Library | |
| 14 | 14 | ------- | |
| 15 | 15 | ||
| 16 | + Build | ||
| 17 | + ----- | ||
| 18 | + | ||
| 19 | + - Issue #28248: Update Windows build to use OpenSSL 1.0.2j. | ||
| 20 | + | ||
| 16 | 21 | ||
| 17 | 22 | What's New in Python 3.6.0 beta 2 | |
| 18 | 23 | ================================= | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -54,7 +54,7 @@ echo.Fetching external libraries... | |||
| 54 | 54 | set libraries= | |
| 55 | 55 | set libraries=%libraries% bzip2-1.0.6 | |
| 56 | 56 | if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06 | |
| 57 | - if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2h | ||
| 57 | + if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2j | ||
| 58 | 58 | set libraries=%libraries% sqlite-3.14.1.0 | |
| 59 | 59 | if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0 | |
| 60 | 60 | if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0 | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -45,7 +45,7 @@ | |||
| 45 | 45 | <sqlite3Dir>$(ExternalsDir)sqlite-3.14.1.0\</sqlite3Dir> | |
| 46 | 46 | <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> | |
| 47 | 47 | <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir> | |
| 48 | - <opensslDir>$(ExternalsDir)openssl-1.0.2h\</opensslDir> | ||
| 48 | + <opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir> | ||
| 49 | 49 | <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir> | |
| 50 | 50 | <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir> | |
| 51 | 51 | <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -169,7 +169,7 @@ _lzma | |||
| 169 | 169 | Homepage: | |
| 170 | 170 | http://tukaani.org/xz/ | |
| 171 | 171 | _ssl | |
| 172 | - Python wrapper for version 1.0.2h of the OpenSSL secure sockets | ||
| 172 | + Python wrapper for version 1.0.2j of the OpenSSL secure sockets | ||
| 173 | 173 | library, which is built by ssl.vcxproj | |
| 174 | 174 | Homepage: | |
| 175 | 175 | http://www.openssl.org/ | |
0 commit comments