Skip to content

[Security][3.4] bpo-29572: Update macOS installer build to OpenSSL 1.0.2k #3447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vstinner wants to merge 5 commits into from
Closed

[Security][3.4] bpo-29572: Update macOS installer build to OpenSSL 1.0.2k #3447

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b89053a
Issue #26268: Update OS X 10.5+ installer build to use OpenSSL 1.0.2f.
ned-deily Feb 15, 2016
21dfaf0
Issue #26465: Update OS X installer build to use OpenSSL 1.0.2g.
ned-deily Mar 8, 2016
8a303b5
Issue #26930: Update OS X 32-bit-only installer builds to use OpenSSL…
ned-deily Jun 5, 2016
a2786df
Issue #28248: Update macOS installer build to use OpenSSL 1.0.2j.
ned-deily Oct 31, 2016
70116be
bpo-29572: Update macOS installer build to OpenSSL 1.0.2k (#457) (#2835)
ned-deily Jul 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Issue #28248: Update macOS installer build to use OpenSSL 1.0.2j. 
Original patch by Mariatta Wijaya.

(cherry picked from commit 38adbfa)
  • Loading branch information
@ned-deily @vstinner
ned-deily authored and vstinner committed Sep 8, 2017
commit a2786df194a4bf50057562f033a4e98b9ff264c9
6 changes: 3 additions & 3 deletions Mac/BuildScript/build-installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,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",
],
Expand Down
12 changes: 5 additions & 7 deletions Mac/BuildScript/openssl_sdk_makedepend.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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}::",
Expand All @@ -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/;
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Build/2017-09-07-19-32-39.bpo-28248.KY_-en.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update Windows build and OS X installers to use OpenSSL 1.0.2j.