diff options
| author | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2022-12-30 21:29:58 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2023-01-06 20:48:41 +0000 |
| commit | 5a1ddc1a92a7883597ab7d825408a1f0adc2ec6e (patch) | |
| tree | 0d672ea8e7b4d06fe12242329f4ff0a18787b45d /external | |
| parent | f41966222f05ab327550dc7a5cf9ad40052124b3 (diff) | |
curl: upgrade to release 7.87.0
Fixes CVE-2022-43551 and CVE-2022-43552.
https://curl.se/docs/CVE-2022-43551.html
https://curl.se/docs/CVE-2022-43552.html
Change-Id: I979ed11c212aef226ad9f26420462e5f9dbe15e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144885
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/curl/asan-poison-nsspem.patch.0 | 2 | ||||
| -rw-r--r-- | external/curl/curl-msvc-disable-protocols.patch.1 | 2 | ||||
| -rw-r--r-- | external/curl/curl-nss.patch.1 | 2 | ||||
| -rw-r--r-- | external/curl/zlib.patch.0 | 12 |
4 files changed, 9 insertions, 9 deletions
diff --git a/external/curl/asan-poison-nsspem.patch.0 b/external/curl/asan-poison-nsspem.patch.0 index 8675f06e6b8b..1f490bd6bf86 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 -@@ -1942,7 +1942,7 @@ +@@ -1945,7 +1945,7 @@ PK11_SetPasswordFunc(nss_get_password); diff --git a/external/curl/curl-msvc-disable-protocols.patch.1 b/external/curl/curl-msvc-disable-protocols.patch.1 index 89c4ff576f85..71ff0c01a028 100644 --- a/external/curl/curl-msvc-disable-protocols.patch.1 +++ b/external/curl/curl-msvc-disable-protocols.patch.1 @@ -2,7 +2,7 @@ disable protocols nobody needs in MSVC build --- curl/lib/config-win32.h.orig 2017-08-09 16:43:29.464000000 +0200 +++ curl/lib/config-win32.h 2017-08-09 16:47:38.549200000 +0200 -@@ -616,4 +616,20 @@ +@@ -654,4 +654,20 @@ # define ENABLE_IPV6 1 #endif diff --git a/external/curl/curl-nss.patch.1 b/external/curl/curl-nss.patch.1 index 5ef25748d7eb..2128849369e7 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 -@@ -27985,7 +27985,12 @@ +@@ -28230,7 +28230,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" diff --git a/external/curl/zlib.patch.0 b/external/curl/zlib.patch.0 index b8e242a3aaea..b4442ba262d1 100644 --- a/external/curl/zlib.patch.0 +++ b/external/curl/zlib.patch.0 @@ -1,6 +1,6 @@ --- configure +++ configure -@@ -22808,7 +22808,6 @@ +@@ -23035,7 +23035,6 @@ clean_CPPFLAGS=$CPPFLAGS clean_LDFLAGS=$LDFLAGS clean_LIBS=$LIBS @@ -8,7 +8,7 @@ # Check whether --with-zlib was given. if test ${with_zlib+y} -@@ -22818,6 +22818,7 @@ +@@ -23045,6 +23044,7 @@ if test "$OPT_ZLIB" = "no" ; then @@ -16,7 +16,7 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: zlib disabled" >&5 printf "%s\n" "$as_me: WARNING: zlib disabled" >&2;} else -@@ -22825,6 +825,21 @@ +@@ -23052,6 +23052,21 @@ OPT_ZLIB="" fi @@ -38,7 +38,7 @@ if test -z "$OPT_ZLIB" ; then if test -n "$PKG_CONFIG"; then -@@ -23120,6 +23120,7 @@ +@@ -23344,6 +23359,7 @@ printf "%s\n" "$as_me: found both libz and libz.h header" >&6;} curl_zlib_msg="enabled" fi @@ -48,7 +48,7 @@ if test x"$AMFIXLIB" = x1; then --- configure.ac +++ configure.ac -@@ -1222,19 +1222,30 @@ +@@ -1243,19 +1243,30 @@ clean_CPPFLAGS=$CPPFLAGS clean_LDFLAGS=$LDFLAGS clean_LIBS=$LIBS @@ -80,7 +80,7 @@ if test -z "$OPT_ZLIB" ; then CURL_CHECK_PKGCONFIG(zlib) -@@ -1316,6 +1316,7 @@ +@@ -1336,6 +1347,7 @@ AC_MSG_NOTICE([found both libz and libz.h header]) curl_zlib_msg="enabled" fi |