diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2009-12-22 10:48:47 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2009-12-22 10:48:47 (GMT) |
| commit | 5330aa5b26214c45ed894c7ab6872c004b6e1e43 (patch) | |
| tree | bf098aa35dbf07039d8af698d0936b012f768811 | |
| parent | b7e82bb7dd493a9de0931c7bbaeffb4237cf0700 (diff) | |
| download | cpython-5330aa5b26214c45ed894c7ab6872c004b6e1e43.zip cpython-5330aa5b26214c45ed894c7ab6872c004b6e1e43.tar.gz cpython-5330aa5b26214c45ed894c7ab6872c004b6e1e43.tar.bz2 | |
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.
........
................
| -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
@@ -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 59163e6..4760500 100644 --- 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 918a1d3..c923091 100644 --- 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 edcc82d..aba7fa9 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-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
@@ -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
@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 (
|