Merged revisions 77003 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77003 | martin.v.loewis | 2009-12-22 09:57:39 +0100 (Di, 22 Dez 2009) | 13 lines

  Merged revisions 76990-76991 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76990 | martin.v.loewis | 2009-12-21 20:27:15 +0100 (Mo, 21 Dez 2009) | 1 line

    Switch to OpenSSL 0.9.8l.
  ........
    r76991 | martin.v.loewis | 2009-12-21 20:29:59 +0100 (Mo, 21 Dez 2009) | 1 line

    Add NEWS for OpenSSL changes.
  ........
................

diff --git a/Misc/NEWS b/Misc/NEWS
index ea0e2426c21d731c9ef9f8c358293c78a6f7accd..78dd84b2268d1fe4821716cfb7df69c24ed93a92 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -267,6 +267,8 @@ Tests
 Build
 -----
 
+- Switch to OpenSSL 0.9.8l on Windows.
+
 - Issue #6603: Change READ_TIMESTAMP macro in ceval.c so that it
   compiles correctly under gcc on x86-64.  This fixes a reported
   problem with the --with-tsc build on x86-64.

diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index 59163e623670cceff8aff86d624ddbf852580d63..4760500357f659d80fe1c2e26f85f33e6a1cbdff 100644 (file)
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -58,7 +58,7 @@
        />
        <UserMacro
                Name="opensslDir"
-               Value="$(externalsDir)\openssl-0.9.8g"
+               Value="$(externalsDir)\openssl-0.9.8l"
        />
        <UserMacro
                Name="tcltkDir"

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 918a1d3832c454913f86973dce8038731311a2b5..c923091c7e11568c82b1395357476a4e71e20543 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -139,7 +139,7 @@ _ssl
 
     Get the source code through
 
-    svn export http://svn.python.org/projects/external/openssl-0.9.8g
+    svn export http://svn.python.org/projects/external/openssl-0.9.8l
 
     ** 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 edcc82d74d2663621b9d07119dd2536600ef9889..aba7fa9e6ad553e053b8cebea89599ab1b1824c0 100644 (file)
--- 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\r
 @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1\r
 @rem if exist db-4.4.20 rd /s/q db-4.4.20\r
-@rem if exist openssl-0.9.8g rd /s/q openssl-0.9.8g\r
+@rem if exist openssl-0.9.8l rd /s/q openssl-0.9.8l\r
 @rem if exist sqlite-3.5.9 rd /s/q sqlite-3.5.9    \r
 \r
 @rem bzip\r
@@ -27,7 +27,7 @@ if not exist bzip2-1.0.5 (
 if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20-vs9 db-4.4.20\r
 \r
 @rem OpenSSL\r
-if not exist openssl-0.9.8g svn export http://svn.python.org/projects/external/openssl-0.9.8g\r
+if not exist openssl-0.9.8l svn export http://svn.python.org/projects/external/openssl-0.9.8l\r
 \r
 @rem tcl/tk\r
 if not exist tcl-8.5.2.1 (\r