diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-06-18 01:40:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-18 01:40:05 -0700 |
| commit | 0f3abbc29f5750706be1a255784eea5003c25901 (patch) | |
| tree | 16ba729bee6db2972cbd17ca1ba0f332dc267d6c | |
| parent | 81f7899f517f18a45ab111598f9dd6d7210956a8 (diff) | |
| download | cpython-git-0f3abbc29f5750706be1a255784eea5003c25901.tar.gz | |
bpo-34631: Updated OpenSSL to 1.1.1c in macOS installer (GH-14187)
(cherry picked from commit f3fb8393e3cbbdc0ec79e0fdefaadec6977e1491)
Co-authored-by: Ned Deily <nad@python.org>
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 16 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/macOS/2019-06-18-00-30-40.bpo-34631.vSifcv.rst | 1 |
2 files changed, 14 insertions, 3 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 3ee2fba826..e83febd38d 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -215,9 +215,9 @@ def library_recipes(): result.extend([ dict( - name="OpenSSL 1.1.0j", - url="https://www.openssl.org/source/openssl-1.1.0j.tar.gz", - checksum='b4ca5b78ae6ae79da80790b30dbedbdc', + name="OpenSSL 1.1.1c", + url="https://www.openssl.org/source/openssl-1.1.1c.tar.gz", + checksum='15e21da6efe8aa0e0768ffd8cd37a5f6', buildrecipe=build_universal_openssl, configure=None, install=None, @@ -810,6 +810,16 @@ def build_universal_openssl(basedir, archList): "ppc": ["darwin-ppc-cc"], "ppc64": ["darwin64-ppc-cc"], } + + # Somewhere between OpenSSL 1.1.0j and 1.1.1c, changes cause the + # "enable-ec_nistp_64_gcc_128" option to get compile errors when + # building on our 10.6 gcc-4.2 environment. There have been other + # reports of projects running into this when using older compilers. + # So, for now, do not try to use "enable-ec_nistp_64_gcc_128" when + # building for 10.6. + if getDeptargetTuple() == (10, 6): + arch_opts['x86_64'].remove('enable-ec_nistp_64_gcc_128') + configure_opts = [ "no-idea", "no-mdc2", diff --git a/Misc/NEWS.d/next/macOS/2019-06-18-00-30-40.bpo-34631.vSifcv.rst b/Misc/NEWS.d/next/macOS/2019-06-18-00-30-40.bpo-34631.vSifcv.rst new file mode 100644 index 0000000000..164950a37c --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2019-06-18-00-30-40.bpo-34631.vSifcv.rst @@ -0,0 +1 @@ +Updated OpenSSL to 1.1.1c in macOS installer. |