changeset:   100460:195ce1f4f54b
branch:      2.7
user:        Steve Dower <steve.dower@microsoft.com>
date:        Tue Mar 08 10:26:39 2016 -0800
files:       Misc/NEWS PCbuild/get_externals.bat PCbuild/python.props PCbuild/readme.txt
description:
Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.


diff -r 5fbd16326353 -r 195ce1f4f54b Misc/NEWS
--- a/Misc/NEWS	Tue Mar 08 18:35:45 2016 +0200
+++ b/Misc/NEWS	Tue Mar 08 10:26:39 2016 -0800
@@ -163,6 +163,8 @@
 Build
 -----
 
+- Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
+
 - Issue #24421: Compile Modules/_math.c once, before building extensions.
   Previously it could fail to compile properly if the math and cmath builds
   were concurrent.
diff -r 5fbd16326353 -r 195ce1f4f54b PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat	Tue Mar 08 18:35:45 2016 +0200
+++ b/PCbuild/get_externals.bat	Tue Mar 08 10:26:39 2016 -0800
@@ -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.2f
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2g
 set libraries=%libraries%                                    sqlite-3.6.21
 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 5fbd16326353 -r 195ce1f4f54b PCbuild/python.props
--- a/PCbuild/python.props	Tue Mar 08 18:35:45 2016 +0200
+++ b/PCbuild/python.props	Tue Mar 08 10:26:39 2016 -0800
@@ -35,7 +35,7 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.6.21\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir>
-    <opensslDir>$(ExternalsDir)openssl-1.0.2f\</opensslDir>
+    <opensslDir>$(ExternalsDir)openssl-1.0.2g\</opensslDir>
     <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
     <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
diff -r 5fbd16326353 -r 195ce1f4f54b PCbuild/readme.txt
--- a/PCbuild/readme.txt	Tue Mar 08 18:35:45 2016 +0200
+++ b/PCbuild/readme.txt	Tue Mar 08 10:26:39 2016 -0800
@@ -183,7 +183,7 @@
     Homepage:
         http://www.bzip.org/
 _ssl
-    Python wrapper for version 1.0.2f of the OpenSSL secure sockets
+    Python wrapper for version 1.0.2g of the OpenSSL secure sockets
     library, which is built by ssl.vcxproj
     Homepage:
         http://www.openssl.org/