[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #28248: Merge with 3.5

Mon Oct 10 23:30:34 EDT 2016

https://hg.python.org/cpython/rev/cc5006dab787
changeset: 104450:cc5006dab787
branch: 3.6
parent: 104445:cd5f20f75857
parent: 104449:5fa74d8c987b
user: Zachary Ware <zachary.ware at gmail.com>
date: Mon Oct 10 22:22:27 2016 -0500
summary:
 Issue #28248: Merge with 3.5
files:
 Misc/NEWS | 5 +++++
 PCbuild/get_externals.bat | 2 +-
 PCbuild/python.props | 2 +-
 PCbuild/readme.txt | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,11 @@
 Library
 -------
 
+Build
+-----
+
+- Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
+
 
 What's New in Python 3.6.0 beta 2
 =================================
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -54,7 +54,7 @@
 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.14.1.0
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0
diff --git a/PCbuild/python.props b/PCbuild/python.props
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -45,7 +45,7 @@
 <sqlite3Dir>$(ExternalsDir)sqlite-3.14.1.0\</sqlite3Dir>
 <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
 <lzmaDir>$(ExternalsDir)xz-5.2.2\</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
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -169,7 +169,7 @@
 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/
-- 
Repository URL: https://hg.python.org/cpython
