summaryrefslogtreecommitdiff
path: root/freefilesync/ffs_curl.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-03-23 15:05:23 +0000
committerB Stack <bgstack15@gmail.com>2020-03-23 15:05:23 +0000
commitb174e8328fc727df2beb2f4ba364c110ca68e56c (patch)
tree2813eb630c4be310b83db09eb0834e2a0b71ab31 /freefilesync/ffs_curl.patch
parentMerge branch 'waterfox-bump' into 'master' (diff)
parent10.22 rpm rc1 (diff)
downloadstackrpms-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/ffs_curl.patch')
-rw-r--r--freefilesync/ffs_curl.patch52
1 files changed, 6 insertions, 46 deletions
diff --git a/freefilesync/ffs_curl.patch b/freefilesync/ffs_curl.patch
index 4c584fe..fee8b13 100644
--- a/freefilesync/ffs_curl.patch
+++ b/freefilesync/ffs_curl.patch
@@ -21,59 +21,19 @@ diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/a
=> 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/FreeFileSync/Source/afs/libcurl/curl_wrap.h 10.20-1/FreeFileSync/Source/afs/libcurl/curl_wrap.h
---- 10.20-0/FreeFileSync/Source/afs/libcurl/curl_wrap.h 2019-11-20 07:57:22.146753270 -0500
-+++ 10.20-1/FreeFileSync/Source/afs/libcurl/curl_wrap.h 2020-02-18 07:26:34.057709413 -0500
-@@ -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)));
- }
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-18 07:23:30.008454286 -0500
-+++ 10.20-1/libcurl/curl_wrap.h 2020-02-18 07:25:34.397984509 -0500
-@@ -17,7 +17,8 @@
- //-------------------------------------------------
-
- #ifndef CURLINC_CURL_H
-- #error curl.h header guard changed
-+ // disable for Fedora <= 30
-+ //#error curl.h header guard changed
- #endif
-
- namespace zen
-@@ -134,11 +135,11 @@
+[bgirton@fc31x-01a|/usr/src/freefilesync]$ diff -x '*.swp' -x '*.rej' -x '*.orig' -Naur 10.22-[01]/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);
-+ //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);
}
-- static_assert(CURL_LAST == CURLE_HTTP3 + 1);
-+ //static_assert(CURL_LAST == CURLE_HTTP3 + 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)));
}
bgstack15