changeset:   100451:60430bdcb426
parent:      100448:8fecf6e17616
parent:      100450:0628189fe42b
user:        Ned Deily <nad@python.org>
date:        Tue Mar 08 01:11:14 2016 -0500
files:       Misc/NEWS
description:
Issue #26465: merge from 3.5


diff -r 8fecf6e17616 -r 60430bdcb426 Mac/BuildScript/build-installer.py
--- a/Mac/BuildScript/build-installer.py	Tue Mar 08 00:40:12 2016 -0500
+++ b/Mac/BuildScript/build-installer.py	Tue Mar 08 01:11:14 2016 -0500
@@ -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 -r 8fecf6e17616 -r 60430bdcb426 Misc/NEWS
--- a/Misc/NEWS	Tue Mar 08 00:40:12 2016 -0500
+++ b/Misc/NEWS	Tue Mar 08 01:11:14 2016 -0500
@@ -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.