download.lst | 4 ++--
external/curl/asan-poison-nsspem.patch.0 | 2 +-
external/curl/curl-nss.patch.1 | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 6074d16b8c631e679a67364837d4ca9799731152
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Feb 23 15:31:02 2023 +0900
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Mar 1 10:34:35 2023 +0000
curl: upgrade to release 7.88.1
Fixes CVE-2023-23916, 2 CVEs that probably don't affect LO.
Reference: https://curl.se/docs/security.html
Change-Id: If9b3fc7c5ce66bfe1027caff39ea2c1cf55df7ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147977
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/download.lst b/download.lst
index a78e84ade811..a154668b78a6 100644
--- a/download.lst
+++ b/download.lst
@@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-CURL_SHA256SUM :=
ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c8cfb1ce47175cc3bee08fff
-CURL_TARBALL := curl-7.87.0.tar.xz
+CURL_SHA256SUM :=
1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f
+CURL_TARBALL := curl-7.88.1.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/curl/asan-poison-nsspem.patch.0
b/external/curl/asan-poison-nsspem.patch.0
index 1f490bd6bf86..b348d44ee573 100644
--- a/external/curl/asan-poison-nsspem.patch.0
+++ b/external/curl/asan-poison-nsspem.patch.0
@@ -1,6 +1,6 @@
--- lib/vtls/nss.c
+++ lib/vtls/nss.c
-@@ -1945,7 +1945,7 @@
+@@ -1926,7 +1926,7 @@
PK11_SetPasswordFunc(nss_get_password);
diff --git a/external/curl/curl-nss.patch.1 b/external/curl/curl-nss.patch.1
index 2128849369e7..2e8766b3d45f 100644
--- a/external/curl/curl-nss.patch.1
+++ b/external/curl/curl-nss.patch.1
@@ -1,7 +1,7 @@
diff -ur curl.org/configure curl/configure
---- curl.org/configure 2016-03-13 15:14:07.177000076 +0100
-+++ curl/configure 2016-03-13 15:16:44.132000076 +0100
-@@ -28230,7 +28230,12 @@
+--- curl.orig/configure 2023-02-20 16:11:55.000000000 +0900
++++ curl/configure 2023-02-23 15:40:58.617432471 +0900
+@@ -28675,7 +28675,12 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Using hard-wired
libraries and compilation flags for NSS." >&5
printf "%s\n" "$as_me: WARNING: Using hard-wired libraries and compilation
flags for NSS." >&2;}
addld="-L$OPT_NSS/lib"
