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

[zach.ware]

https://hg.python.org/cpython/rev/bcd7fe682095
changeset:   93114:bcd7fe682095
parent:      93111:51618c0482b2
parent:      93113:6ad0299fa279
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Fri Oct 17 16:31:57 2014 -0500
summary:
  Issue #22644: Update the Windows build to OpenSSL 1.0.1j

files:
  Misc/NEWS                 |  3 +--
  PCbuild/get_externals.bat |  2 +-
  PCbuild/pyproject.props   |  2 +-
  Tools/buildbot/build.bat  |  2 +-
  4 files changed, 4 insertions(+), 5 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1325,8 +1325,7 @@
 
 - Issue #21907: Improved the batch scripts provided for building Python.
 
-- Issue #21671, #22160, CVE-2014-0224: 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.
 
 - Issue #10747: Use versioned labels in the Windows start menu.
   Patch by Olive Kilburn.
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -51,7 +51,7 @@
 
 for %%e in (
             bzip2-1.0.6
-            openssl-1.0.1i
+            openssl-1.0.1j
             tcl-8.6.1.0
             tk-8.6.1.0
             tix-8.4.3.4
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -20,7 +20,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.1i</opensslDir>
+    <opensslDir>$(externalsDir)\openssl-1.0.1j</opensslDir>
     <tclDir>$(externalsDir)\tcl-8.6.1.0</tclDir>
     <tkDir>$(externalsDir)\tk-8.6.1.0</tkDir>
     <tixDir>$(externalsDir)\tix-8.4.3.4</tixDir>
diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat
--- a/Tools/buildbot/build.bat
+++ b/Tools/buildbot/build.bat
@@ -7,7 +7,7 @@
 @rem a new version of an external library, especially Tcl/Tk):
 @rem 1) uncomment the following line:
 
- at rem    call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only
+call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only
 
 @rem 2) commit and push
 @rem 3) wait for all Windows bots to start a build with that changeset

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