From b89053ae2c0409549792ca74d0e584c84daa1b86 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Mon, 15 Feb 2016 16:44:38 +1100 Subject: [PATCH 1/5] Issue #26268: Update OS X 10.5+ installer build to use OpenSSL 1.0.2f. (cherry picked from commit 203ce927f529a2f72e7c4cca574abd8ef1605b52) --- Mac/BuildScript/build-installer.py | 6 ++--- Mac/BuildScript/openssl_sdk_makedepend.patch | 22 ++++--------------- .../2017-09-07-19-26-26.bpo-26268.1Duz_M.rst | 1 + 3 files changed, 8 insertions(+), 21 deletions(-) create mode 100644 Misc/NEWS.d/next/Build/2017-09-07-19-26-26.bpo-26268.1Duz_M.rst diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 1d469bb8f76b0b..ac9e8b532ea931 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 85bd69be4c0058..96a88413c8c987 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 diff --git a/Misc/NEWS.d/next/Build/2017-09-07-19-26-26.bpo-26268.1Duz_M.rst b/Misc/NEWS.d/next/Build/2017-09-07-19-26-26.bpo-26268.1Duz_M.rst new file mode 100644 index 00000000000000..2c0926782a8f7e --- /dev/null +++ b/Misc/NEWS.d/next/Build/2017-09-07-19-26-26.bpo-26268.1Duz_M.rst @@ -0,0 +1 @@ +Update OS X 10.5 installer to use OpenSSL 1.0.2f. From 21dfaf06a3bb8483d1e0e796e0e134a9a0e65860 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Tue, 8 Mar 2016 01:09:08 -0500 Subject: [PATCH 2/5] Issue #26465: Update OS X installer build to use OpenSSL 1.0.2g. (cherry picked from commit f4d97ce1008e2f27c9b9ca636434d35d42098a2c) --- Mac/BuildScript/build-installer.py | 6 +++--- .../next/Build/2017-09-07-19-30-45.bpo-26465.PhUgmq.rst | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 Misc/NEWS.d/next/Build/2017-09-07-19-30-45.bpo-26465.PhUgmq.rst diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index ac9e8b532ea931..38b952baae5957 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.2f", - url="https://www.openssl.org/source/openssl-1.0.2f.tar.gz", - checksum='b3bf73f507172be9292ea2a8c28b659d', + name="OpenSSL 1.0.2g", + url="https://www.openssl.org/source/openssl-1.0.2g.tar.gz", + checksum='f3c710c045cdee5fd114feb69feba7aa', patches=[ "openssl_sdk_makedepend.patch", ], diff --git a/Misc/NEWS.d/next/Build/2017-09-07-19-30-45.bpo-26465.PhUgmq.rst b/Misc/NEWS.d/next/Build/2017-09-07-19-30-45.bpo-26465.PhUgmq.rst new file mode 100644 index 00000000000000..23fb14d4b5c0f5 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2017-09-07-19-30-45.bpo-26465.PhUgmq.rst @@ -0,0 +1,2 @@ +Update OS X 10.5+ 32-bit-only installer to build and link with OpenSSL +1.0.2g. From 8a303b5871feded61dc0c0367b1b6aca8c266caa Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Sat, 4 Jun 2016 17:21:21 -0700 Subject: [PATCH 3/5] Issue #26930: Update OS X 32-bit-only installer builds to use OpenSSL 1.0.2h. (cherry picked from commit 92b4b5a863bcdc09150bf3668092e4ceb7abec44) --- Mac/BuildScript/build-installer.py | 6 +++--- .../next/Build/2017-09-07-19-31-38.bpo-26930.Z3eeRH.rst | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 Misc/NEWS.d/next/Build/2017-09-07-19-31-38.bpo-26930.Z3eeRH.rst diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 38b952baae5957..aece17ef4cae82 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.2g", - url="https://www.openssl.org/source/openssl-1.0.2g.tar.gz", - checksum='f3c710c045cdee5fd114feb69feba7aa', + name="OpenSSL 1.0.2h", + url="https://www.openssl.org/source/openssl-1.0.2h.tar.gz", + checksum='9392e65072ce4b614c1392eefc1f23d0', patches=[ "openssl_sdk_makedepend.patch", ], diff --git a/Misc/NEWS.d/next/Build/2017-09-07-19-31-38.bpo-26930.Z3eeRH.rst b/Misc/NEWS.d/next/Build/2017-09-07-19-31-38.bpo-26930.Z3eeRH.rst new file mode 100644 index 00000000000000..ffcf48c05ea325 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2017-09-07-19-31-38.bpo-26930.Z3eeRH.rst @@ -0,0 +1,2 @@ +Update OS X 10.5+ 32-bit-only installer to build and link with OpenSSL +1.0.2h. From a2786df194a4bf50057562f033a4e98b9ff264c9 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Mon, 31 Oct 2016 19:51:58 -0400 Subject: [PATCH 4/5] Issue #28248: Update macOS installer build to use OpenSSL 1.0.2j. Original patch by Mariatta Wijaya. (cherry picked from commit 38adbfa71079f03747ac59f8eb848ab43fad753d) --- Mac/BuildScript/build-installer.py | 6 +++--- Mac/BuildScript/openssl_sdk_makedepend.patch | 12 +++++------- .../Build/2017-09-07-19-32-39.bpo-28248.KY_-en.rst | 1 + 3 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 Misc/NEWS.d/next/Build/2017-09-07-19-32-39.bpo-28248.KY_-en.rst diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index aece17ef4cae82..3eb38d1457fad3 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.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 96a88413c8c987..e22d67e4e45143 100644 --- 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.d/next/Build/2017-09-07-19-32-39.bpo-28248.KY_-en.rst b/Misc/NEWS.d/next/Build/2017-09-07-19-32-39.bpo-28248.KY_-en.rst new file mode 100644 index 00000000000000..18d369305248de --- /dev/null +++ b/Misc/NEWS.d/next/Build/2017-09-07-19-32-39.bpo-28248.KY_-en.rst @@ -0,0 +1 @@ +Update Windows build and OS X installers to use OpenSSL 1.0.2j. From 70116be2ff2a0f91cf725608688c4f327f9085aa Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Mon, 24 Jul 2017 03:47:31 -0400 Subject: [PATCH 5/5] bpo-29572: Update macOS installer build to OpenSSL 1.0.2k (#457) (#2835) (cherry picked from commit cfcd76777e35c83d548d8736f5d7dc92fe56d806) (cherry picked from commit 002f778ecab98f4725a08f35d68f78559a13e47a) --- Mac/BuildScript/build-installer.py | 6 +++--- Mac/BuildScript/openssl_sdk_makedepend.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 3eb38d1457fad3..e02d23e4df3533 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.2j", - url="https://www.openssl.org/source/openssl-1.0.2j.tar.gz", - checksum='96322138f0b69e61b7212bc53d5e912b', + name="OpenSSL 1.0.2k", + url="https://www.openssl.org/source/openssl-1.0.2k.tar.gz", + checksum='f965fc0bf01bf882b31314b61391ae65', patches=[ "openssl_sdk_makedepend.patch", ], diff --git a/Mac/BuildScript/openssl_sdk_makedepend.patch b/Mac/BuildScript/openssl_sdk_makedepend.patch index e22d67e4e45143..0caac0a64c1ec6 100644 --- a/Mac/BuildScript/openssl_sdk_makedepend.patch +++ b/Mac/BuildScript/openssl_sdk_makedepend.patch @@ -1,6 +1,6 @@ # HG changeset patch # -# using openssl 1.0.2j +# using openssl 1.0.2k # # - support building with an OS X SDK