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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Feb 28 09:45:22 UTC 2019 

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

New commits:
commit fdb9054acb704ded71195d702ba65c492575605d
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Feb 27 12:18:01 2019 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Feb 27 14:46:28 2019 +0100

    openssl: upgrade to release 1.0.2r
    
    Fixes CVE-2019-1559, plus a couple low-severity CVEs.
    
    Reviewed-on: https://gerrit.libreoffice.org/68430
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit e3b6c3ec9fd795601b0749675903fb49c72718fd)
    
    Change-Id: Icb6849ca5f33cb1169ce303505b2e32636e3b25b

diff --git a/download.lst b/download.lst
index 82d9bd2750df..272f185dae95 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 := ac5eb30bf5798aa14b1ae6d0e7da58df
-export OPENSSL_TARBALL := openssl-1.0.2p.tar.gz
+export OPENSSL_MD5SUM := 0d2baaf04c56d542f6cc757b9c2a2aac
+export OPENSSL_TARBALL := openssl-1.0.2r.tar.gz
 export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669
 export ORCUS_TARBALL := liborcus-0.11.2.tar.gz
 export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
commit 5b9b15a62a61275f472f52404ecc815850811a25
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 3 09:19:29 2018 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Feb 27 12:41:09 2019 +0100

    upgrade to openssl 1.0.2p
    
    Reviewed-on: https://gerrit.libreoffice.org/59926
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit dd371caa3aff09c80c19772fcf5968cfcf14ff8c)
    
    Change-Id: Ifacf5dce39d830838b3cf57df760a04df97ade4b

diff --git a/download.lst b/download.lst
index 518e8295962c..82d9bd2750df 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 := 44279b8557c3247cbe324e2322ecd114
-export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz
+export OPENSSL_MD5SUM := ac5eb30bf5798aa14b1ae6d0e7da58df
+export OPENSSL_TARBALL := openssl-1.0.2p.tar.gz
 export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669
 export ORCUS_TARBALL := liborcus-0.11.2.tar.gz
 export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
commit 53e3e0cda1768881998e75d958cb57e97d1d4391
Author:     David Tardon <dtardon at redhat.com>
AuthorDate: Thu Mar 29 09:20:19 2018 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Feb 27 12:37:31 2019 +0100

    upload openssl 1.0.2o
    
    Reviewed-on: https://gerrit.libreoffice.org/52051
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit 9c459fd919cb8199a69fc2d630742930e533285b)
    
    Change-Id: Ib44570ff53d754d1d568378ef0dac4d4789f2042

diff --git a/download.lst b/download.lst
index f694b79fd9da..518e8295962c 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 := 10e9e37f492094b9ef296f68f24a7666
-export OPENSSL_TARBALL := openssl-1.0.2m.tar.gz
+export OPENSSL_MD5SUM := 44279b8557c3247cbe324e2322ecd114
+export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz
 export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669
 export ORCUS_TARBALL := liborcus-0.11.2.tar.gz
 export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
commit 1b23cc46e1a70748304ba987edfb00295ca3beef
Author:     David Tardon <dtardon at redhat.com>
AuthorDate: Tue Nov 7 19:16:57 2017 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Feb 27 12:35:03 2019 +0100

    upload openssl 1.0.2m
    
    Reviewed-on: https://gerrit.libreoffice.org/44421
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit 899d7139355b8bea4bc1e6f9c05dededdb6f2c39)
    
    Change-Id: Iac75c0a2633a11c4ca3f2007c62bf74be2f576ca

diff --git a/download.lst b/download.lst
index 5e7a056c9531..f694b79fd9da 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 := f965fc0bf01bf882b31314b61391ae65
-export OPENSSL_TARBALL := openssl-1.0.2k.tar.gz
+export OPENSSL_MD5SUM := 10e9e37f492094b9ef296f68f24a7666
+export OPENSSL_TARBALL := openssl-1.0.2m.tar.gz
 export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669
 export ORCUS_TARBALL := liborcus-0.11.2.tar.gz
 export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
commit f60c9bfd5c2922e82c6da0bec326d3a71a676670
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 12:32:40 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

diff --git a/download.lst b/download.lst
index 457d92087959..5e7a056c9531 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