From: Martin v. Loewis <martin@v.loewis.de>
Date: Fri, 22 Mar 2013 21:01:56 +0000 (+0100)
Subject: Issue #17425: Build against openssl 0.9.8y on Windows.
X-Git-Tag: v2.7.4rc1~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18613e6e7bda3c6e0c3c23b4ca8f481f8d2e9975;p=thirdparty%2FPython%2Fcpython.git

Issue #17425: Build against openssl 0.9.8y on Windows.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 1f3601cd1fc7..4138632e4523 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -908,6 +908,8 @@ Tests
 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
index 0516d1266b42..5a5fff666c42 100644
--- 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
index 0b7fa0faeadb..024bfa82b2d6 100644
--- 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
index d3c229dc7bd1..3395aac1bbd2 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -142,7 +142,7 @@ _ssl
 
     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
index 1bd6b0833d80..9668e2c1d3d4 100644
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -15,7 +15,7 @@ cd ..
 @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
-@rem if exist openssl-0.9.8x rd /s/q openssl-0.9.8x
+@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 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
 
 @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 (