Skip to content

Commit 38adbfa

Browse files
committed
Issue #28248: Update macOS installer build to use OpenSSL 1.0.2j.
Original patch by Mariatta Wijaya.
1 parent 3e3e9f3 commit 38adbfa

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

Mac/BuildScript/build-installer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,9 @@ def library_recipes():
242242

243243
result.extend([
244244
dict(
245-
name="OpenSSL 1.0.2h",
246-
url="https://www.openssl.org/source/openssl-1.0.2h.tar.gz",
247-
checksum='9392e65072ce4b614c1392eefc1f23d0',
245+
name="OpenSSL 1.0.2j",
246+
url="https://www.openssl.org/source/openssl-1.0.2j.tar.gz",
247+
checksum='96322138f0b69e61b7212bc53d5e912b',
248248
patches=[
249249
"openssl_sdk_makedepend.patch",
250250
],

Mac/BuildScript/openssl_sdk_makedepend.patch

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# HG changeset patch
2-
# Parent d377390f787c0739a3e89f669def72d7167e5108
3-
# openssl_sdk_makedepend.patch
42
#
5-
# using openssl 1.0.2f
3+
# using openssl 1.0.2j
64
#
75
# - support building with an OS X SDK
86

@@ -11,7 +9,7 @@ diff Configure
119
diff --git a/Configure b/Configure
1210
--- a/Configure
1311
+++ b/Configure
14-
@@ -638,12 +638,12 @@
12+
@@ -642,12 +642,12 @@
1513

1614
##### MacOS X (a.k.a. Rhapsody or Darwin) setup
1715
"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
3028
"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",
3129
# iPhoneOS/iOS
3230
"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",
33-
@@ -1717,8 +1717,7 @@
34-
s/^CC=.*$/CC= $cc/;
31+
@@ -1728,8 +1728,7 @@
3532
s/^AR=\s*ar/AR= $ar/;
3633
s/^RANLIB=.*/RANLIB= $ranlib/;
34+
s/^RC=.*/RC= $windres/;
3735
- s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
3836
- s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $ecc eq "gcc" || $ecc eq "clang";
39-
+ s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/
37+
+ s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/;
4038
}
4139
s/^CFLAG=.*$/CFLAG= $cflags/;
4240
s/^DEPFLAG=.*$/DEPFLAG=$depflags/;

Misc/NEWS

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,6 @@ Library
382382
locale encoding, and fix get_begidx() and get_endidx() to return code point
383383
indexes.
384384

385-
- Issue #26930: Update Windows builds to use OpenSSL 1.0.2h.
386-
387385
- Issue #27392: Add loop.connect_accepted_socket().
388386
Patch by Jim Fulton.
389387

@@ -517,7 +515,7 @@ Build
517515

518516
- Issue #28444: Fix missing extensions modules when cross compiling.
519517

520-
- Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
518+
- Issue #28248: Update Windows build and OS X installers to use OpenSSL 1.0.2j.
521519

522520
- Issue #28258: Fixed build with Estonian locale (python-config and distclean
523521
targets in Makefile). Patch by Arfrever Frehtes Taifersar Arahesis.

0 commit comments

Comments
 (0)