[Python-checkins] cpython (3.2): Upgrade OpenSSL to 1.0.0j

Fri May 18 15:34:36 CEST 2012

http://hg.python.org/cpython/rev/d86e5daab9ce
changeset: 77029:d86e5daab9ce
branch: 3.2
parent: 77027:43f0c3c9187d
user: Martin v. Löwis <martin at v.loewis.de>
date: Fri May 18 15:28:01 2012 +0200
summary:
 Upgrade OpenSSL to 1.0.0j
files:
 Misc/NEWS | 2 ++
 PC/VC6/readme.txt | 5 ++---
 PC/VS8.0/pyproject.vsprops | 2 +-
 PCbuild/pyproject.vsprops | 2 +-
 PCbuild/readme.txt | 2 +-
 Tools/buildbot/external-common.bat | 4 ++--
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -235,6 +235,8 @@
 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
--- a/PC/VC6/readme.txt
+++ b/PC/VC6/readme.txt
@@ -153,10 +153,9 @@
 
 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
--- 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
--- 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
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -139,7 +139,7 @@
 
 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
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -14,7 +14,7 @@
 @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
- at rem if exist openssl-1.0.0a rd /s/q openssl-1.0.0a
+ at 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 @@
 )
 
 @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 (
-- 
Repository URL: http://hg.python.org/cpython
