download.lst | 4 ++--
external/openssl/openssllnx.patch | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a97371bf4d123ece75f3f9aeef8f3d4abfc6ad9c
Author: David Tardon <dtar...@redhat.com>
Date: Wed Feb 1 12:47:04 2017 +0100
upload openssl 1.0.2k
Change-Id: I26d49db0207b3f4f64aa9698da4cf3567d195834
Reviewed-on: https://gerrit.libreoffice.org/33800
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/download.lst b/download.lst
index e46dfcd..ac429f6 100644
--- a/download.lst
+++ b/download.lst
@@ -121,8 +121,8 @@ export OPENCOLLADA_MD5SUM :=
4ca8a6ef0afeefc864e9ef21b9f14bd6
export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
export OPENLDAP_MD5SUM := 693ac26de86231f8dcae2b4e9d768e51
export OPENLDAP_TARBALL := openldap-2.4.44.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 := d0ad3a2fcf7008e5b33604bab33df3ad
export ORCUS_TARBALL := liborcus-0.12.1.tar.gz
export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
diff --git a/external/openssl/openssllnx.patch
b/external/openssl/openssllnx.patch
index de19807..224df8f 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)' \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
