diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-01-05 13:45:43 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-01-07 14:30:35 +0100 |
| commit | a5cffbf5ce3f38776f38272616c524375d02f9aa (patch) | |
| tree | 54bc40d147a900b23772de80464989688be72ae6 /external | |
| parent | 2dc602d3740d5afb3909b13000db08d28bb82636 (diff) | |
openssl: upgrade to release 1.1.1i
Fixes CVE-2020-1971
* openssl-macos-arm64.patch.1: remove, was fixed upstream
Change-Id: I405270228682025bf26240e3ea923bfd234068f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108804
Tested-by: Michael Stahl <michael.stahl@allotropia.de>
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit adfceaf32651f6ef17a9b63906366818b667d6b5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108898
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/openssl/UnpackedTarball_openssl.mk | 1 | ||||
| -rw-r--r-- | external/openssl/openssl-macos-arm64.patch.1 | 18 |
2 files changed, 0 insertions, 19 deletions
diff --git a/external/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk index 37473563f5da..6f00cf7f7e44 100644 --- a/external/openssl/UnpackedTarball_openssl.mk +++ b/external/openssl/UnpackedTarball_openssl.mk @@ -13,7 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,openssl,$(OPENSSL_TARBALL),,openssl $(eval $(call gb_UnpackedTarball_add_patches,openssl,\ external/openssl/openssl-no-multilib.patch.0 \ - external/openssl/openssl-macos-arm64.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/openssl/openssl-macos-arm64.patch.1 b/external/openssl/openssl-macos-arm64.patch.1 deleted file mode 100644 index aeaa80d3a380..000000000000 --- a/external/openssl/openssl-macos-arm64.patch.1 +++ /dev/null @@ -1,18 +0,0 @@ --*- Mode: diff -*- ---- a/Configurations/10-main.conf -+++ b/Configurations/10-main.conf -@@ -1557,6 +1667,14 @@ - bn_ops => "SIXTY_FOUR_BIT_LONG", - perlasm_scheme => "macosx", - }, -+ "darwin64-arm64-cc" => { -+ inherit_from => [ "darwin-common" ], -+ CFLAGS => add("-Wall"), -+ cflags => add("-arch arm64"), -+ lib_cppflags => add("-DL_ENDIAN"), -+ bn_ops => "SIXTY_FOUR_BIT_LONG", -+ perlasm_scheme => "macosx", -+ }, - - ##### GNU Hurd - "hurd-x86" => { |