changeset:   102121:ad037bba60bb
branch:      2.7
parent:      101899:5811fcfe1043
user:        Zachary Ware <zachary.ware@gmail.com>
date:        Wed Jun 15 17:12:38 2016 -0500
files:       Misc/NEWS PC/VS9.0/pyproject.vsprops PC/VS9.0/readme.txt PCbuild/get_externals.bat PCbuild/python.props PCbuild/readme.txt
description:
Issue #26930: Update Windows build to OpenSSL 1.0.2h


diff -r 5811fcfe1043 -r ad037bba60bb Misc/NEWS
--- a/Misc/NEWS	Sat Jun 11 14:46:35 2016 -0700
+++ b/Misc/NEWS	Wed Jun 15 17:12:38 2016 -0500
@@ -2,6 +2,15 @@
 Python News
 +++++++++++
 
+What's New in Python 2.7.12?
+============================
+
+Build
+-----
+
+- Issue #26930: Update Windows builds to use OpenSSL 1.0.2h.
+
+
 What's New in Python 2.7.12 release candidate 1?
 ================================================
 
diff -r 5811fcfe1043 -r ad037bba60bb PC/VS9.0/pyproject.vsprops
--- a/PC/VS9.0/pyproject.vsprops	Sat Jun 11 14:46:35 2016 -0700
+++ b/PC/VS9.0/pyproject.vsprops	Wed Jun 15 17:12:38 2016 -0500
@@ -82,7 +82,7 @@
 	/>
 	<UserMacro
 		Name="opensslDir"
-		Value="$(externalsDir)\openssl-1.0.2g"
+		Value="$(externalsDir)\openssl-1.0.2h"
 	/>
 	<UserMacro
 		Name="tcltkDir"
diff -r 5811fcfe1043 -r ad037bba60bb PC/VS9.0/readme.txt
--- a/PC/VS9.0/readme.txt	Sat Jun 11 14:46:35 2016 -0700
+++ b/PC/VS9.0/readme.txt	Wed Jun 15 17:12:38 2016 -0500
@@ -132,7 +132,7 @@
 
     Get the source code through
 
-    svn export http://svn.python.org/projects/external/openssl-1.0.2g
+    svn export http://svn.python.org/projects/external/openssl-1.0.2h
 
     ** NOTE: if you use the PCbuild\get_externals.bat approach for
     obtaining external sources then you don't need to manually get the source
diff -r 5811fcfe1043 -r ad037bba60bb PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat	Sat Jun 11 14:46:35 2016 -0700
+++ b/PCbuild/get_externals.bat	Wed Jun 15 17:12:38 2016 -0500
@@ -58,7 +58,7 @@
 set libraries=%libraries%                                    bzip2-1.0.6
 if NOT "%IncludeBsddb%"=="false" set libraries=%libraries%   db-4.7.25.0
 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-8.5.15.0
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0
diff -r 5811fcfe1043 -r ad037bba60bb PCbuild/python.props
--- a/PCbuild/python.props	Sat Jun 11 14:46:35 2016 -0700
+++ b/PCbuild/python.props	Wed Jun 15 17:12:38 2016 -0500
@@ -35,7 +35,7 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir>
-    <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 5811fcfe1043 -r ad037bba60bb PCbuild/readme.txt
--- a/PCbuild/readme.txt	Sat Jun 11 14:46:35 2016 -0700
+++ b/PCbuild/readme.txt	Wed Jun 15 17:12:38 2016 -0500
@@ -183,7 +183,7 @@
     Homepage:
         http://www.bzip.org/
 _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/