diff options
| author | B Stack <bgstack15@gmail.com> | 2020-03-23 15:05:23 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-03-23 15:05:23 +0000 |
| commit | b174e8328fc727df2beb2f4ba364c110ca68e56c (patch) | |
| tree | 2813eb630c4be310b83db09eb0834e2a0b71ab31 /freefilesync/debian/patches/ffs_curl.patch | |
| parent | Merge branch 'waterfox-bump' into 'master' (diff) | |
| parent | 10.22 rpm rc1 (diff) | |
| download | stackrpms-b174e8328fc727df2beb2f4ba364c110ca68e56c.tar.gz stackrpms-b174e8328fc727df2beb2f4ba364c110ca68e56c.tar.bz2 stackrpms-b174e8328fc727df2beb2f4ba364c110ca68e56c.zip | |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync bump
See merge request bgstack15/stackrpms!144
Diffstat (limited to 'freefilesync/debian/patches/ffs_curl.patch')
| -rw-r--r-- | freefilesync/debian/patches/ffs_curl.patch | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/freefilesync/debian/patches/ffs_curl.patch b/freefilesync/debian/patches/ffs_curl.patch index 2396648..549d9ac 100644 --- a/freefilesync/debian/patches/ffs_curl.patch +++ b/freefilesync/debian/patches/ffs_curl.patch @@ -6,33 +6,29 @@ 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 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: Devuan does not have whichever version of libcurl that provides these error codes, probably 7.68.0. Devuan as of 2020-02-15 has libcurl4-openssl-dev=7.67.0-2 diff -Naur 10.20-0/libcurl/curl_wrap.h 10.20-1/libcurl/curl_wrap.h ---- 10.20-0/libcurl/curl_wrap.h 2020-02-15 14:50:08.356617565 -0500 -+++ 10.20-1/libcurl/curl_wrap.h 2020-02-15 14:51:55.961645573 -0500 -@@ -135,10 +135,10 @@ - ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP2_STREAM); - ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_RECURSIVE_API_CALL); +--- 10.21-0/libcurl/curl_wrap.h 2020-03-18 08:56:08.488065042 -0400 ++++ 10.21-1/libcurl/curl_wrap.h 2020-03-18 09:25:52.871480165 -0400 +@@ -137,9 +137,9 @@ 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_HTTP3); -+ //ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST); + 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); } -- static_assert(CURL_LAST == CURLE_HTTP3 + 1); -+ //static_assert(CURL_LAST == CURLE_HTTP3 + 1); +- static_assert(CURL_LAST == CURLE_QUIC_CONNECT_ERROR + 1); ++ //static_assert(CURL_LAST == CURLE_QUIC_CONNECT_ERROR + 1); - return replaceCpy<std::wstring>(L"Curl status %x.", L"%x", numberTo<std::wstring>(static_cast<int>(sc))); + return replaceCpy<std::wstring>(L"Curl status %x", L"%x", numberTo<std::wstring>(static_cast<int>(sc))); } |