From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 22 Jul 2015 04:16:51 +0000 (-0500)
Subject: Issue #24603: Update Windows build to use OpenSSL 1.0.2d
X-Git-Tag: v2.7.11rc1~235
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68773f3100a6fb2472526db61afeb60d9f7d81b1;p=thirdparty%2FPython%2Fcpython.git

Issue #24603: Update Windows build to use OpenSSL 1.0.2d
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 29312ab039d4..8c15bed27d8a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -107,8 +107,8 @@ Build
   backported files replace the old project files in PCbuild; the old files moved
   to PC/VS9.0 and remain supported.
 
-- Issue #24432: Update Windows builds and OS X 10.5 installer to use OpenSSL
-  1.0.2c.
+- Issue #24603: Update Windows builds and OS X 10.5 installer to use OpenSSL
+  1.0.2d.
 
 IDLE
 ----
diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
index a52e06319e73..5625f9d028fb 100644
--- a/PC/VS9.0/pyproject.vsprops
+++ b/PC/VS9.0/pyproject.vsprops
@@ -82,7 +82,7 @@
 	/>
 	<UserMacro
 		Name="opensslDir"
-		Value="$(externalsDir)\openssl-1.0.2c"
+		Value="$(externalsDir)\openssl-1.0.2d"
 	/>
 	<UserMacro
 		Name="tcltkDir"
diff --git a/PC/VS9.0/readme.txt b/PC/VS9.0/readme.txt
index 74820fb6052e..8f543a5da1cf 100644
--- a/PC/VS9.0/readme.txt
+++ b/PC/VS9.0/readme.txt
@@ -132,7 +132,7 @@ _ssl
 
     Get the source code through
 
-    svn export http://svn.python.org/projects/external/openssl-1.0.2c
+    svn export http://svn.python.org/projects/external/openssl-1.0.2d
 
     ** NOTE: if you use the PCbuild\get_externals.bat approach for
     obtaining external sources then you don't need to manually get the source
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 59403eff7c43..a2aea9d0dfed 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -58,7 +58,7 @@ for %%e in (
             bzip2-1.0.6
             db-4.7.25.0
             nasm-2.11.06
-            openssl-1.0.2c
+            openssl-1.0.2d
             tcl-8.5.15.0
             tk-8.5.15.0
             tix-8.4.3.5
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 5727c595a9cb..f7965c33571e 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -30,7 +30,7 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.6.21\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir>
-    <opensslDir>$(ExternalsDir)openssl-1.0.2c\</opensslDir>
+    <opensslDir>$(ExternalsDir)openssl-1.0.2d\</opensslDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
 
     <!-- Suffix for all binaries when building for debug -->
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index e5bf746042c0..a2f08c94674a 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -146,7 +146,7 @@ _ssl
 
     Get the source code through
 
-    svn export http://svn.python.org/projects/external/openssl-1.0.2c
+    svn export http://svn.python.org/projects/external/openssl-1.0.2d
 
     ** NOTE: if you use the PCbuild\get_externals.bat approach for
     obtaining external sources then you don't need to manually get the source