download.lst | 4 ++--
external/curl/ExternalProject_curl.mk | 1 +
external/curl/UnpackedTarball_curl.mk | 1 +
external/curl/curl-msvc-disable-protocols.patch.1 | 10 ++++++----
external/curl/undefined.patch.0 | 11 +++++++++++
5 files changed, 21 insertions(+), 6 deletions(-)
New commits:
commit d12cbef190a1bb306cd37736bace9dd22e0a709b
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Dec 12 02:11:12 2024 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue May 6 08:35:43 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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184976
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/download.lst b/download.lst
index febb3341c246..7851a40b7f90 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 :=
db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb
-CURL_TARBALL := curl-8.11.0.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/ExternalProject_curl.mk
b/external/curl/ExternalProject_curl.mk
index a7cd72e6bae3..2923a94148b6 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -88,6 +88,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
ENABLE_IPV6=yes \
ENABLE_SSPI=yes \
ENABLE_WINSSL=yes \
+ WINBUILD_ACKNOWLEDGE_DEPRECATED=yes \
WITH_ZLIB=static \
,winbuild)
$(call gb_Trace_EndRange,curl,EXTERNAL)
diff --git a/external/curl/UnpackedTarball_curl.mk
b/external/curl/UnpackedTarball_curl.mk
index 4412857d36a0..301beef47452 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/curl-msvc-disable-protocols.patch.1
b/external/curl/curl-msvc-disable-protocols.patch.1
index 1c74fa63381b..fcf90b0ab2f8 100644
--- a/external/curl/curl-msvc-disable-protocols.patch.1
+++ b/external/curl/curl-msvc-disable-protocols.patch.1
@@ -2,9 +2,9 @@ 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
-@@ -509,4 +509,20 @@
- /* If you want to build curl with the built-in manual */
- #define USE_MANUAL 1
+@@ -500,6 +500,22 @@
+ # endif /* UNDER_CE */
+ #endif /* !CURL_OS */
+#define CURL_DISABLE_DICT 1
+#define CURL_DISABLE_FILE 1
@@ -22,7 +22,9 @@ disable protocols nobody needs in MSVC build
+#define CURL_DISABLE_TELNET 1
+#define CURL_DISABLE_TFTP 1
+
- #endif /* HEADER_CURL_CONFIG_WIN32_H */
+ /* ---------------------------------------------------------------- */
+ /* Windows CE */
+ /* ---------------------------------------------------------------- */
--- curl/winbuild/MakefileBuild.vc.orig 2017-10-23 23:41:21.393200000
+0200
+++ curl/winbuild/MakefileBuild.vc 2017-10-23 23:34:16.028000000 +0200
@@ -562,7 +562,7 @@
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
*,
