[Python-checkins] cpython (2.7): Issue #17425: Build against openssl 0.9.8y on Windows.

Fri Mar 22 22:02:11 CET 2013

http://hg.python.org/cpython/rev/3d76dbbbb0cc
changeset: 82888:3d76dbbbb0cc
branch: 2.7
parent: 82881:8ae1c28445f8
user: Martin v. Loewis <martin at v.loewis.de>
date: Fri Mar 22 22:01:56 2013 +0100
summary:
 Issue #17425: Build against openssl 0.9.8y on Windows.
files:
 Misc/NEWS | 2 ++
 PC/VS8.0/pyproject.vsprops | 2 +-
 PCbuild/pyproject.vsprops | 2 +-
 PCbuild/readme.txt | 2 +-
 Tools/buildbot/external-common.bat | 4 ++--
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -908,6 +908,8 @@
 Build
 -----
 
+- Issue #17425: Build against openssl 0.9.8y on Windows.
+
 - Issue #16004: Add `make touch`.
 
 - Issue #5033: Fix building of the sqlite3 extension module when the
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
@@ -82,7 +82,7 @@
 	/>
 	<UserMacro
 		Name="opensslDir"
-		Value="$(externalsDir)\openssl-0.9.8x"
+		Value="$(externalsDir)\openssl-0.9.8y"
 	/>
 	<UserMacro
 		Name="tcltkDir"
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -82,7 +82,7 @@
 	/>
 	<UserMacro
 		Name="opensslDir"
-		Value="$(externalsDir)\openssl-0.9.8x"
+		Value="$(externalsDir)\openssl-0.9.8y"
 	/>
 	<UserMacro
 		Name="tcltkDir"
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -142,7 +142,7 @@
 
 Get the source code through
 
- svn export http://svn.python.org/projects/external/openssl-0.9.8x
+ svn export http://svn.python.org/projects/external/openssl-0.9.8y
 
 ** 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
@@ -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.8x rd /s/q openssl-0.9.8x
+ at rem if exist openssl-0.9.8y rd /s/q openssl-0.9.8y
 @rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21 
 
 @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.8x svn export http://svn.python.org/projects/external/openssl-0.9.8x
+if not exist openssl-0.9.8y svn export http://svn.python.org/projects/external/openssl-0.9.8y
 
 @rem tcl/tk
 if not exist tcl-8.5.2.1 (
-- 
Repository URL: http://hg.python.org/cpython
