Issue #25798: merge from 3.4

Mac/BuildScript/build-installer.py

@@ -237,9 +237,9 @@ def library_recipes():
 
         result.extend([
           dict(
-              name="OpenSSL 1.0.2d",
-              url="https://www.openssl.org/source/openssl-1.0.2d.tar.gz",
-              checksum='38dd619b2e77cbac69b99f52a053d25a',
+              name="OpenSSL 1.0.2e",
+              url="https://www.openssl.org/source/openssl-1.0.2e.tar.gz",
+              checksum='5262bfa25b60ed9de9f28d5d52d77fc5',
               patches=[
                   "openssl_sdk_makedepend.patch",
                    ],

Mac/BuildScript/openssl_sdk_makedepend.patch

 # HG changeset patch
-# Parent  25a9af415e8c3faf591c360d5f0e361d049b2b43
+# Parent  ff8a7557607cffd626997e57ed31c1012a3018aa
 # openssl_sdk_makedepend.patch
 #
-# 	using openssl 1.0.2d
+# 	using openssl 1.0.2e
 #
 # - support building with an OS X SDK
 # - allow "make depend" to use compilers with names other than "gcc"
@@ -12,7 +12,7 @@ diff Configure
 diff --git a/Configure b/Configure
 --- a/Configure
 +++ b/Configure
-@@ -617,12 +617,12 @@
+@@ -635,12 +635,12 @@
  
  ##### MacOS X (a.k.a. Rhapsody or Darwin) setup
  "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
@@ -31,24 +31,26 @@ diff --git a/Configure b/Configure
  "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
  # iPhoneOS/iOS
  "iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-@@ -1685,7 +1685,7 @@
+@@ -1714,8 +1714,7 @@
  		s/^CC=.*$/CC= $cc/;
  		s/^AR=\s*ar/AR= $ar/;
  		s/^RANLIB=.*/RANLIB= $ranlib/;
 -		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
-+		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/;
+-		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $ecc eq "gcc" || $ecc eq "clang";
++		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/
  		}
  	s/^CFLAG=.*$/CFLAG= $cflags/;
  	s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
 diff --git a/util/domd b/util/domd
 --- a/util/domd
 +++ b/util/domd
-@@ -14,7 +14,7 @@
+@@ -14,8 +14,7 @@
  cp Makefile Makefile.save
  # fake the presence of Kerberos
  touch $TOP/krb5.h
--if expr "$MAKEDEPEND" : '.*gcc$' > /dev/null; then
-+if true ; then  # was: if expr "$MAKEDEPEND" : '.*gcc$' > /dev/null; then
+-if ${MAKEDEPEND} --version 2>&1 | grep -q "clang" ||
+-   echo $MAKEDEPEND | grep -q "gcc"; then
++if true ; then
      args=""
      while [ $# -gt 0 ]; do
  	if [ "$1" != "--" ]; then args="$args $1"; fi

Misc/NEWS

@@ -77,6 +77,11 @@ Tests
 - Issue #25616: Tests for OrderedDict are extracted from test_collections
   into separate file test_ordered_dict.
 
+Build
+-----
+
+- Issue #25798: Update OS X 10.5 installer to use OpenSSL 1.0.2e.
+
 
 What's New in Python 3.5.1 final?
 =================================