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

ned.deily python-checkins at python.org
Sat Jul 4 08:47:43 CEST 2015


https://hg.python.org/cpython/rev/fbb9ac8aebfd
changeset:   96795:fbb9ac8aebfd
parent:      96791:6c58b5b82505
parent:      96794:bbf4e35ed69e
user:        Ned Deily <nad at acm.org>
date:        Fri Jul 03 23:47:02 2015 -0700
summary:
  Issue #24432: merge from 3.5

files:
  Mac/BuildScript/build-installer.py           |  6 +++---
  Mac/BuildScript/openssl_sdk_makedepend.patch |  2 +-
  Misc/NEWS                                    |  3 ++-
  3 files changed, 6 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
@@ -237,9 +237,9 @@
 
         result.extend([
           dict(
-              name="OpenSSL 1.0.2a",
-              url="https://www.openssl.org/source/openssl-1.0.2a.tar.gz",
-              checksum='a06c547dac9044161a477211049f60ef',
+              name="OpenSSL 1.0.2c",
+              url="https://www.openssl.org/source/openssl-1.0.2c.tar.gz",
+              checksum='8c8d81a9ae7005276e486702edbcd4b6',
               patches=[
                   "openssl_sdk_makedepend.patch",
                    ],
diff --git a/Mac/BuildScript/openssl_sdk_makedepend.patch b/Mac/BuildScript/openssl_sdk_makedepend.patch
--- 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.2a
+# 	using openssl 1.0.2c
 #
 # - 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -119,7 +119,8 @@
 Build
 -----
 
-- Issue #24432: Update Windows builds to use OpenSSL 1.0.2c.
+- Issue #24432: Update Windows builds and OS X 10.5 installer to use OpenSSL
+  1.0.2c.
 
 
 What's New in Python 3.5.0 beta 2?

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


More information about the Python-checkins mailing list