Skip to content

Commit 203ce92

Browse files
committed
Issue #26268: Update OS X 10.5+ installer build to use OpenSSL 1.0.2f.
1 parent 4177e7c commit 203ce92

File tree

3 files changed

+8
-22
lines changed

3 files changed

+8
-22
lines changed

Mac/BuildScript/build-installer.py

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

238238
result.extend([
239239
dict(
240-
name="OpenSSL 1.0.2e",
241-
url="https://www.openssl.org/source/openssl-1.0.2e.tar.gz",
242-
checksum='5262bfa25b60ed9de9f28d5d52d77fc5',
240+
name="OpenSSL 1.0.2f",
241+
url="https://www.openssl.org/source/openssl-1.0.2f.tar.gz",
242+
checksum='b3bf73f507172be9292ea2a8c28b659d',
243243
patches=[
244244
"openssl_sdk_makedepend.patch",
245245
],
Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
# HG changeset patch
2-
# Parent ff8a7557607cffd626997e57ed31c1012a3018aa
2+
# Parent d377390f787c0739a3e89f669def72d7167e5108
33
# openssl_sdk_makedepend.patch
44
#
5-
# using openssl 1.0.2e
5+
# using openssl 1.0.2f
66
#
77
# - support building with an OS X SDK
8-
# - allow "make depend" to use compilers with names other than "gcc"
98

109
diff Configure
1110

1211
diff --git a/Configure b/Configure
1312
--- a/Configure
1413
+++ b/Configure
15-
@@ -635,12 +635,12 @@
14+
@@ -638,12 +638,12 @@
1615

1716
##### MacOS X (a.k.a. Rhapsody or Darwin) setup
1817
"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
@@ -31,7 +30,7 @@ diff --git a/Configure b/Configure
3130
"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",
3231
# iPhoneOS/iOS
3332
"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",
34-
@@ -1714,8 +1714,7 @@
33+
@@ -1717,8 +1717,7 @@
3534
s/^CC=.*$/CC= $cc/;
3635
s/^AR=\s*ar/AR= $ar/;
3736
s/^RANLIB=.*/RANLIB= $ranlib/;
@@ -41,16 +40,3 @@ diff --git a/Configure b/Configure
4140
}
4241
s/^CFLAG=.*$/CFLAG= $cflags/;
4342
s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
44-
diff --git a/util/domd b/util/domd
45-
--- a/util/domd
46-
+++ b/util/domd
47-
@@ -14,8 +14,7 @@
48-
cp Makefile Makefile.save
49-
# fake the presence of Kerberos
50-
touch $TOP/krb5.h
51-
-if ${MAKEDEPEND} --version 2>&1 | grep -q "clang" ||
52-
- echo $MAKEDEPEND | grep -q "gcc"; then
53-
+if true ; then
54-
args=""
55-
while [ $# -gt 0 ]; do
56-
if [ "$1" != "--" ]; then args="$args $1"; fi

Misc/NEWS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ Build
243243

244244
- Issue #25696: Fix installation of Python on UNIX with make -j9.
245245

246-
- Issue #25798: Update OS X 10.5 installer to use OpenSSL 1.0.2e.
246+
- Issue #26268: Update OS X 10.5 installer to use OpenSSL 1.0.2f.
247247

248248
Windows
249249
-------

0 commit comments

Comments
 (0)