diff options
| author | Ned Deily <nad@python.org> | 2016-02-15 05:44:38 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@python.org> | 2016-02-15 05:44:38 (GMT) |
| commit | 203ce927f529a2f72e7c4cca574abd8ef1605b52 (patch) | |
| tree | 38469bb11e03afcf296921a8afe7e9471aacd663 /Mac | |
| parent | 4177e7c38e06fb9feec76d1cdc7db4899eb20615 (diff) | |
| download | cpython-203ce927f529a2f72e7c4cca574abd8ef1605b52.zip cpython-203ce927f529a2f72e7c4cca574abd8ef1605b52.tar.gz cpython-203ce927f529a2f72e7c4cca574abd8ef1605b52.tar.bz2 | |
Issue #26268: Update OS X 10.5+ installer build to use OpenSSL 1.0.2f.
Diffstat (limited to 'Mac')
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 6 | ||||
| -rw-r--r-- | Mac/BuildScript/openssl_sdk_makedepend.patch | 22 |
2 files changed, 7 insertions, 21 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 8baa8c3..609aaf2 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -237,9 +237,9 @@ def library_recipes(): result.extend([ dict( - name="OpenSSL 1.0.2e", - url="https://www.openssl.org/source/openssl-1.0.2e.tar.gz", - checksum='5262bfa25b60ed9de9f28d5d52d77fc5', + name="OpenSSL 1.0.2f", + url="https://www.openssl.org/source/openssl-1.0.2f.tar.gz", + checksum='b3bf73f507172be9292ea2a8c28b659d', patches=[ "openssl_sdk_makedepend.patch", ], diff --git a/Mac/BuildScript/openssl_sdk_makedepend.patch b/Mac/BuildScript/openssl_sdk_makedepend.patch index 85bd69b..96a8841 100644 --- a/Mac/BuildScript/openssl_sdk_makedepend.patch +++ b/Mac/BuildScript/openssl_sdk_makedepend.patch @@ -1,18 +1,17 @@ # HG changeset patch -# Parent ff8a7557607cffd626997e57ed31c1012a3018aa +# Parent d377390f787c0739a3e89f669def72d7167e5108 # openssl_sdk_makedepend.patch # -# using openssl 1.0.2e +# using openssl 1.0.2f # # - support building with an OS X SDK -# - allow "make depend" to use compilers with names other than "gcc" diff Configure diff --git a/Configure b/Configure --- a/Configure +++ b/Configure -@@ -635,12 +635,12 @@ +@@ -638,12 +638,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,7 +30,7 @@ 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", -@@ -1714,8 +1714,7 @@ +@@ -1717,8 +1717,7 @@ s/^CC=.*$/CC= $cc/; s/^AR=\s*ar/AR= $ar/; s/^RANLIB=.*/RANLIB= $ranlib/; @@ -41,16 +40,3 @@ diff --git a/Configure b/Configure } s/^CFLAG=.*$/CFLAG= $cflags/; s/^DEPFLAG=.*$/DEPFLAG=$depflags/; -diff --git a/util/domd b/util/domd ---- a/util/domd -+++ b/util/domd -@@ -14,8 +14,7 @@ - cp Makefile Makefile.save - # fake the presence of Kerberos - touch $TOP/krb5.h --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 |