changeset:   93112:927cca0b9337
branch:      2.7
parent:      93106:430aaeaa8087
user:        Zachary Ware <zachary.ware@gmail.com>
date:        Fri Oct 17 16:20:15 2014 -0500
files:       Misc/NEWS PCbuild/pyproject.vsprops Tools/buildbot/external-common.bat
description:
Issue #22644: Update the Windows build to OpenSSL 1.0.1j


diff -r 430aaeaa8087 -r 927cca0b9337 Misc/NEWS
--- a/Misc/NEWS	Thu Feb 20 15:36:34 2014 -0600
+++ b/Misc/NEWS	Fri Oct 17 16:20:15 2014 -0500
@@ -1,4 +1,4 @@
-+++++++++++
++++++++++++
 Python News
 +++++++++++
 
@@ -288,7 +288,7 @@
 Windows
 -------
 
-- Issue #22160: The bundled version of OpenSSL has been updated to 1.0.1i.
+- Issue #22644: The bundled version of OpenSSL has been updated to 1.0.1j.
 
 
 
diff -r 430aaeaa8087 -r 927cca0b9337 PCbuild/pyproject.vsprops
--- a/PCbuild/pyproject.vsprops	Thu Feb 20 15:36:34 2014 -0600
+++ b/PCbuild/pyproject.vsprops	Fri Oct 17 16:20:15 2014 -0500
@@ -82,7 +82,7 @@
 	/>
 	<UserMacro
 		Name="opensslDir"
-		Value="$(externalsDir)\openssl-1.0.1i"
+		Value="$(externalsDir)\openssl-1.0.1j"
 	/>
 	<UserMacro
 		Name="tcltkDir"
diff -r 430aaeaa8087 -r 927cca0b9337 Tools/buildbot/external-common.bat
--- a/Tools/buildbot/external-common.bat	Thu Feb 20 15:36:34 2014 -0600
+++ b/Tools/buildbot/external-common.bat	Fri Oct 17 16:20:15 2014 -0500
@@ -24,6 +24,7 @@
 @rem if exist openssl-1.0.1g rd /s/q openssl-1.0.1g
 @rem if exist openssl-1.0.1h rd /s/q openssl-1.0.1h
 @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 sqlite-3.6.21 rd /s/q sqlite-3.6.21
 
 @rem bzip
@@ -37,8 +38,8 @@
 if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4.7.25.0
 
 @rem OpenSSL
-if exist openssl-1.0.1h rd /s/q openssl-1.0.1h
-if not exist openssl-1.0.1i svn export http://svn.python.org/projects/external/openssl-1.0.1i
+if exist openssl-1.0.1i rd /s/q openssl-1.0.1i
+if not exist openssl-1.0.1j svn export http://svn.python.org/projects/external/openssl-1.0.1j
 
 @rem tcl/tk
 if not exist tcl-8.5.15.0 (