Issue #28248: Update macOS installer build to use OpenSSL 1.0.2j.

Original patch by Mariatta Wijaya.

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index d09da2f2f335c43801d26793bd92a4a4890d7a7b..c76c4f1a269708ae19cb498f5818bafef50c9900 100755 (executable)
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -242,9 +242,9 @@ def library_recipes():
 
         result.extend([
           dict(
-              name="OpenSSL 1.0.2h",
-              url="https://www.openssl.org/source/openssl-1.0.2h.tar.gz",
-              checksum='9392e65072ce4b614c1392eefc1f23d0',
+              name="OpenSSL 1.0.2j",
+              url="https://www.openssl.org/source/openssl-1.0.2j.tar.gz",
+              checksum='96322138f0b69e61b7212bc53d5e912b',
               patches=[
                   "openssl_sdk_makedepend.patch",
                    ],

diff --git a/Mac/BuildScript/openssl_sdk_makedepend.patch b/Mac/BuildScript/openssl_sdk_makedepend.patch
index 96a88413c8c9878478a6c728178bec7f127aefde..e22d67e4e45143bf82e52baec7b9f1b260b266f3 100644 (file)
--- a/Mac/BuildScript/openssl_sdk_makedepend.patch
+++ b/Mac/BuildScript/openssl_sdk_makedepend.patch
@@ -1,8 +1,6 @@
 # HG changeset patch
-# Parent  d377390f787c0739a3e89f669def72d7167e5108
-# openssl_sdk_makedepend.patch
 #
-#      using openssl 1.0.2f
+#      using openssl 1.0.2j
 #
 # - support building with an OS X SDK
 
@@ -11,7 +9,7 @@ diff Configure
 diff --git a/Configure b/Configure
 --- a/Configure
 +++ b/Configure
-@@ -638,12 +638,12 @@
+@@ -642,12 +642,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}::",
@@ -30,13 +28,13 @@ 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",
-@@ -1717,8 +1717,7 @@
-               s/^CC=.*$/CC= $cc/;
+@@ -1728,8 +1728,7 @@
                s/^AR=\s*ar/AR= $ar/;
                s/^RANLIB=.*/RANLIB= $ranlib/;
+               s/^RC=.*/RC= $windres/;
 -              s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
 -              s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $ecc eq "gcc" || $ecc eq "clang";
-+              s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/
++              s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/;
                }
        s/^CFLAG=.*$/CFLAG= $cflags/;
        s/^DEPFLAG=.*$/DEPFLAG=$depflags/;

diff --git a/Misc/NEWS b/Misc/NEWS
index 808501b3fccbc96ad08e77552ffcd6b67b979313..76ac3a69b5a0fc55a4e1967f9fbffbe83413313b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -382,8 +382,6 @@ Library
   locale encoding, and fix get_begidx() and get_endidx() to return code point
   indexes.
 
-- Issue #26930: Update Windows builds to use OpenSSL 1.0.2h.
-
 - Issue #27392: Add loop.connect_accepted_socket().
   Patch by Jim Fulton.
 
@@ -517,7 +515,7 @@ Build
 
 - Issue #28444: Fix missing extensions modules when cross compiling.
 
-- Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
+- Issue #28248: Update Windows build and OS X installers to use OpenSSL 1.0.2j.
 
 - Issue #28258: Fixed build with Estonian locale (python-config and distclean
   targets in Makefile).  Patch by Arfrever Frehtes Taifersar Arahesis.