diff options
| author | B Stack <bgstack15@gmail.com> | 2019-05-12 21:52:38 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2019-05-12 21:52:38 -0400 |
| commit | 6e8925f78b631e337784c7904d22e93ca37643e6 (patch) | |
| tree | 465ae7041d07412550d17f7240ca118b8c95ea47 /freefilesync/debian/patches/ffs_sftp.patch | |
| parent | WIP: waterfox-56.2.9 with some fixes (diff) | |
| download | stackrpms-6e8925f78b631e337784c7904d22e93ca37643e6.tar.gz stackrpms-6e8925f78b631e337784c7904d22e93ca37643e6.tar.bz2 stackrpms-6e8925f78b631e337784c7904d22e93ca37643e6.zip | |
WIP: freefilesync 10.12 rpm and dpkg rc1
Diffstat (limited to 'freefilesync/debian/patches/ffs_sftp.patch')
| -rw-r--r-- | freefilesync/debian/patches/ffs_sftp.patch | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/freefilesync/debian/patches/ffs_sftp.patch b/freefilesync/debian/patches/ffs_sftp.patch index 34dc9ad..c526a22 100644 --- a/freefilesync/debian/patches/ffs_sftp.patch +++ b/freefilesync/debian/patches/ffs_sftp.patch @@ -1,6 +1,8 @@ -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 +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/afs/sftp.cpp 10.9-1/FreeFileSync/Source/afs/sftp.cpp +--- 10.9-0/FreeFileSync/Source/afs/sftp.cpp 2019-02-10 16:42:29.139040980 -0500 ++++ 10.9-1/FreeFileSync/Source/afs/sftp.cpp 2019-02-10 21:28:00.030732089 -0500 @@ -56,9 +56,10 @@ //attention: if operation fails due to time out, e.g. file copy, the cleanup code may hang, too => total delay = 2 x time out interval |