[Python-checkins] cpython (2.7): Issue #23686: Update Windows build to use OpenSSL 1.0.2a

[zach.ware]

https://hg.python.org/cpython/rev/05a502da108f
changeset:   95496:05a502da108f
branch:      2.7
parent:      95491:c2f6b3677630
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Tue Apr 07 20:33:54 2015 -0500
summary:
  Issue #23686: Update Windows build to use OpenSSL 1.0.2a

files:
  Misc/NEWS                          |  3 ++-
  PCbuild/pyproject.vsprops          |  2 +-
  PCbuild/readme.txt                 |  2 +-
  Tools/buildbot/external-common.bat |  5 +++--
  4 files changed, 7 insertions(+), 5 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -248,7 +248,8 @@
 - 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
--- 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
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -132,7 +132,7 @@
 
     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
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -29,6 +29,7 @@
 @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
+ at 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 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 (

-- 
Repository URL: https://hg.python.org/cpython