diff options
| author | B. Stack <bgstack15@gmail.com> | 2021-06-15 14:22:17 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2021-06-15 14:22:17 +0000 |
| commit | 6ff9bc7c8bcfb38b69ec94c1c340614101ced36b (patch) | |
| tree | e0dd0a7a65da0cb8a2100bbad6f430d14a332baa /freefilesync/debian/patches/ffs_curl.patch | |
| parent | Merge branch 'palemoon-bump' into 'master' (diff) | |
| parent | 11.11-1 rc1 (diff) | |
| download | stackrpms-6ff9bc7c8bcfb38b69ec94c1c340614101ced36b.tar.gz stackrpms-6ff9bc7c8bcfb38b69ec94c1c340614101ced36b.tar.bz2 stackrpms-6ff9bc7c8bcfb38b69ec94c1c340614101ced36b.zip | |
Merge branch 'freefilesync-bump' into 'master'
11.11-1 rc1
See merge request bgstack15/stackrpms!243
Diffstat (limited to 'freefilesync/debian/patches/ffs_curl.patch')
| -rw-r--r-- | freefilesync/debian/patches/ffs_curl.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/freefilesync/debian/patches/ffs_curl.patch b/freefilesync/debian/patches/ffs_curl.patch index 604ab30..0520d3a 100644 --- a/freefilesync/debian/patches/ffs_curl.patch +++ b/freefilesync/debian/patches/ffs_curl.patch @@ -1,10 +1,10 @@ -Source: AUR -Author: Simon Brulhart, bgstack15 -Date: 2020-11-01 17:22:33 -0500 -Message: -remove assertion for libcurl version >1.67 (1.66 should be safe but slower) -The upstream release uses the curl git master branch instead of release versions. The AUR guy thinks it's acceptable to use the older version of libcurl, that is actually already released. -Version: FreeFileSync 11.3 +Author: Brulhart, bgstack15 +Date: 2021-06-12 10:54:15 -0400 +Message: remove assertion for libcurl version >1.71 +Version: FreeFileSync 11.11 +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 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 @@ -13,22 +13,22 @@ diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/a } - 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 >= 68)); ++ static_assert(LIBCURL_VERSION_MAJOR > 7 || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 71 )); /* 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.3-0/libcurl/curl_wrap.h 2020-11-01 17:14:27.183497417 -0500 -+++ 11.3-1/libcurl/curl_wrap.h 2020-11-01 17:21:38.883967113 -0500 -@@ -137,10 +137,7 @@ +--- 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 +@@ -137,11 +137,8 @@ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_AUTH_ERROR); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP3); - ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST); -- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_QUIC_CONNECT_ERROR); + 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); } -- static_assert(CURL_LAST == CURLE_PROXY + 1); +- static_assert(CURL_LAST == CURLE_SSL_CLIENTCERT + 1); return replaceCpy<std::wstring>(L"Curl status %x", L"%x", numberTo<std::wstring>(static_cast<int>(sc))); } - |