diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2009-12-21 19:41:15 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2009-12-21 19:41:15 (GMT) |
| commit | 331411d37d2208e12b9dbc78d5fe85621ae6adb2 (patch) | |
| tree | 1205a36bf49707669d557abd1a621e90fd2d786a | |
| parent | b4c5f360bf2150478af121caf042ba7c49709896 (diff) | |
| download | cpython-331411d37d2208e12b9dbc78d5fe85621ae6adb2.zip cpython-331411d37d2208e12b9dbc78d5fe85621ae6adb2.tar.gz cpython-331411d37d2208e12b9dbc78d5fe85621ae6adb2.tar.bz2 | |
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.
........
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | PCbuild/pyproject.vsprops | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 | ||||
| -rw-r--r-- | Tools/buildbot/external-common.bat | 4 |
4 files changed, 6 insertions, 4 deletions
@@ -114,6 +114,8 @@ Library 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 fb313d2..0f3568a 100644 --- a/PCbuild/pyproject.vsprops +++ b/PCbuild/pyproject.vsprops @@ -82,7 +82,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 b16daf1..44b7b8f 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-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 f252cc5..839a4cd 100644 --- a/Tools/buildbot/external-common.bat +++ b/Tools/buildbot/external-common.bat @@ -15,7 +15,7 @@ cd .. @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 db-4.7.25.0 rd /s/q db-4.7.25.0
-@rem if exist openssl-0.9.8g rd /s/q openssl-0.9.8g
+@rem if exist openssl-0.9.8l rd /s/q openssl-0.9.8l
@rem if exist sqlite-3.5.9 rd /s/q sqlite-3.5.9
@rem bzip
@@ -29,7 +29,7 @@ if exist db-4.4.20 rd /s/q db-4.4.20 if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4.7.25.0
@rem OpenSSL
-if not exist openssl-0.9.8g svn export http://svn.python.org/projects/external/openssl-0.9.8g
+if not exist openssl-0.9.8l svn export http://svn.python.org/projects/external/openssl-0.9.8l
@rem tcl/tk
if not exist tcl-8.5.2.1 (
|