summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-05-12 17:50:34 (GMT)
committerGeorg Brandl <georg@python.org>2013-05-12 17:50:34 (GMT)
commit84fc4ba67eedd249ae7643930eacd0058303b95c (patch)
tree3504c3a2f01ada1d9fb11c03eed14be871b47d0e
parent997d05d89ff918745ca1240f59c2081776857282 (diff)
downloadcpython-84fc4ba67eedd249ae7643930eacd0058303b95c.zip
cpython-84fc4ba67eedd249ae7643930eacd0058303b95c.tar.gz
cpython-84fc4ba67eedd249ae7643930eacd0058303b95c.tar.bz2
Closes #17962: Build with OpenSSL 1.0.1e on Windows.v3.3.2
-rw-r--r--Misc/NEWS2
-rw-r--r--PC/VC6/readme.txt4
-rw-r--r--PC/VS8.0/pyproject.vsprops2
-rw-r--r--PC/VS9.0/pyproject.vsprops2
-rw-r--r--PCbuild/pyproject.props2
-rw-r--r--PCbuild/readme.txt2
-rw-r--r--Tools/buildbot/external-common.bat8
7 files changed, 12 insertions, 10 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index c266b1e..c81aeb4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -250,6 +250,8 @@ Build
- Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
4.8.
+- Issue #17962: Build with OpenSSL 1.0.1e on Windows.
+
What's New in Python 3.3.1?
===========================
diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
index e204d2f..f978f85 100644
--- a/PC/VC6/readme.txt
+++ b/PC/VC6/readme.txt
@@ -153,9 +153,9 @@ _ssl
Unpack into the "dist" directory, retaining the folder name from
the archive - for example, the latest stable OpenSSL will install as
- dist/openssl-1.0.1d
+ dist/openssl-1.0.1e
- You need to use version 1.0.1d of OpenSSL.
+ You need to use version 1.0.1e of OpenSSL.
You can install the NASM assembler from
http://www.nasm.us/
diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
index 43555a6..131bd3f 100644
--- a/PC/VS8.0/pyproject.vsprops
+++ b/PC/VS8.0/pyproject.vsprops
@@ -58,7 +58,7 @@
/>
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.1d"
+ Value="$(externalsDir)\openssl-1.0.1e"
/>
<UserMacro
Name="tcltkDir"
diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
index 18581ba..ff3759e 100644
--- a/PC/VS9.0/pyproject.vsprops
+++ b/PC/VS9.0/pyproject.vsprops
@@ -62,7 +62,7 @@
/>
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.1d"
+ Value="$(externalsDir)\openssl-1.0.1e"
/>
<UserMacro
Name="tcltkDir"
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 2333512..8155231 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -20,7 +20,7 @@
<sqlite3Dir>$(externalsDir)\sqlite-3.7.12</sqlite3Dir>
<bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
<lzmaDir>$(externalsDir)\xz-5.0.3</lzmaDir>
- <opensslDir>$(externalsDir)\openssl-1.0.1d</opensslDir>
+ <opensslDir>$(externalsDir)\openssl-1.0.1e</opensslDir>
<tcltkDir>$(externalsDir)\tcltk</tcltkDir>
<tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
<tcltkLib>$(tcltkDir)\lib\tcl85.lib;$(tcltkDir)\lib\tk85.lib</tcltkLib>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 08aa0f7..2efe249 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -142,7 +142,7 @@ _ssl
Get the source code through
- svn export http://svn.python.org/projects/external/openssl-1.0.1d
+ svn export http://svn.python.org/projects/external/openssl-1.0.1e
** 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
index ef61157..c6278b2 100644
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -14,7 +14,7 @@ cd ..
@rem if exist tk8.4.16 rd /s/q tk8.4.16
@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
@rem if exist db-4.4.20 rd /s/q db-4.4.20
-@rem if exist openssl-1.0.1d rd /s/q openssl-1.0.1d
+@rem if exist openssl-1.0.1e rd /s/q openssl-1.0.1e
@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12
@rem bzip
@@ -24,9 +24,9 @@ if not exist bzip2-1.0.6 (
)
@rem OpenSSL
-if not exist openssl-1.0.1d (
- rd /s/q openssl-1.0.1c
- svn export http://svn.python.org/projects/external/openssl-1.0.1d
+if not exist openssl-1.0.1e (
+ rd /s/q openssl-1.0.1d
+ svn export http://svn.python.org/projects/external/openssl-1.0.1e
)
@rem tcl/tk