diff options
| author | B. Stack <bgstack15@gmail.com> | 2022-01-04 18:30:53 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2022-01-04 18:30:53 +0000 |
| commit | cdad9f9b2ad0cc90909e3c1ffb4d07e8b5b7da35 (patch) | |
| tree | f06427c8117e103cc4ca6f641a444fcf32a166bc /freefilesync/ffs_curl.patch | |
| parent | add clipboard stuff to prefs.js everywhere (diff) | |
| parent | disable openssl patch for fc36/rawhide (diff) | |
| download | stackrpms-cdad9f9b2ad0cc90909e3c1ffb4d07e8b5b7da35.tar.gz stackrpms-cdad9f9b2ad0cc90909e3c1ffb4d07e8b5b7da35.tar.bz2 stackrpms-cdad9f9b2ad0cc90909e3c1ffb4d07e8b5b7da35.zip | |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync bump
See merge request bgstack15/stackrpms!278
Diffstat (limited to 'freefilesync/ffs_curl.patch')
| -rw-r--r-- | freefilesync/ffs_curl.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/freefilesync/ffs_curl.patch b/freefilesync/ffs_curl.patch index 2dd5974..2b93756 100644 --- a/freefilesync/ffs_curl.patch +++ b/freefilesync/ffs_curl.patch @@ -1,7 +1,7 @@ Author: Brulhart, bgstack15 Date: 2021-06-12 10:54:15 -0400 Message: remove assertion for libcurl version >1.71 -Version: FreeFileSync 11.13 +Version: FreeFileSync 11.16 Message: We have to omit checking for certain definitions. On Fedora 33, file /usr/include/curl/curl.h from libcurl-devel 7.71 stops with CURLE_QUIC_CONNECT_ERROR 96 On Devuan Ceres file /usr/include/x86_64-linux-gnu/curl/curl.h from libcurl 4-openssl-dev stops with CURLE_PROXY 97 @@ -18,10 +18,10 @@ diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/a /* 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 -x '*.orig' -x '*.rej' -aur 11.3-0/libcurl/curl_wrap.h 11.3-1/libcurl/curl_wrap.h ---- 11.11-0/libcurl/curl_wrap.h 2021-06-12 10:44:25.062468759 -0400 -+++ 11.11-1/libcurl/curl_wrap.h 2021-06-12 10:50:24.350613680 -0400 -@@ -89,7 +89,7 @@ +diff -x '*.orig' -x '*.rej' -aur 11.16-0/libcurl/curl_wrap.cpp 11.16-1/libcurl/curl_wrap.cpp +--- 11.16-0/libcurl/curl_wrap.cpp 2022-01-04 08:52:19.603430247 -0500 ++++ 11.16-1/libcurl/curl_wrap.cpp 2022-01-04 09:18:42.877140030 -0500 +@@ -330,7 +330,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); @@ -30,7 +30,7 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/libcurl/curl_wrap.h 11.3-1/libcurl/curl_ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE50); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_GOT_NOTHING); -@@ -137,11 +137,8 @@ +@@ -378,11 +378,8 @@ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_AUTH_ERROR); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP3); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_QUIC_CONNECT_ERROR); |