download.lst | 4 ++--
external/curl/UnpackedTarball_curl.mk | 1 +
external/curl/undefined.patch.0 | 11 +++++++++++
3 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 5c79209694d58abdbaf8c28b5e8cc690a937c1cc
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Apr 2 10:59:08 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Apr 3 11:25:51 2025 +0200
curl: upgrade to 8.13.0
* Add external/curl/undefined.patch.0 to handle
https://github.com/curl/curl/issues/16925
Downloaded from https://curl.se/download/curl-8.13.0.tar.xz
Change-Id: I5555cdee13f7660b52ac4a513969dfde1563bf56
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183614
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/download.lst b/download.lst
index e2e64dbc0439..0a35370f565f 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 :=
0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202
-CURL_TARBALL := curl-8.12.1.tar.xz
+CURL_SHA256SUM :=
4a093979a3c2d02de2fbc00549a32771007f2e78032c6faa5ecd2f7a9e152025
+CURL_TARBALL := curl-8.13.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 4f21212eff8d..777e2b576107 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -25,6 +25,7 @@ $(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
new file mode 100644
index 000000000000..c73d310904fe
--- /dev/null
+++ b/external/curl/undefined.patch.0
@@ -0,0 +1,11 @@
+--- 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
*,
