summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorTaichi Haradaguchi <20001722@ymail.ne.jp>2023-02-23 15:31:02 +0900
committerMichael Stahl <michael.stahl@allotropia.de>2023-03-01 11:10:15 +0000
commited6eeb2496a1989856de312152b64401bb600300 (patch)
tree3c5dfcb324c40fcb115cb38a8a0f360e227a3ebc /external
parent1a980e7ac8c70b7c057c930c46689460202bc45f (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/+/147673 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'external')
-rw-r--r--external/curl/asan-poison-nsspem.patch.02
-rw-r--r--external/curl/curl-nss.patch.16
2 files changed, 4 insertions, 4 deletions
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"