diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2012-05-18 13:28:01 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2012-05-18 13:28:01 (GMT) |
| commit | 3407dfbaf90d1445af66266663fe0615ab0d6003 (patch) | |
| tree | 7e7e27e1c4b50b236e6a7ebacb46b9d0154034d1 | |
| parent | 0d635aef92758ae7502a5dccf449b8597ce36ba6 (diff) | |
| download | cpython-3407dfbaf90d1445af66266663fe0615ab0d6003.zip cpython-3407dfbaf90d1445af66266663fe0615ab0d6003.tar.gz cpython-3407dfbaf90d1445af66266663fe0615ab0d6003.tar.bz2 | |
Upgrade OpenSSL to 1.0.0j
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | PC/VC6/readme.txt | 5 | ||||
| -rw-r--r-- | PC/VS8.0/pyproject.vsprops | 2 | ||||
| -rw-r--r-- | PCbuild/pyproject.vsprops | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 | ||||
| -rw-r--r-- | Tools/buildbot/external-common.bat | 4 |
6 files changed, 9 insertions, 8 deletions
@@ -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. diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt index 7e85c96..fa1ae7d 100644 --- a/PC/VC6/readme.txt +++ b/PC/VC6/readme.txt @@ -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/ diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops index 763f687..2a82e49 100644 --- a/PC/VS8.0/pyproject.vsprops +++ b/PC/VS8.0/pyproject.vsprops @@ -58,7 +58,7 @@ />
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.0a"
+ Value="$(externalsDir)\openssl-1.0.0j"
/>
<UserMacro
Name="tcltkDir"
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops index 881befd..6a94a68 100644 --- a/PCbuild/pyproject.vsprops +++ b/PCbuild/pyproject.vsprops @@ -58,7 +58,7 @@ />
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.0a"
+ Value="$(externalsDir)\openssl-1.0.0j"
/>
<UserMacro
Name="tcltkDir"
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 3bb6492..c7e3c72 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-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 diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat index 5c250f0..2165b8a 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-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 ( |