diff options
| author | B Stack <bgstack15@gmail.com> | 2019-10-28 14:05:35 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2019-10-28 14:05:35 +0000 |
| commit | ef304a13cc18f52c47de12c9989ad4bbb89de5c6 (patch) | |
| tree | 07227896792c43bd00a41d7bbabbb93870f48959 /freefilesync/ffs_curl.patch | |
| parent | Merge branch 'veracrypt-bump' into 'master' (diff) | |
| parent | freefilesync: el7 use c++2a now (diff) | |
| download | stackrpms-ef304a13cc18f52c47de12c9989ad4bbb89de5c6.tar.gz stackrpms-ef304a13cc18f52c47de12c9989ad4bbb89de5c6.tar.bz2 stackrpms-ef304a13cc18f52c47de12c9989ad4bbb89de5c6.zip | |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 10.17
See merge request bgstack15/stackrpms!95
Diffstat (limited to 'freefilesync/ffs_curl.patch')
| -rw-r--r-- | freefilesync/ffs_curl.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/freefilesync/ffs_curl.patch b/freefilesync/ffs_curl.patch new file mode 100644 index 0000000..25ad6a6 --- /dev/null +++ b/freefilesync/ffs_curl.patch @@ -0,0 +1,50 @@ +Source: AUR +Author: Simon Brulhart +Date: 2019-10-20 21:33:47 +0200 +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 +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 @@ + 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)); + /* 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 -x '*.swp' -Naur 10.17-0/FreeFileSync/Source/afs/libcurl/curl_wrap.h 10.17-1/FreeFileSync/Source/afs/libcurl/curl_wrap.h +--- 10.17-0/FreeFileSync/Source/afs/libcurl/curl_wrap.h 2019-10-21 11:23:51.238139296 -0400 ++++ 10.17-1/FreeFileSync/Source/afs/libcurl/curl_wrap.h 2019-10-21 11:37:17.175140528 -0400 +@@ -16,7 +16,8 @@ + //------------------------------------------------- + + #ifndef CURLINC_CURL_H +- #error curl.h header guard changed ++ // disable for Fedora <= 30 ++ //#error curl.h header guard changed + #endif + + namespace zen +@@ -121,10 +122,10 @@ + 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(CURL_LAST); ++ //ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_AUTH_ERROR); ++ //ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST); + } +- static_assert(CURL_LAST == CURLE_AUTH_ERROR + 1); ++ //static_assert(CURL_LAST == CURLE_AUTH_ERROR + 1); + + return replaceCpy<std::wstring>(L"Curl status %x.", L"%x", numberTo<std::wstring>(static_cast<int>(sc))); + } |