From fcb2226b976880e80f8bc4fdbd09d06d2a9e8d72 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 2 Feb 2021 13:33:22 -0500 Subject: ffs 11.6 rc1 --- freefilesync/debian/patches/ffs_sftp.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'freefilesync/debian/patches/ffs_sftp.patch') diff --git a/freefilesync/debian/patches/ffs_sftp.patch b/freefilesync/debian/patches/ffs_sftp.patch index 09e6655..a51acc8 100644 --- a/freefilesync/debian/patches/ffs_sftp.patch +++ b/freefilesync/debian/patches/ffs_sftp.patch @@ -1,13 +1,14 @@ Source: Author: B Stack Message: 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. -Date: 2019-02-11T12:15:59Z +Date: 2021-02-02T18:08:53Z +Version: 11.6 https://github.com/libssh2/libssh2/issues/90 -diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/afs/sftp.cpp 10.24-1/FreeFileSync/Source/afs/sftp.cpp ---- 10.24-0/FreeFileSync/Source/afs/sftp.cpp 2020-05-17 11:01:12.821889929 -0400 -+++ 10.24-1/FreeFileSync/Source/afs/sftp.cpp 2020-05-17 11:37:50.229446467 -0400 -@@ -63,10 +63,10 @@ - LIBSSH2_SFTP_S_IROTH | LIBSSH2_SFTP_S_IXOTH; +diff -aur -x '*.git*' -x '.*.swp' -x '*.orig' -x '*.rej' 11.6-0/FreeFileSync/Source/afs/sftp.cpp 11.6-1/FreeFileSync/Source/afs/sftp.cpp +--- 11.6-0/FreeFileSync/Source/afs/sftp.cpp 2021-02-02 11:37:38.589717171 -0500 ++++ 11.6-1/FreeFileSync/Source/afs/sftp.cpp 2021-02-02 13:06:45.782113785 -0500 +@@ -66,10 +66,10 @@ + LIBSSH2_SFTP_S_IRWXO; //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 - @@ -21,3 +22,4 @@ diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/afs/sf /* Perf Test, Sourceforge frs, SFTP upload, compressed 25 MB test file: + -- cgit