changeset:   102062:3d726dbfca31
parent:      102059:b3f97ed4a904
parent:      102061:155e665428c6
user:        Zachary Ware <zachary.ware@gmail.com>
date:        Wed Jun 15 17:16:16 2016 -0500
files:       Misc/NEWS PCbuild/readme.txt
description:
Issue #26930: Merge with 3.5


diff -r b3f97ed4a904 -r 3d726dbfca31 Misc/NEWS
--- a/Misc/NEWS	Wed Jun 15 18:09:45 2016 -0400
+++ b/Misc/NEWS	Wed Jun 15 17:16:16 2016 -0500
@@ -47,6 +47,8 @@
 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 -r b3f97ed4a904 -r 3d726dbfca31 PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat	Wed Jun 15 18:09:45 2016 -0400
+++ b/PCbuild/get_externals.bat	Wed Jun 15 17:16:16 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.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 -r b3f97ed4a904 -r 3d726dbfca31 PCbuild/python.props
--- a/PCbuild/python.props	Wed Jun 15 18:09:45 2016 -0400
+++ b/PCbuild/python.props	Wed Jun 15 17:16:16 2016 -0500
@@ -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 -r b3f97ed4a904 -r 3d726dbfca31 PCbuild/readme.txt
--- a/PCbuild/readme.txt	Wed Jun 15 18:09:45 2016 -0400
+++ b/PCbuild/readme.txt	Wed Jun 15 17:16:16 2016 -0500
@@ -169,7 +169,7 @@
     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/