From: Steve Dower <steve.dower@microsoft.com>
Date: Fri, 30 May 2014 18:01:15 +0000 (-0700)
Subject: Issue #21462 PEP 466: upgrade OpenSSL in the Python 2.7 Windows builds
X-Git-Tag: v2.7.8~37^2~65^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee310bc2b731e0eabdfac327f353d0cc511b2b25;p=thirdparty%2FPython%2Fcpython.git

Issue #21462 PEP 466: upgrade OpenSSL in the Python 2.7 Windows builds
---

diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index 024bfa82b2d6..dfdc556f5351 100644
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -82,7 +82,7 @@
 	/>
 	<UserMacro
 		Name="opensslDir"
-		Value="$(externalsDir)\openssl-0.9.8y"
+		Value="$(externalsDir)\openssl-1.0.1g"
 	/>
 	<UserMacro
 		Name="tcltkDir"
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index 2b4ba42bf347..7e4419964b56 100644
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -20,6 +20,7 @@ cd ..
 @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.8y rd /s/q openssl-0.9.8y
+@rem if exist openssl-1.0.1g rd /s/q openssl-1.0.1g
 @rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21
 
 @rem bzip
@@ -33,7 +34,8 @@ 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.8y svn export http://svn.python.org/projects/external/openssl-0.9.8y
+if exist openssl-0.9.8y rd /s/q openssl-0.9.8y
+if not exist openssl-1.0.1g svn export http://svn.python.org/projects/external/openssl-1.0.1g
 
 @rem tcl/tk
 if not exist tcl-8.5.15.0 (