Issue #24603: merge from 3.4

ned-deily · ned-deily · commit 71f70b8f1a87 · 2015-07-24T16:24:47.000-07:00
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
@@ -237,9 +237,9 @@ def library_recipes():
 
         result.extend([
           dict(
-              name="OpenSSL 1.0.2c",
-              url="https://www.openssl.org/source/openssl-1.0.2c.tar.gz",
-              checksum='8c8d81a9ae7005276e486702edbcd4b6',
+              name="OpenSSL 1.0.2d",
+              url="https://www.openssl.org/source/openssl-1.0.2d.tar.gz",
+              checksum='38dd619b2e77cbac69b99f52a053d25a',
               patches=[
                   "openssl_sdk_makedepend.patch",
                    ],
diff --git a/Mac/BuildScript/openssl_sdk_makedepend.patch b/Mac/BuildScript/openssl_sdk_makedepend.patch
@@ -2,7 +2,7 @@
 # Parent  25a9af415e8c3faf591c360d5f0e361d049b2b43
 # openssl_sdk_makedepend.patch
 #
-# 	using openssl 1.0.2c
+# 	using openssl 1.0.2d
 #
 # - support building with an OS X SDK
 # - allow "make depend" to use compilers with names other than "gcc"
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -70,7 +70,8 @@ Library
 Build
 -----
 
-- Issue #24603: Update the Windows build to use OpenSSL 1.0.2d.
+- Issue #24603: Update Windows builds and OS X 10.5 installer to use OpenSSL
+  1.0.2d.
 
 
 What's New in Python 3.5.0 beta 3?

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Parent 25a9af415e8c3faf591c360d5f0e361d049b2b43`
`3`	`3`	`# openssl_sdk_makedepend.patch`
`4`	`4`	`#`
`5`		`-# using openssl 1.0.2c`
	`5`	`+# using openssl 1.0.2d`
`6`	`6`	`#`
`7`	`7`	`# - support building with an OS X SDK`
`8`	`8`	`# - allow "make depend" to use compilers with names other than "gcc"`