[Python-checkins] cpython (2.7): Issue #22160: Update OpenSSL to 1.0.1i for the Windows build.

[zach.ware]

http://hg.python.org/cpython/rev/cbcb10123451
changeset:   92032:cbcb10123451
branch:      2.7
parent:      92030:6e5a2ac30c7e
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Wed Aug 06 23:17:20 2014 -0500
summary:
  Issue #22160: Update OpenSSL to 1.0.1i for the Windows build.

files:
  Misc/NEWS                          |  5 +++++
  PCbuild/pyproject.vsprops          |  2 +-
  Tools/buildbot/external-common.bat |  5 +++--
  3 files changed, 9 insertions(+), 3 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -89,6 +89,11 @@
 - Issue #15759: "make suspicious", "make linkcheck" and "make doctest" in Doc/
   now display special message when and only when there are failures.
 
+Windows
+-------
+
+- Issue #22160: The bundled version of OpenSSL has been updated to 1.0.1i.
+
 
 What's New in Python 2.7.8?
 ===========================
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -82,7 +82,7 @@
 	/>
 	<UserMacro
 		Name="opensslDir"
-		Value="$(externalsDir)\openssl-1.0.1h"
+		Value="$(externalsDir)\openssl-1.0.1i"
 	/>
 	<UserMacro
 		Name="tcltkDir"
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -23,6 +23,7 @@
 @rem if exist openssl-0.9.8y rd /s/q openssl-0.9.8y
 @rem if exist openssl-1.0.1g rd /s/q openssl-1.0.1g
 @rem if exist openssl-1.0.1h rd /s/q openssl-1.0.1h
+ at rem if exist openssl-1.0.1i rd /s/q openssl-1.0.1i
 @rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21
 
 @rem bzip
@@ -36,8 +37,8 @@
 if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4.7.25.0
 
 @rem OpenSSL
-if exist openssl-1.0.1g rd /s/q openssl-1.0.1g
-if not exist openssl-1.0.1h svn export http://svn.python.org/projects/external/openssl-1.0.1h
+if exist openssl-1.0.1h rd /s/q openssl-1.0.1h
+if not exist openssl-1.0.1i svn export http://svn.python.org/projects/external/openssl-1.0.1i
 
 @rem tcl/tk
 if not exist tcl-8.5.15.0 (

-- 
Repository URL: http://hg.python.org/cpython