summaryrefslogtreecommitdiff
path: root/freefilesync/ffs_sftp.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_sftp.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_sftp.patch')
-rw-r--r--freefilesync/ffs_sftp.patch2
1 files changed, 2 insertions, 0 deletions
diff --git a/freefilesync/ffs_sftp.patch b/freefilesync/ffs_sftp.patch
index 34dc9ad..056cf91 100644
--- a/freefilesync/ffs_sftp.patch
+++ b/freefilesync/ffs_sftp.patch
@@ -1,3 +1,5 @@
+The upstream author observed that some of the values he uses are not in the libssh2 public headers. I don't know where he uses them from, but I had to replace them here to get this to compile.
+https://github.com/libssh2/libssh2/issues/90
diff -x '*.orig' -x '*.swp' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/fs/sftp.cpp 10.9-1/FreeFileSync/Source/fs/sftp.cpp
--- 10.9-0/FreeFileSync/Source/fs/sftp.cpp 2019-02-10 16:42:29.139040980 -0500
+++ 10.9-1/FreeFileSync/Source/fs/sftp.cpp 2019-02-10 21:28:00.030732089 -0500
bgstack15