diff options
| author | B Stack <bgstack15@gmail.com> | 2020-11-02 22:15:04 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-11-02 22:15:04 +0000 |
| commit | debb37f9bef003546343a85573137daf7524b5a1 (patch) | |
| tree | 53811457126253c74fb638abd1bf2253094bc3dd /freefilesync/ffs_curl.patch | |
| parent | Merge branch 'waterfox-bump' into 'master' (diff) | |
| parent | ffs 11.3-1 (diff) | |
| download | stackrpms-debb37f9bef003546343a85573137daf7524b5a1.tar.gz stackrpms-debb37f9bef003546343a85573137daf7524b5a1.tar.bz2 stackrpms-debb37f9bef003546343a85573137daf7524b5a1.zip | |
Merge branch 'freefilesync-bump' into 'master'
FreeFileSync 11.3-1
See merge request bgstack15/stackrpms!201
Diffstat (limited to 'freefilesync/ffs_curl.patch')
| -rw-r--r-- | freefilesync/ffs_curl.patch | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/freefilesync/ffs_curl.patch b/freefilesync/ffs_curl.patch index ec038d7..604ab30 100644 --- a/freefilesync/ffs_curl.patch +++ b/freefilesync/ffs_curl.patch @@ -1,39 +1,34 @@ Source: AUR -Author: Simon Brulhart -Date: 2019-10-20 21:33:47 +0200 +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 10.17 - -# ffs_curl.patch is different between the rpm and dpkg +Version: FreeFileSync 11.3 diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/afs/ftp.cpp ---- 10.17-0/FreeFileSync/Source/afs/ftp.cpp 2019-10-17 18:37:03.000000000 +0200 -+++ 10.17-1/FreeFileSync/Source/afs/ftp.cpp 2019-10-20 20:18:07.221692533 +0200 -@@ -632,7 +632,7 @@ +--- 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 @@ 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 >= 67)); ++ static_assert(LIBCURL_VERSION_MAJOR > 7 || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 68)); /* 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 - -Message: For Fedora <= 30 that has curl < 7.66.0 you need this patch. -diff -Naur 10.20-0/libcurl/curl_wrap.h 10.20-1/libcurl/curl_wrap.h ---- 10.22-0/libcurl/curl_wrap.h 2020-03-18 15:49:57.839901161 -0400 -+++ 10.22-1/libcurl/curl_wrap.h 2020-03-18 15:56:21.034499900 -0400 -@@ -134,12 +134,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); -- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_AUTH_ERROR); -- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP3); -- ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST); +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 @@ + 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_PROXY); } -- static_assert(CURL_LAST == CURLE_QUIC_CONNECT_ERROR + 1); +- static_assert(CURL_LAST == CURLE_PROXY + 1); return replaceCpy<std::wstring>(L"Curl status %x", L"%x", numberTo<std::wstring>(static_cast<int>(sc))); } + |