From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 8 Apr 2015 01:33:54 +0000 (-0500)
Subject: Issue #23686: Update Windows build to use OpenSSL 1.0.2a
X-Git-Tag: v2.7.10rc1~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=563e7c6cd58247d2ab4bbd516f5190358b3e5619;p=thirdparty%2FPython%2Fcpython.git

Issue #23686: Update Windows build to use OpenSSL 1.0.2a
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 3f24df1bea76..5aca0a8cb686 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -248,7 +248,8 @@ Build
 - Issue #23032: Fix installer build failures on OS X 10.4 Tiger
   by disabling assembly code in the OpenSSL build.
 
-- Issue #23686: Update OS X 10.5 installer build to use OpenSSL 1.0.2a.
+- Issue #23686: Update OS X 10.5 installer and Windows builds to use
+  OpenSSL 1.0.2a.
 
 C API
 -----
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index 7d8a65883cfc..0af1df7df79e 100644
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -82,7 +82,7 @@
 	/>
 	<UserMacro
 		Name="opensslDir"
-		Value="$(externalsDir)\openssl-1.0.1l"
+		Value="$(externalsDir)\openssl-1.0.2a"
 	/>
 	<UserMacro
 		Name="tcltkDir"
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index cf6ab7f00c2e..50bcbc2ab9f5 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -132,7 +132,7 @@ _ssl
 
     Get the source code through
 
-    svn export http://svn.python.org/projects/external/openssl-1.0.1j
+    svn export http://svn.python.org/projects/external/openssl-1.0.2a
 
     ** 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 227a4e91e9af..aecdbc8f3201 100644
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -29,6 +29,7 @@ cd externals
 @rem if exist openssl-1.0.1i rd /s/q openssl-1.0.1i
 @rem if exist openssl-1.0.1j rd /s/q openssl-1.0.1j
 @rem if exist openssl-1.0.1l rd /s/q openssl-1.0.1l
+@rem if exist openssl-1.0.2a rd /s/q openssl-1.0.2a
 @rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21
 
 @rem bzip
@@ -46,8 +47,8 @@ if not exist db-4.7.25.0 svn export %SVNROOT%db-4.7.25.0
 if not exist nasm-2.11.06 svn export %SVNROOT%nasm-2.11.06
 
 @rem OpenSSL
-if exist openssl-1.0.1j rd /s/q openssl-1.0.1j
-if not exist openssl-1.0.1l svn export %SVNROOT%openssl-1.0.1l
+if exist openssl-1.0.1l rd /s/q openssl-1.0.1l
+if not exist openssl-1.0.2a svn export %SVNROOT%openssl-1.0.2a
 
 @rem tcl/tk
 if not exist tcl-8.5.15.0 (