From 2c03041f46a3dd0b74cd7ddefa6a64acd1d5cec0 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sun, 23 Jun 2024 17:53:15 -0400 Subject: ffs 13.7 --- .../patches/libcurl_improve_supported_error_codes.patch | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'freefilesync/debian/patches') diff --git a/freefilesync/debian/patches/libcurl_improve_supported_error_codes.patch b/freefilesync/debian/patches/libcurl_improve_supported_error_codes.patch index c7ca90c..4e986af 100644 --- a/freefilesync/debian/patches/libcurl_improve_supported_error_codes.patch +++ b/freefilesync/debian/patches/libcurl_improve_supported_error_codes.patch @@ -22,7 +22,7 @@ Author: bgstack15 Author: Fab Stz Origin: multiple sources Forwarded: https://freefilesync.org/forum/viewtopic.php?t=9687 -Last-Update: 2024-02-05 +Last-Update: 2024-06-23 --- a/libcurl/curl_wrap.cpp +++ b/libcurl/curl_wrap.cpp @@ -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,16 +411,46 @@ std::wstring zen::formatCurlStatusCode(C +@@ -395,17 +411,51 @@ 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); @@ -91,11 +91,16 @@ Last-Update: 2024-02-05 +#endif +#if LIBCURL_VERSION_NUM >= 0x080600 // 8.6.0 ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TOO_LARGE); ++#endif ++#if LIBCURL_VERSION_NUM >= 0x080800 // 8.8.0 + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_ECH_REQUIRED); +#endif ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST); } -+#if LIBCURL_VERSION_NUM >= 0x080600 // 8.6.0 - static_assert(CURL_LAST == CURLE_TOO_LARGE + 1); ++#if LIBCURL_VERSION_NUM >= 0x080800 // 8.8.0 + static_assert(CURL_LAST == CURLE_ECH_REQUIRED + 1); ++#elif LIBCURL_VERSION_NUM >= 0x080600 // 8.6.0 ++ static_assert(CURL_LAST == CURLE_TOO_LARGE + 1); +#elif LIBCURL_VERSION_NUM >= 0x075400 // 7.84.0 + static_assert(CURL_LAST == CURLE_UNRECOVERABLE_POLL + 1); +#elif LIBCURL_VERSION_NUM >= 0x074D00 // 7.77.0 -- cgit