[Libreoffice-commits] core.git: download.lst external/openssl

[Michael Stahl (via logerrit)]

 download.lst                                 |    4 ++--
 external/openssl/UnpackedTarball_openssl.mk  |    1 -
 external/openssl/openssl-macos-arm64.patch.1 |   18 ------------------
 3 files changed, 2 insertions(+), 21 deletions(-)

New commits:
commit adfceaf32651f6ef17a9b63906366818b667d6b5
Author:     Michael Stahl <michael.stahl at allotropia.de>
AuthorDate: Tue Jan 5 13:45:43 2021 +0100
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Wed Jan 6 17:38:29 2021 +0100

    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 at allotropia.de>
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/download.lst b/download.lst
index 5f1be453d62d..f655afe44f11 100644
--- a/download.lst
+++ b/download.lst
@@ -204,8 +204,8 @@ export OFFICEOTRON_SHA256SUM := f2443f27561af52324eee03a1892d9f569adc8db9e7bca55
 export OFFICEOTRON_JAR := 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 export OPENLDAP_SHA256SUM := cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824
 export OPENLDAP_TARBALL := openldap-2.4.45.tgz
-export OPENSSL_SHA256SUM := ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
-export OPENSSL_TARBALL := openssl-1.1.1g.tar.gz
+export OPENSSL_SHA256SUM := e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242
+export OPENSSL_TARBALL := openssl-1.1.1i.tar.gz
 export ORCUS_SHA256SUM := c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4
 export ORCUS_TARBALL := liborcus-0.16.1.tar.bz2
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
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" => {