diff -r 6f4627a65c0a Misc/ACKS
--- a/Misc/ACKS Sun May 05 08:14:53 2013 +0200
+++ b/Misc/ACKS Sun May 12 10:42:09 2013 -0400
@@ -208,6 +208,7 @@
Brad Chapman
Greg Chapman
Mitch Chapman
+Yogesh Chaudhari
David Chaum
Nicolas Chauvat
Jerry Chen
diff -r 6f4627a65c0a Misc/NEWS
--- a/Misc/NEWS Sun May 05 08:14:53 2013 +0200
+++ b/Misc/NEWS Sun May 12 10:42:09 2013 -0400
@@ -238,6 +238,11 @@
- Issue #6696: add documentation for the Profile objects, and improve
profile/cProfile docs. Patch by Tom Pinckney.
+Build
+-----
+
+- Issue #17962: Broken OpenSSL version in Windows builds modified to 1.0.1e
+
C-API
-----
diff -r 6f4627a65c0a PC/VS9.0/pyproject.vsprops
--- a/PC/VS9.0/pyproject.vsprops Sun May 05 08:14:53 2013 +0200
+++ b/PC/VS9.0/pyproject.vsprops Sun May 12 10:42:09 2013 -0400
@@ -62,7 +62,7 @@
/>
$(externalsDir)\sqlite-3.7.12
$(externalsDir)\bzip2-1.0.6
$(externalsDir)\xz-5.0.3
- $(externalsDir)\openssl-1.0.1d
+ $(externalsDir)\openssl-1.0.1e
$(externalsDir)\tcltk
$(externalsDir)\tcltk64
$(tcltkDir)\lib\tcl85.lib;$(tcltkDir)\lib\tk85.lib
diff -r 6f4627a65c0a PCbuild/readme.txt
--- a/PCbuild/readme.txt Sun May 05 08:14:53 2013 +0200
+++ b/PCbuild/readme.txt Sun May 12 10:42:09 2013 -0400
@@ -142,7 +142,7 @@
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 -r 6f4627a65c0a Tools/buildbot/external-common.bat
--- a/Tools/buildbot/external-common.bat Sun May 05 08:14:53 2013 +0200
+++ b/Tools/buildbot/external-common.bat Sun May 12 10:42:09 2013 -0400
@@ -14,7 +14,7 @@
@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 @@
)
@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