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

[Libreoffice Gerrit user]

 download.lst                     |    4 ++--
 external/nss/nss-android.patch.1 |   25 -------------------------
 2 files changed, 2 insertions(+), 27 deletions(-)

New commits:
commit 3ef76067bfa1f9f60ec3989bd6b40a5760137903
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Aug 7 18:11:41 2018 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Aug 8 10:20:31 2018 +0200

    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.
    
    Change-Id: I5516edec17b72f53acd2749e8840805eead077bc
    Reviewed-on: https://gerrit.libreoffice.org/58697
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/download.lst b/download.lst
index 4ca0f5399c8a..04a70ea84e0c 100644
--- a/download.lst
+++ b/download.lst
@@ -181,8 +181,8 @@ export MYTHES_SHA256SUM := 1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_SHA256SUM := db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
 export NEON_TARBALL := neon-0.30.2.tar.gz
-export NSS_SHA256SUM := 878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4
-export NSS_TARBALL := nss-3.33-with-nspr-4.17.tar.gz
+export NSS_SHA256SUM := f271ec73291fa3e4bd4b59109f8035cc3a192fc33886f40ed4f9ee4b31c746e9
+export NSS_TARBALL := nss-3.38-with-nspr-4.19.tar.gz
 export ODFGEN_SHA256SUM := 2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
 export ODFGEN_VERSION_MICRO := 6
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1
index 6dc43c1b4ffe..d37c70f16ace 100644
--- a/external/nss/nss-android.patch.1
+++ b/external/nss/nss-android.patch.1
@@ -48,28 +48,3 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile
                         --with-android-toolchain=$(ANDROID_TOOLCHAIN) \
                         --with-android-platform=$(ANDROID_SYSROOT)
 unified headers / ndk16 does have it in it's support module
-diff -ur nss.org/nspr/pr/src/md/unix/unix.c nss/nspr/pr/src/md/unix/unix.c
---- nss.org/nspr/pr/src/md/unix/unix.c	2017-11-22 01:19:16.098553361 +0100
-+++ nss/nspr/pr/src/md/unix/unix.c	2017-11-22 01:20:03.794550181 +0100
-@@ -2714,21 +2714,6 @@
- #endif /* defined(_PR_NO_LARGE_FILES) || defined(SOLARIS2_5) */
- 
- /* Android <= 19 doesn't have mmap64. */
--#if defined(ANDROID) && __ANDROID_API__ <= 19
--PR_IMPORT(void) *__mmap2(void *, size_t, int, int, int, size_t);
--
--#define ANDROID_PAGE_SIZE 4096
--
--static void *
--mmap64(void *addr, size_t len, int prot, int flags, int fd, loff_t offset)
--{
--    if (offset & (ANDROID_PAGE_SIZE - 1)) {
--        errno = EINVAL;
--        return MAP_FAILED;
--    }
--    return __mmap2(addr, len, prot, flags, fd, offset / ANDROID_PAGE_SIZE);
--}
--#endif
- 
- #if defined(OSF1) && defined(__GNUC__)
-