download.lst | 4 ++--
external/curl/UnpackedTarball_curl.mk | 1 -
external/curl/undefined.patch.0 | 11 -----------
3 files changed, 2 insertions(+), 14 deletions(-)
New commits:
commit 6b93f495ad5d90b5c3a1f14e3c020892f4b5ffc7
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed May 28 09:48:11 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed May 28 13:46:11 2025 +0200
curl: upgrade to 8.14.0
* external/curl/undefined.patch.0 has been fixed
upstream
Downloaded from https://curl.se/download/curl-8.14.0.tar.xz
Change-Id: I3c782cc927798aa6c3e589fbc47bd2f5848f8ca6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185947
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/download.lst b/download.lst
index b0bb7213b24b..184dd4ce8294 100644
--- a/download.lst
+++ b/download.lst
@@ -80,8 +80,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-CURL_SHA256SUM :=
4a093979a3c2d02de2fbc00549a32771007f2e78032c6faa5ecd2f7a9e152025
-CURL_TARBALL := curl-8.13.0.tar.xz
+CURL_SHA256SUM :=
b3634cfc538c72c9c6ca794ef4c73d7fdbd171e8dee2db837d83a5e45231002a
+CURL_TARBALL := curl-8.14.0.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/curl/UnpackedTarball_curl.mk
b/external/curl/UnpackedTarball_curl.mk
index 76b8b8639df2..53b32969cb14 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-msvc-disable-protocols.patch.1 \
external/curl/zlib.patch.0 \
external/curl/configurable-z-option.patch.0 \
- external/curl/undefined.patch.0 \
))
ifeq ($(OS)-$(COM_IS_CLANG),WNT-TRUE)
diff --git a/external/curl/undefined.patch.0 b/external/curl/undefined.patch.0
deleted file mode 100644
index c73d310904fe..000000000000
--- a/external/curl/undefined.patch.0
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/curl_krb5.h 2025-04-03 09:35:06.209290030 +0200
-+++ lib/curl_krb5.h 2025-04-03 09:35:19.341187768 +0200
-@@ -39,7 +39,7 @@
- #define AUTH_CONTINUE 1
- #define AUTH_ERROR 2
-
--#ifdef HAVE_GSSAPI
-+#if defined(HAVE_GSSAPI) && !defined(CURL_DISABLE_FTP)
- void Curl_sec_conn_init(struct connectdata *);
- void Curl_sec_conn_destroy(struct connectdata *);
- int Curl_sec_read_msg(struct Curl_easy *data, struct connectdata *conn, char
*,
