diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-08-07 18:11:41 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-08-15 10:55:05 +0200 |
| commit | 700df752fc831945e0f49bf3e6e2a52aeebefb0c (patch) | |
| tree | f4071b09060ba96b4bf5a6f1d60cbedd417fe166 | |
| parent | 052f2f25cc3500e84db644aa6e67fa2b1e9307c8 (diff) | |
nss: upgrade to release 3.38
Fixes CVE-2018-0495 and "the ASN.1 code".
(Remove one hunk of nss-android.patch.1 that should be obsolete with the
current Android toolchain baseline (but that hunk didn't exist in
libreoffice-6-0 or older anyway).)
Change-Id: I5516edec17b72f53acd2749e8840805eead077bc
Reviewed-on: https://gerrit.libreoffice.org/58697
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 3ef76067bfa1f9f60ec3989bd6b40a5760137903)
Reviewed-on: https://gerrit.libreoffice.org/58722
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit e4874f777048535650a2bb1ce875e1a6e3e4b7ef)
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/nss/nss.vs2015.patch | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/download.lst b/download.lst index b68cd8400d5a..df77a4016151 100644 --- a/download.lst +++ b/download.lst @@ -112,8 +112,8 @@ export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2 export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz export NEON_TARBALL := 231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz -export NSS_MD5SUM := b47a61cb90571c0b88a531037114685a -export NSS_TARBALL := nss-3.31.1-with-nspr-4.15.tar.gz +export NSS_MD5SUM := cd649be8ee61fe15d64d7bef361b37ba +export NSS_TARBALL := nss-3.38-with-nspr-4.19.tar.gz export ODFGEN_MD5SUM := 32572ea48d9021bbd6fa317ddb697abc export ODFGEN_VERSION_MICRO := 6 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2 diff --git a/external/nss/nss.vs2015.patch b/external/nss/nss.vs2015.patch index de4f8762fd5b..c3e6b5a5acaa 100644 --- a/external/nss/nss.vs2015.patch +++ b/external/nss/nss.vs2015.patch @@ -10,3 +10,13 @@ diff -ru nss.org/nss/coreconf/WIN32.mk nss/nss/coreconf/WIN32.mk ifeq ($(_MSC_VER_GE_12),1) OS_CFLAGS += -FS endif +--- a/nss/nss/gtests/nss_bogo_shim/nss_bogo_shim.cc 2018-08-08 11:08:42.922939267 +0200 ++++ b/nss/nss/gtests/nss_bogo_shim/nss_bogo_shim.cc 2018-08-08 11:08:47.778929835 +0200 +@@ -6,6 +6,7 @@ + #include "config.h" + + #include <algorithm> ++#include <iterator> + #include <cstdlib> + #include <iostream> + #include <memory> |