summaryrefslogtreecommitdiff
path: root/freefilesync/ffs_libcurl_7.79.1.patch
diff options
context:
space:
mode:
Diffstat (limited to 'freefilesync/ffs_libcurl_7.79.1.patch')
-rw-r--r--freefilesync/ffs_libcurl_7.79.1.patch27
1 files changed, 19 insertions, 8 deletions
diff --git a/freefilesync/ffs_libcurl_7.79.1.patch b/freefilesync/ffs_libcurl_7.79.1.patch
index d76eac8..49c0ce4 100644
--- a/freefilesync/ffs_libcurl_7.79.1.patch
+++ b/freefilesync/ffs_libcurl_7.79.1.patch
@@ -1,8 +1,8 @@
Author: Brulhart, bgstack15
-Date: 2022-06-27
-Message: remove assertion for libcurl version >1.79
-Version: FreeFileSync 11.22
-Message: We have to omit checking for certain definitions.
+Date: 2022-08-03
+Message: Update curl wrapper to use libcurl 7.79
+Version: FreeFileSync 11.23
+Message: We have to omit checking for certain definitions. Upstream uses libcurl 7.84
Distro: Fedora 35. File ffs_curl.patch is different between fc34 and devuan!
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
@@ -17,9 +17,9 @@ diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/a
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.18-{0,1}/libcurl/curl_wrap.cpp
---- 11.18-0/libcurl/curl_wrap.cpp 2022-03-09 10:19:42.961942416 -0500
-+++ 11.18-1/libcurl/curl_wrap.cpp 2022-03-09 10:37:44.702421086 -0500
-@@ -343,7 +343,7 @@
+--- 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 10:11:27.261375134 -0400
+@@ -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);
@@ -28,7 +28,7 @@ diff -aur 11.18-{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);
-@@ -357,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);
@@ -37,3 +37,14 @@ diff -aur 11.18-{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);
+@@ -381,10 +381,8 @@
+ 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(CURLE_UNRECOVERABLE_POLL);
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST);
+ }
+- 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)));
+ }
bgstack15