Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Upgrade OpenSSL to 1.0.0j

This commit is contained in:
Martin v. Löwis 2012-05-18 15:28:01 +02:00
parent 0d635aef92
commit 3407dfbaf9
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -235,6 +235,8 @@ Tests
Build
-----
- The Windows build now uses OpenSSL 1.0.0j and bzip2 1.0.6.
- Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban.
- Issue #14437: Fix building the _io module under Cygwin.

5
PC/VC6/readme.txt
View File

@ -153,10 +153,9 @@ _ssl
Unpack into the "dist" directory, retaining the folder name from
the archive - for example, the latest stable OpenSSL will install as
dist/openssl-1.0.0a
dist/openssl-1.0.0j
You can (theoretically) use any version of OpenSSL you like - the
build process will automatically select the latest version.
You need to use version 1.0.0j of OpenSSL.
You can install the NASM assembler from
http://www.nasm.us/

2
PC/VS8.0/pyproject.vsprops
View File

@ -58,7 +58,7 @@
/>
<UserMacro
Name="opensslDir"
Value="$(externalsDir)\openssl-1.0.0a"
Value="$(externalsDir)\openssl-1.0.0j"
/>
<UserMacro
Name="tcltkDir"

2
PCbuild/pyproject.vsprops
View File

@ -58,7 +58,7 @@
/>
<UserMacro
Name="opensslDir"
Value="$(externalsDir)\openssl-1.0.0a"
Value="$(externalsDir)\openssl-1.0.0j"
/>
<UserMacro
Name="tcltkDir"

2
PCbuild/readme.txt
View File

@ -139,7 +139,7 @@ _ssl
Get the source code through
svn export http://svn.python.org/projects/external/openssl-1.0.0a
svn export http://svn.python.org/projects/external/openssl-1.0.0j
** 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

4
Tools/buildbot/external-common.bat
View File

@ -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-1.0.0a rd /s/q openssl-1.0.0a
@rem if exist openssl-1.0.0j rd /s/q openssl-1.0.0j
@rem if exist sqlite-3.7.4 rd /s/q sqlite-3.7.4
@rem bzip
@ -24,7 +24,7 @@ if not exist bzip2-1.0.6 (
)
@rem OpenSSL
if not exist openssl-1.0.0a svn export http://svn.python.org/projects/external/openssl-1.0.0a
if not exist openssl-1.0.0j svn export http://svn.python.org/projects/external/openssl-1.0.0j
@rem tcl/tk
if not exist tcl-8.5.9.0 (