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.
........
This commit is contained in:
Martin v. Löwis 2009-12-21 19:41:15 +00:00
parent b4c5f360bf
commit 331411d37d
4 changed files with 6 additions and 4 deletions

View File

@ -114,6 +114,8 @@ Library
Build Build
----- -----
- Switch to OpenSSL 0.9.8l on Windows.
- Issue #6603: Change READ_TIMESTAMP macro in ceval.c so that it - Issue #6603: Change READ_TIMESTAMP macro in ceval.c so that it
compiles correctly under gcc on x86-64. This fixes a reported compiles correctly under gcc on x86-64. This fixes a reported
problem with the --with-tsc build on x86-64. problem with the --with-tsc build on x86-64.

View File

@ -82,7 +82,7 @@
/> />
<UserMacro <UserMacro
Name="opensslDir" Name="opensslDir"
Value="$(externalsDir)\openssl-0.9.8g" Value="$(externalsDir)\openssl-0.9.8l"
/> />
<UserMacro <UserMacro
Name="tcltkDir" Name="tcltkDir"

View File

@ -142,7 +142,7 @@ _ssl
Get the source code through 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 ** 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 obtaining external sources then you don't need to manually get the source

View File

@ -15,7 +15,7 @@ cd ..
@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1 @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.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 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 if exist sqlite-3.5.9 rd /s/q sqlite-3.5.9
@rem bzip @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 if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4.7.25.0
@rem OpenSSL @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 @rem tcl/tk
if not exist tcl-8.5.2.1 ( if not exist tcl-8.5.2.1 (