diff options
author | Michael Stahl <michael.stahl@allotropia.de> | 2023-11-07 11:57:58 +0100 |
---|---|---|
committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-11-09 16:51:42 +0100 |
commit | 4a26dcac8e4f3ff3cbc3c356ad0a34968ef9d8fe (patch) | |
tree | 73cc949ad18d73cdfa88cd640c94ac9e42da04d5 /external | |
parent | 5365daf67f8b81f69a47e3692a71fd3962505e46 (diff) |
tdf#146386 curl,ucb: remove FTP UCP
FTP support has been deprecated since LO 7.4.
The UCP currently doesn't even support TLS connections.
Also disable FTP protocol in libcurl.
Also remove JunitTest_ucb_complex: turns out the only test in it,
checkWrongFtpConnection, fails on Linux because now GIO UCP handles
ftp:// URLs and it throws InteractiveAugmentedIOException instead of
expected ones, and on other platforms it would fail differently because
there is no GIO.
Change-Id: I4631d124371fef390f105fb16bf09aaa59e739e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159065
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'external')
-rw-r--r-- | external/curl/ExternalProject_curl.mk | 2 | ||||
-rw-r--r-- | external/curl/curl-msvc-disable-protocols.patch.1 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 5f72e4807394..c63a8e0465ce 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,curl,build): $(gb_RUN_CONFIGURE) ./configure \ --without-amissl --without-bearssl --without-gnutls \ --without-mbedtls --without-rustls --without-wolfssl \ - --enable-ftp --enable-http --enable-ipv6 \ + --disable-ftp --enable-http --enable-ipv6 \ --without-libidn2 --without-libpsl --without-librtmp \ --without-libssh2 --without-nghttp2 \ --without-libssh --without-brotli \ diff --git a/external/curl/curl-msvc-disable-protocols.patch.1 b/external/curl/curl-msvc-disable-protocols.patch.1 index 71ff0c01a028..905a2d6a7ac3 100644 --- a/external/curl/curl-msvc-disable-protocols.patch.1 +++ b/external/curl/curl-msvc-disable-protocols.patch.1 @@ -8,7 +8,7 @@ disable protocols nobody needs in MSVC build +#define CURL_DISABLE_DICT 1 +#define CURL_DISABLE_FILE 1 -+#undef CURL_DISABLE_FTP ++#define CURL_DISABLE_FTP 1 +#define CURL_DISABLE_GOPHER 1 +#undef CURL_DISABLE_HTTP +#define CURL_DISABLE_IMAP 1 |