changeset:   96992:310613b993d4
parent:      96988:fc899dbe9da6
parent:      96991:2930e23d729f
user:        Zachary Ware <zachary.ware@gmail.com>
date:        Tue Jul 21 23:28:28 2015 -0500
files:       Misc/NEWS
description:
Issue #24603: Merge with 3.5


diff -r fc899dbe9da6 -r 310613b993d4 Misc/NEWS
--- a/Misc/NEWS	Tue Jul 21 22:50:54 2015 -0500
+++ b/Misc/NEWS	Tue Jul 21 23:28:28 2015 -0500
@@ -67,6 +67,11 @@
 - Issue #24669: Fix inspect.getsource() for 'async def' functions.
   Patch by Kai Groner.
 
+Build
+-----
+
+- Issue #24603: Update the Windows build to use OpenSSL 1.0.2d.
+
 What's New in Python 3.5.0 beta 3?
 ==================================
 
diff -r fc899dbe9da6 -r 310613b993d4 PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat	Tue Jul 21 22:50:54 2015 -0500
+++ b/PCbuild/get_externals.bat	Tue Jul 21 23:28:28 2015 -0500
@@ -54,7 +54,7 @@
 for %%e in (
             bzip2-1.0.6
             nasm-2.11.06
-            openssl-1.0.2c
+            openssl-1.0.2d
             tcl-core-8.6.4.1
             tk-8.6.4.1
             tix-8.4.3.4
diff -r fc899dbe9da6 -r 310613b993d4 PCbuild/python.props
--- a/PCbuild/python.props	Tue Jul 21 22:50:54 2015 -0500
+++ b/PCbuild/python.props	Tue Jul 21 23:28:28 2015 -0500
@@ -34,7 +34,7 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.8.3.1\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir>
-    <opensslDir>$(ExternalsDir)openssl-1.0.2c\</opensslDir>
+    <opensslDir>$(ExternalsDir)openssl-1.0.2d\</opensslDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
     
     <!-- Suffix for all binaries when building for debug -->
diff -r fc899dbe9da6 -r 310613b993d4 PCbuild/readme.txt
--- a/PCbuild/readme.txt	Tue Jul 21 22:50:54 2015 -0500
+++ b/PCbuild/readme.txt	Tue Jul 21 23:28:28 2015 -0500
@@ -197,7 +197,7 @@
     Homepage:
         http://tukaani.org/xz/
 _ssl
-    Python wrapper for version 1.0.2c of the OpenSSL secure sockets
+    Python wrapper for version 1.0.2d of the OpenSSL secure sockets
     library, which is built by ssl.vcxproj
     Homepage:
         http://www.openssl.org/