From 7f004cc49991311998a278cf7266a1bcc7bedb0f Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sat, 17 Feb 2024 08:42:28 -0500 Subject: ffs 13.4 --- .../patches/libcurl_improve_supported_error_codes.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'freefilesync/debian/patches/libcurl_improve_supported_error_codes.patch') diff --git a/freefilesync/debian/patches/libcurl_improve_supported_error_codes.patch b/freefilesync/debian/patches/libcurl_improve_supported_error_codes.patch index 50d5942..c7ca90c 100644 --- a/freefilesync/debian/patches/libcurl_improve_supported_error_codes.patch +++ b/freefilesync/debian/patches/libcurl_improve_supported_error_codes.patch @@ -26,7 +26,7 @@ Last-Update: 2024-02-05 --- a/libcurl/curl_wrap.cpp +++ b/libcurl/curl_wrap.cpp -@@ -350,7 +350,11 @@ +@@ -350,7 +350,11 @@ std::wstring zen::formatCurlStatusCode(C ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE46); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TOO_MANY_REDIRECTS); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNKNOWN_OPTION); @@ -38,7 +38,7 @@ Last-Update: 2024-02-05 ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE50); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_GOT_NOTHING); -@@ -363,7 +367,11 @@ +@@ -363,7 +367,11 @@ std::wstring zen::formatCurlStatusCode(C ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_CIPHER); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PEER_FAILED_VERIFICATION); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_BAD_CONTENT_ENCODING); @@ -50,7 +50,7 @@ Last-Update: 2024-02-05 ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_FILESIZE_EXCEEDED); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_USE_SSL_FAILED); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SEND_FAIL_REWIND); -@@ -376,8 +384,16 @@ +@@ -376,8 +384,16 @@ std::wstring zen::formatCurlStatusCode(C ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TFTP_UNKNOWNID); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_REMOTE_FILE_EXISTS); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TFTP_NOSUCHUSER); @@ -67,7 +67,7 @@ Last-Update: 2024-02-05 ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_CACERT_BADFILE); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_REMOTE_FILE_NOT_FOUND); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSH); -@@ -395,15 +411,46 @@ +@@ -395,16 +411,46 @@ std::wstring zen::formatCurlStatusCode(C ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_INVALIDCERTSTATUS); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP2_STREAM); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_RECURSIVE_API_CALL); @@ -90,14 +90,14 @@ Last-Update: 2024-02-05 ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNRECOVERABLE_POLL); +#endif +#if LIBCURL_VERSION_NUM >= 0x080600 // 8.6.0 -+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TOO_LARGE); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TOO_LARGE); +#endif ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST); } +#if LIBCURL_VERSION_NUM >= 0x080600 // 8.6.0 -+ static_assert(CURL_LAST == CURLE_TOO_LARGE + 1); + static_assert(CURL_LAST == CURLE_TOO_LARGE + 1); +#elif LIBCURL_VERSION_NUM >= 0x075400 // 7.84.0 - static_assert(CURL_LAST == CURLE_UNRECOVERABLE_POLL + 1); ++ static_assert(CURL_LAST == CURLE_UNRECOVERABLE_POLL + 1); +#elif LIBCURL_VERSION_NUM >= 0x074D00 // 7.77.0 + static_assert(CURL_LAST == CURLE_SSL_CLIENTCERT + 1); +#elif LIBCURL_VERSION_NUM >= 0x074900 // 7.73.0 -- cgit