Issue #23686: Update OS X 10.5 installer build to use OpenSSL 1.0.2a.

ned-deily · ned-deily · commit b3aa2e7ba355 · 2015-03-19T16:22:14.000-07:00
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
@@ -237,9 +237,9 @@ def library_recipes():
 
         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
@@ -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 @@ diff -r 973741cf5a04 Configure
  		}
  	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
@@ -208,7 +208,7 @@ Build
 - 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
 -----
