Build _ssl.pyd with OpenSSL 0.9.7l

diff --git a/Misc/NEWS b/Misc/NEWS
index 096030a63a9fb6da984b3355b6f47dcca85c8214..7b7ce1c482aac1315dd64e2e1b195ab7968cb1aa 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -219,6 +219,9 @@ Tools/Demos
 Build
 -----
 
+- The Windows binaries for the _ssl module are now linked with
+  OpenSSL 0.9.7l.
+
 - Bug #1568842: Fix test for uintptr_t.
 
 - Bug #1439538: Drop usage of test -e in configure as it is not portable.

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 5f7beda5ec77a4cdb596cf8e5479fc0a01e3d5a1..4d7cd3e03fdfa6eb1bd69126857b8cf9fdc46e5f 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -250,17 +250,8 @@ __bsddb - 0 error(s), 5 warning(s)
 _ssl
     Python wrapper for the secure sockets library.
 
-    Get the latest source code for OpenSSL from
-        http://www.openssl.org
-
-    You (probably) don't want the "engine" code.  For example, get
-        openssl-0.9.7d.tar.gz
-    not
-        openssl-engine-0.9.7d.tar.gz
-
-    Unpack into the "dist" directory, retaining the folder name from
-    the archive - for example, the latest stable OpenSSL will install as
-        dist/openssl-0.9.7d
+    Download the source from the python.org copy:
+    svn export http://svn.python.org/projects/external/openssl-0.9.7l
 
     You can (theoretically) use any version of OpenSSL you like - the
     build process will automatically select the latest version.

diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
index fff0af23a5e8792a58b7621ea43c3edad4772450..776335a2ca3739d66a8b0485a9f5d49dedd81c5e 100644 (file)
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -4,4 +4,9 @@
 cd ..\r
 \r
 @rem bzip\r
-if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3
\ No newline at end of file
+if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3\r
+\r
+@rem OpenSSL\r
+if exist openssl-0.9.7d rd /s/q openssl-0.9.7d\r
+if not exist openssl-0.9.7l svn export http://svn.python.org/projects/external/openssl-0.9.7l\r
+\r