Issue #26465: merge from 3.5

ned-deily · ned-deily · commit 3a5e1afb922f · 2016-03-08T01:11:14.000-05:00
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
@@ -242,9 +242,9 @@ def library_recipes():
 
         result.extend([
           dict(
-              name="OpenSSL 1.0.2f",
-              url="https://www.openssl.org/source/openssl-1.0.2f.tar.gz",
-              checksum='b3bf73f507172be9292ea2a8c28b659d',
+              name="OpenSSL 1.0.2g",
+              url="https://www.openssl.org/source/openssl-1.0.2g.tar.gz",
+              checksum='f3c710c045cdee5fd114feb69feba7aa',
               patches=[
                   "openssl_sdk_makedepend.patch",
                    ],
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -806,8 +806,10 @@ Build
   Previously it could fail to compile properly if the math and cmath builds
   were concurrent.
 
-- Issue #26268: Update OS X 10.5 installer and Windows builds to use
-  OpenSSL 1.0.2f.
+- Issue #26465: Update OS X 10.5+ 32-bit-only installer to build
+  and link with OpenSSL 1.0.2g.
+
+- Issue #26268: Update Windows builds to use OpenSSL 1.0.2f.
 
 - Issue #25136: Support Apple Xcode 7's new textual SDK stub libraries.
 
