summaryrefslogtreecommitdiff
path: root/freefilesync/ffs_old_libcurl.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-02-19 14:57:13 +0000
committerB Stack <bgstack15@gmail.com>2019-02-19 14:57:13 +0000
commitd40d95ecb66387e4c9c0c2a2020eccf5fb46ef14 (patch)
treeb462c777984dcd461c2d230e703fcf3db1fe03ba /freefilesync/ffs_old_libcurl.patch
parentFreeFileSync 10.9 rpm and dpkg (diff)
parentFreeFileSync 10.9-2 for CentOS 7 and Fedora 28-30 (diff)
downloadstackrpms-d40d95ecb66387e4c9c0c2a2020eccf5fb46ef14.tar.gz
stackrpms-d40d95ecb66387e4c9c0c2a2020eccf5fb46ef14.tar.bz2
stackrpms-d40d95ecb66387e4c9c0c2a2020eccf5fb46ef14.zip
Merge branch 'freefilesync-c7' into 'master'
FreeFileSync 10.9-2 for CentOS7 and Fedora 28-30 This is the successful release candidate for FreeFileSync on CentOS7 and Fedora 28-30 from the same spec file. On CentOS 7, the package build and install dependencies include libcurl 7.64.0, libssh2 1.8.0, openssl 1.1.0 (openssl-freefilesync), which are available in the [bgstack15/FreeFileSync](https://copr.fedorainfracloud.org/coprs/bgstack15/FreeFileSync) copr. See merge request bgstack15/stackrpms!38
Diffstat (limited to 'freefilesync/ffs_old_libcurl.patch')
-rw-r--r--freefilesync/ffs_old_libcurl.patch13
1 files changed, 0 insertions, 13 deletions
diff --git a/freefilesync/ffs_old_libcurl.patch b/freefilesync/ffs_old_libcurl.patch
deleted file mode 100644
index e13f1bb..0000000
--- a/freefilesync/ffs_old_libcurl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream uses a libcurl more current than Fedora 29.
-diff -x '*.orig' -x '*.swp' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/fs/libcurl/curl_wrap.h 10.9-1/FreeFileSync/Source/fs/libcurl/curl_wrap.h
---- 10.9-0/FreeFileSync/Source/fs/libcurl/curl_wrap.h 2019-02-10 16:42:29.124040824 -0500
-+++ 10.9-1/FreeFileSync/Source/fs/libcurl/curl_wrap.h 2019-02-10 20:57:30.758315345 -0500
-@@ -75,7 +75,7 @@
- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNKNOWN_OPTION);
- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TELNET_OPTION_SYNTAX);
- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE50);
-- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51);
-+ //ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51);
- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PEER_FAILED_VERIFICATION);
- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_GOT_NOTHING);
- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_ENGINE_NOTFOUND);
bgstack15