diff options
| author | B. Stack <bgstack15@gmail.com> | 2021-08-23 14:11:56 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2021-08-23 14:11:56 +0000 |
| commit | 83c15737a311470c968b21e7125ce1cb3151ef47 (patch) | |
| tree | 4eac4527e9a708668b93c0473cdc4cef8c79d48d /freefilesync/ffs_curl.patch | |
| parent | Merge branch 'newmoon-bump' into 'master' (diff) | |
| download | stackrpms-83c15737a311470c968b21e7125ce1cb3151ef47.tar.gz stackrpms-83c15737a311470c968b21e7125ce1cb3151ef47.tar.bz2 stackrpms-83c15737a311470c968b21e7125ce1cb3151ef47.zip | |
Freefilesync 11.13
Diffstat (limited to 'freefilesync/ffs_curl.patch')
| -rw-r--r-- | freefilesync/ffs_curl.patch | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/freefilesync/ffs_curl.patch b/freefilesync/ffs_curl.patch index 0520d3a..2dd5974 100644 --- a/freefilesync/ffs_curl.patch +++ b/freefilesync/ffs_curl.patch @@ -1,10 +1,11 @@ Author: Brulhart, bgstack15 Date: 2021-06-12 10:54:15 -0400 Message: remove assertion for libcurl version >1.71 -Version: FreeFileSync 11.11 +Version: FreeFileSync 11.13 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 +For Devuan Ceres libcurl4-openssl-dev 7.74.0-1.3+b1 uses CURLE_TELNET_OPTION_SYNTAX and not CURLE_SETOPT_OPTION_SYNTAX which replaced the first at version 7.78.0 per https://github.com/curl/curl/blob/master/docs/libcurl/symbols-in-versions 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 @@ -20,6 +21,15 @@ diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/a 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 @@ + 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_GOT_NOTHING); @@ -137,11 +137,8 @@ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_AUTH_ERROR); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP3); |