changeset:   104451:fea9ff9e745d
parent:      104446:cae6808f7fea
parent:      104450:cc5006dab787
user:        Zachary Ware <zachary.ware@gmail.com>
date:        Mon Oct 10 22:28:39 2016 -0500
files:       Misc/NEWS PCbuild/readme.txt
description:
Issue #28248: Merge with 3.6


diff -r cae6808f7fea -r fea9ff9e745d Misc/NEWS
--- a/Misc/NEWS	Mon Oct 10 20:56:44 2016 -0400
+++ b/Misc/NEWS	Mon Oct 10 22:28:39 2016 -0500
@@ -262,6 +262,8 @@
 Build
 -----
 
+- Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
+
 - Issue #21124: Fix building the _struct module on Cygwin by passing ``NULL``
   instead of ``&PyType_Type`` to PyVarObject_HEAD_INIT.  Patch by Masayuki
   Yamamoto.
diff -r cae6808f7fea -r fea9ff9e745d PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat	Mon Oct 10 20:56:44 2016 -0400
+++ b/PCbuild/get_externals.bat	Mon Oct 10 22:28:39 2016 -0500
@@ -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 -r cae6808f7fea -r fea9ff9e745d PCbuild/python.props
--- a/PCbuild/python.props	Mon Oct 10 20:56:44 2016 -0400
+++ b/PCbuild/python.props	Mon Oct 10 22:28:39 2016 -0500
@@ -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 -r cae6808f7fea -r fea9ff9e745d PCbuild/readme.txt
--- a/PCbuild/readme.txt	Mon Oct 10 20:56:44 2016 -0400
+++ b/PCbuild/readme.txt	Mon Oct 10 22:28:39 2016 -0500
@@ -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/