[Python-checkins] r76992 - in python/branches/release26-maint: Misc/NEWS PCbuild/pyproject.vsprops PCbuild/readme.txt Tools/buildbot/external-common.bat
martin.v.loewis
python-checkins at python.org
Mon Dec 21 20:41:16 CET 2009
Author: martin.v.loewis
Date: Mon Dec 21 20:41:15 2009
New Revision: 76992
Log:
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.
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Misc/NEWS
python/branches/release26-maint/PCbuild/pyproject.vsprops
python/branches/release26-maint/PCbuild/readme.txt
python/branches/release26-maint/Tools/buildbot/external-common.bat
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS (original)
+++ python/branches/release26-maint/Misc/NEWS Mon Dec 21 20:41:15 2009
@@ -114,6 +114,8 @@
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.
Modified: python/branches/release26-maint/PCbuild/pyproject.vsprops
==============================================================================
--- python/branches/release26-maint/PCbuild/pyproject.vsprops (original)
+++ python/branches/release26-maint/PCbuild/pyproject.vsprops Mon Dec 21 20:41:15 2009
@@ -82,7 +82,7 @@
/>
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-0.9.8g"
+ Value="$(externalsDir)\openssl-0.9.8l"
/>
<UserMacro
Name="tcltkDir"
Modified: python/branches/release26-maint/PCbuild/readme.txt
==============================================================================
--- python/branches/release26-maint/PCbuild/readme.txt (original)
+++ python/branches/release26-maint/PCbuild/readme.txt Mon Dec 21 20:41:15 2009
@@ -142,7 +142,7 @@
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
Modified: python/branches/release26-maint/Tools/buildbot/external-common.bat
==============================================================================
--- python/branches/release26-maint/Tools/buildbot/external-common.bat (original)
+++ python/branches/release26-maint/Tools/buildbot/external-common.bat Mon Dec 21 20:41:15 2009
@@ -15,7 +15,7 @@
@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
- at rem if exist openssl-0.9.8g rd /s/q openssl-0.9.8g
+ at 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 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 (
More information about the Python-checkins
mailing list