[Python-checkins] cpython (2.7): Issue #22644: Update the Windows build to OpenSSL 1.0.1j

[zach.ware]

https://hg.python.org/cpython/rev/927cca0b9337
changeset: 93112:927cca0b9337
branch: 2.7
parent: 93106:430aaeaa8087
user: Zachary Ware <zachary.ware at gmail.com>
date: Fri Oct 17 16:20:15 2014 -0500
summary:
Issue #22644: Update the Windows build to OpenSSL 1.0.1j

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


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1,4 +1,4 @@
-+++++++++++
+?+++++++++++
Python News
+++++++++++

@@ -288,7 +288,7 @@
Windows
-------

-- Issue #22160: The bundled version of OpenSSL has been updated to 1.0.1i.
+- Issue #22644: The bundled version of OpenSSL has been updated to 1.0.1j.



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.1i"
+ Value="$(externalsDir)\openssl-1.0.1j"
/>
<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
@@ -24,6 +24,7 @@
@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
@rem if exist openssl-1.0.1i rd /s/q openssl-1.0.1i
+ at rem if exist openssl-1.0.1j rd /s/q openssl-1.0.1j
@rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21

@rem bzip
@@ -37,8 +38,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.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
+if exist openssl-1.0.1i rd /s/q openssl-1.0.1i
+if not exist openssl-1.0.1j svn export http://svn.python.org/projects/external/openssl-1.0.1j

@rem tcl/tk
if not exist tcl-8.5.15.0 (