summaryrefslogtreecommitdiff
path: root/freefilesync/ffs_sftp.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-05-13 12:45:32 +0000
committerB Stack <bgstack15@gmail.com>2019-05-13 12:45:32 +0000
commit7fb4ebc037c37f06ca3a25289cc11d17ca2ddc7d (patch)
treeef8aa66b7c1a56f73ea7cf3453123fb6a5845747 /freefilesync/ffs_sftp.patch
parentWIP: waterfox-56.2.9 with some fixes (diff)
parentfreefilesync 10.12 dpkg (diff)
downloadstackrpms-7fb4ebc037c37f06ca3a25289cc11d17ca2ddc7d.tar.gz
stackrpms-7fb4ebc037c37f06ca3a25289cc11d17ca2ddc7d.tar.bz2
stackrpms-7fb4ebc037c37f06ca3a25289cc11d17ca2ddc7d.zip
Merge branch 'freefilesync-bump' into 'master'
freefilesync 10.12 See merge request bgstack15/stackrpms!57
Diffstat (limited to 'freefilesync/ffs_sftp.patch')
-rw-r--r--freefilesync/ffs_sftp.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/freefilesync/ffs_sftp.patch b/freefilesync/ffs_sftp.patch
index 056cf91..c526a22 100644
--- a/freefilesync/ffs_sftp.patch
+++ b/freefilesync/ffs_sftp.patch
@@ -1,8 +1,8 @@
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
+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
bgstack15