[Python-checkins] cpython (2.7): Issue #21671, CVE-2014-0224: Update the Windows build to openssl-1.0.1h
zach.ware
python-checkins at python.org
Fri Jun 6 08:28:03 CEST 2014
http://hg.python.org/cpython/rev/3dfdcc97250f
changeset: 91048:3dfdcc97250f
branch: 2.7
user: Zachary Ware <zachary.ware at gmail.com>
date: Fri Jun 06 01:13:37 2014 -0500
summary:
Issue #21671, CVE-2014-0224: Update the Windows build to openssl-1.0.1h
files:
Misc/NEWS | 6 ++++++
PCbuild/pyproject.vsprops | 2 +-
PCbuild/readme.txt | 2 +-
Tools/buildbot/external-common.bat | 5 +++--
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -73,6 +73,12 @@
- Issue #20635: Added tests for Tk geometry managers.
+Windows
+-------
+
+- Issue #21671, CVE-2014-0224: The bundled version of OpenSSL has been
+ updated to 1.0.1h.
+
What's New in Python 2.7.7
==========================
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.1g"
+ Value="$(externalsDir)\openssl-1.0.1h"
/>
<UserMacro
Name="tcltkDir"
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -132,7 +132,7 @@
Get the source code through
- svn export http://svn.python.org/projects/external/openssl-0.9.8y
+ svn export http://svn.python.org/projects/external/openssl-1.0.1h
** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
obtaining external sources then you don't need to manually get the source
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
@@ -21,6 +21,7 @@
@rem if exist db-4.7.25.0 rd /s/q db-4.7.25.0
@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
+ at rem if exist openssl-1.0.1h rd /s/q openssl-1.0.1h
@rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21
@rem bzip
@@ -34,8 +35,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-0.9.8y rd /s/q openssl-0.9.8y
-if not exist openssl-1.0.1g svn export http://svn.python.org/projects/external/openssl-1.0.1g
+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
@rem tcl/tk
if not exist tcl-8.5.15.0 (
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list