diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2016-10-11 03:11:12 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2016-10-11 03:11:12 (GMT) |
| commit | fd28cbef4b1a1b85f8fc6d936a8916302abdf171 (patch) | |
| tree | 40c1657b88a6aa9df76135058adbdf4cdeab158f | |
| parent | d2a584b47b30f2e8189730201c4d19d51cdd0e89 (diff) | |
| parent | 068534ab037236aa80d489383aded87c28553eb0 (diff) | |
| download | cpython-fd28cbef4b1a1b85f8fc6d936a8916302abdf171.zip cpython-fd28cbef4b1a1b85f8fc6d936a8916302abdf171.tar.gz cpython-fd28cbef4b1a1b85f8fc6d936a8916302abdf171.tar.bz2 | |
Issue #28248: Merge with 3.4
| -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
@@ -464,6 +464,8 @@ Windows Build ----- +- Issue #28248: Update Windows build to use OpenSSL 1.0.2j. + - Issue #28258: Fixed build with Estonian locale (python-config and distclean targets in Makefile). Patch by Arfrever Frehtes Taifersar Arahesis. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 9b2a084..1c3cdee 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.2h
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2j
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 ee70210..1553731 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -46,7 +46,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.2h\</opensslDir> + <opensslDir>$(ExternalsDir)openssl-1.0.2j\</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 d45eb27..2462012 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.2h of the OpenSSL secure sockets
+ Python wrapper for version 1.0.2j of the OpenSSL secure sockets
library, which is built by ssl.vcxproj
Homepage:
http://www.openssl.org/
|