ffs: update libcurl_7.61 patch

1 files changed, 33 insertions, 34 deletions

diff --git a/freefilesync/ffs_libcurl_7.61.1.patch b/freefilesync/ffs_libcurl_7.61.1.patch
index a6b8532..bad631b 100644
--- a/freefilesync/ffs_libcurl_7.61.1.patch
+++ b/freefilesync/ffs_libcurl_7.61.1.patch
@@ -1,50 +1,34 @@
 Author: Brulhart, bgstack15
-Date: 2022-06-07
-Message: remove assertion for libcurl version >1.61 for EL8
-Version: FreeFileSync 11.21
+Date: 2022-08-03
+Message: Update curl wrapper to use libcurl 7.61
+Version: FreeFileSync 11.23
 Message: We have to omit checking for certain definitions.
 Distro: AlmaLinux 8. File ffs_curl.patch is different between all distros!
-diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/afs/ftp.cpp
---- 10.21-0/FreeFileSync/Source/afs/ftp.cpp  2020-03-18 08:56:08.608066350 -0400
-+++ 10.21-1/FreeFileSync/Source/afs/ftp.cpp  2020-03-18 09:23:46.882110499 -0400
-@@ -635,7 +635,7 @@
+diff -aur 11.23-0/FreeFileSync/Source/afs/ftp.cpp 11.23-1/FreeFileSync/Source/afs/ftp.cpp
+--- 11.23-0/FreeFileSync/Source/afs/ftp.cpp	2022-08-03 08:55:32.000000000 -0400
++++ 11.23-1/FreeFileSync/Source/afs/ftp.cpp	2022-08-03 12:45:11.665525916 -0400
+@@ -681,7 +681,7 @@
              curlRelPath += compFmt;
          }
  
 -        static_assert(LIBCURL_VERSION_MAJOR > 7 || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 67));
-+        static_assert(LIBCURL_VERSION_MAJOR > 7 || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 61 ));
++        static_assert(LIBCURL_VERSION_MAJOR > 7 || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 61));
          /*  1. CURLFTPMETHOD_NOCWD requires absolute paths to unconditionally skip CWDs: https://github.com/curl/curl/pull/4382
              2. CURLFTPMETHOD_SINGLECWD requires absolute paths to skip one needless "CWD entry path": https://github.com/curl/curl/pull/4332
                => https://curl.haxx.se/docs/faq.html#How_do_I_list_the_root_dir_of_an
-diff -aur 11.21-{0,1}/libcurl/curl_wrap.h
---- FreeFileSync-11.21-0/libcurl/curl_wrap.h	2022-05-22 17:09:26.000000000 -0400
-+++ FreeFileSync-11.21-1/libcurl/curl_wrap.h	2022-06-07 13:27:43.530380754 -0400
-@@ -17,10 +17,6 @@
- #include <curl/curl.h>
- //-------------------------------------------------
- 
--#ifndef CURLINC_CURL_H
--    #error curl.h header guard changed
--#endif
--
- namespace zen
- {
- void libcurlInit();
-diff -aur 11.21-{0,1}/libcurl/curl_wrap.cpp
---- FreeFileSync-11.21/libcurl/curl_wrap.cpp	2022-05-22 17:09:26.000000000 -0400
-+++ FreeFileSync-11.21-2/libcurl/curl_wrap.cpp	2022-06-07 13:34:11.216294490 -0400
-@@ -331,9 +331,8 @@
+diff -aur 11.23-0/libcurl/curl_wrap.cpp 11.23-1/libcurl/curl_wrap.cpp
+--- 11.23-0/libcurl/curl_wrap.cpp	2022-08-03 08:55:32.000000000 -0400
++++ 11.23-1/libcurl/curl_wrap.cpp	2022-08-03 12:44:43.436188818 -0400
+@@ -331,7 +331,7 @@
              ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE46);
              ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TOO_MANY_REDIRECTS);
              ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNKNOWN_OPTION);
 -            ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SETOPT_OPTION_SYNTAX);
 +            ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TELNET_OPTION_SYNTAX);
              ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE50);
--            ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51);
+             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51);
              ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_GOT_NOTHING);
-             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_ENGINE_NOTFOUND);
-             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_ENGINE_SETFAILED);
-@@ -344,7 +343,7 @@
+@@ -344,7 +344,7 @@
              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);
@@ -53,7 +37,7 @@ diff -aur 11.21-{0,1}/libcurl/curl_wrap.cpp
              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);
-@@ -358,7 +357,7 @@
+@@ -358,7 +358,7 @@
              ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_REMOTE_FILE_EXISTS);
              ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TFTP_NOSUCHUSER);
              ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_CONV_FAILED);
@@ -62,7 +46,7 @@ diff -aur 11.21-{0,1}/libcurl/curl_wrap.cpp
              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);
-@@ -376,14 +375,8 @@
+@@ -376,15 +376,7 @@
              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);
@@ -71,9 +55,24 @@ diff -aur 11.21-{0,1}/libcurl/curl_wrap.cpp
 -            ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_QUIC_CONNECT_ERROR);
 -            ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PROXY);
 -            ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_CLIENTCERT);
-             ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST);
+-            ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNRECOVERABLE_POLL);
+-            ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST);
      }
--    static_assert(CURL_LAST == CURLE_SSL_CLIENTCERT + 1);
+-    static_assert(CURL_LAST == CURLE_UNRECOVERABLE_POLL + 1);
  
      return replaceCpy<std::wstring>(L"Curl status %x", L"%x", numberTo<std::wstring>(static_cast<int>(sc)));
  }
+diff -aur 11.23-0/libcurl/curl_wrap.h 11.23-1/libcurl/curl_wrap.h
+--- 11.23-0/libcurl/curl_wrap.h	2022-08-03 08:48:17.000000000 -0400
++++ 11.23-1/libcurl/curl_wrap.h	2022-08-03 12:44:58.712371236 -0400
+@@ -17,10 +17,6 @@
+ #include <curl/curl.h>
+ //-------------------------------------------------
+ 
+-#ifndef CURLINC_CURL_H
+-    #error curl.h header guard changed
+-#endif
+-
+ namespace zen
+ {
+ void libcurlInit();