[Python-checkins] cpython (merge 3.5 -> default): Issue #26465: merge from 3.5

[ned.deily]

https://hg.python.org/cpython/rev/60430bdcb426
changeset:   100451:60430bdcb426
parent:      100448:8fecf6e17616
parent:      100450:0628189fe42b
user:        Ned Deily <nad at python.org>
date:        Tue Mar 08 01:11:14 2016 -0500
summary:
  Issue #26465: merge from 3.5

files:
  Mac/BuildScript/build-installer.py |  6 +++---
  Misc/NEWS                          |  6 ++++--
  2 files changed, 7 insertions(+), 5 deletions(-)


diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -242,9 +242,9 @@
 
         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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -806,8 +806,10 @@
   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.
 

-- 
Repository URL: https://hg.python.org/cpython