[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - download.lst external/openssl

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Feb 27 17:08:22 UTC 2019


 download.lst                      |    4 ++--
 external/openssl/openssllnx.patch |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2d8f8374fd9dbca2dd5d4af046f66106c51d4e9b
Author:     David Tardon <dtardon at redhat.com>
AuthorDate: Wed Feb 1 12:47:04 2017 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Feb 27 18:08:00 2019 +0100

    upload openssl 1.0.2k
    
    Reviewed-on: https://gerrit.libreoffice.org/33800
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit a97371bf4d123ece75f3f9aeef8f3d4abfc6ad9c)
    
    Change-Id: I26d49db0207b3f4f64aa9698da4cf3567d195834
    Reviewed-on: https://gerrit.libreoffice.org/68442
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/download.lst b/download.lst
index 833bbee921cd..274f45710b5f 100644
--- a/download.lst
+++ b/download.lst
@@ -120,8 +120,8 @@ export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
-export OPENSSL_MD5SUM := 9392e65072ce4b614c1392eefc1f23d0
-export OPENSSL_TARBALL := openssl-1.0.2h.tar.gz
+export OPENSSL_MD5SUM := f965fc0bf01bf882b31314b61391ae65
+export OPENSSL_TARBALL := openssl-1.0.2k.tar.gz
 export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669
 export ORCUS_TARBALL := liborcus-0.11.2.tar.gz
 export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
diff --git a/external/openssl/openssllnx.patch b/external/openssl/openssllnx.patch
index de19807b313e..224df8f87b2e 100644
--- a/external/openssl/openssllnx.patch
+++ b/external/openssl/openssllnx.patch
@@ -19,5 +19,5 @@
 -		AS='$(CC)' ASFLAG='$(CFLAG) -c'			\
 +		AS='$(CC)' ASFLAG='$(CFLAG) -c -Wa,--noexecstack'       \
  		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\
+ 		RC='$(RC)'              			\
  		CROSS_COMPILE='$(CROSS_COMPILE)'	\
- 		PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'		\


More information about the Libreoffice-commits mailing list