[Python-checkins] cpython (merge 3.4 -> default): Issue #23686: Update OS X 10.5 installer build to use OpenSSL 1.0.2a.

Fri Mar 20 00:22:46 CET 2015

https://hg.python.org/cpython/rev/e43e5cc887fe
changeset: 95079:e43e5cc887fe
parent: 95076:c59e2539ab19
parent: 95078:59b8a83ea50b
user: Ned Deily <nad at acm.org>
date: Thu Mar 19 16:22:14 2015 -0700
summary:
 Issue #23686: Update OS X 10.5 installer build to use OpenSSL 1.0.2a.
files:
 Mac/BuildScript/build-installer.py | 6 +-
 Mac/BuildScript/openssl_sdk_makedepend.patch | 16 +++++-----
 Misc/NEWS | 2 +-
 3 files changed, 12 insertions(+), 12 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.2",
- url="https://www.openssl.org/source/openssl-1.0.2.tar.gz",
- checksum='38373013fc85c790aabf8837969c5eba',
+ name="OpenSSL 1.0.2a",
+ url="https://www.openssl.org/source/openssl-1.0.2a.tar.gz",
+ checksum='a06c547dac9044161a477211049f60ef',
 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
@@ -1,17 +1,17 @@
 # HG changeset patch
-# Parent 973741cf5a045b2ba895094d98b2c3649dc00b61
+# Parent 25a9af415e8c3faf591c360d5f0e361d049b2b43
 # openssl_sdk_makedepend.patch
 #
-# 	using openssl 1.0.2
+# 	using openssl 1.0.2a
 #
 # - support building with an OS X SDK
 # - allow "make depend" to use compilers with names other than "gcc"
 
 diff Configure
 
-diff -r 973741cf5a04 Configure
---- a/Configure	Thu Mar 05 13:45:59 2015 -0800
-+++ b/Configure	Thu Mar 05 14:00:20 2015 -0800
+diff --git a/Configure b/Configure
+--- a/Configure
++++ b/Configure
 @@ -617,12 +617,12 @@
 
 ##### MacOS X (a.k.a. Rhapsody or Darwin) setup
@@ -40,9 +40,9 @@
 		}
 	s/^CFLAG=.*$/CFLAG= $cflags/;
 	s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
-diff -r 973741cf5a04 util/domd
---- a/util/domd	Thu Mar 05 13:45:59 2015 -0800
-+++ b/util/domd	Thu Mar 05 14:00:20 2015 -0800
+diff --git a/util/domd b/util/domd
+--- a/util/domd
++++ b/util/domd
 @@ -14,7 +14,7 @@
 cp Makefile Makefile.save
 # fake the presence of Kerberos
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -208,7 +208,7 @@
 - Issue #23445: pydebug builds now use "gcc -Og" where possible, to make
 the resulting executable faster.
 
-- Issue #23593: Update OS X 10.5 installer build to use OpenSSL 1.0.2.
+- Issue #23686: Update OS X 10.5 installer build to use OpenSSL 1.0.2a.
 
 C API
 -----
-- 
Repository URL: https://hg.python.org/cpython
