diff options
| author | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2023-02-23 15:31:02 +0900 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-03-26 23:08:43 +0200 |
| commit | 8929a3d0ca095460ca46ed0319b92556456c9c44 (patch) | |
| tree | 2f6ad6bccedcefe170e878305b0591a470a8689d | |
| parent | d752540ce36495e00cc8da46dc8b631748b4d4a4 (diff) | |
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.stahl@allotropia.de>
(cherry picked from commit 6074d16b8c631e679a67364837d4ca9799731152)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147987
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/curl/asan-poison-nsspem.patch.0 | 2 | ||||
| -rw-r--r-- | external/curl/curl-nss.patch.1 | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/download.lst b/download.lst index 68351689db8f..24692deee9d0 100644 --- a/download.lst +++ b/download.lst @@ -37,8 +37,8 @@ export CPPUNIT_SHA256SUM := 89c5c6665337f56fd2db36bc3805a5619709d51fb136e5193707 export CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz export CT2N_SHA256SUM := 71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3 export CT2N_TARBALL := 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt -export CURL_SHA256SUM := ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c8cfb1ce47175cc3bee08fff -export CURL_TARBALL := curl-7.87.0.tar.xz +export CURL_SHA256SUM := 1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f +export CURL_TARBALL := curl-7.88.1.tar.xz export EBOOK_SHA256SUM := 7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz export EPOXY_SHA256SUM := a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15 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" |