diff options
| author | B. Stack <bgstack15@gmail.com> | 2022-06-27 15:57:42 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2022-06-27 15:57:42 +0000 |
| commit | a5edb11a9334edb513e8606824efea1c067153ce (patch) | |
| tree | 744d5d5a840cc83203450b6b4838596003249752 /freefilesync/03_sftp.patch | |
| parent | Merge branch 'scite-bump' into 'master' (diff) | |
| parent | ffs 11.22 rpm rc1 (diff) | |
| download | stackrpms-a5edb11a9334edb513e8606824efea1c067153ce.tar.gz stackrpms-a5edb11a9334edb513e8606824efea1c067153ce.tar.bz2 stackrpms-a5edb11a9334edb513e8606824efea1c067153ce.zip | |
Merge branch 'freefilesync-el8' into 'master'
freefilesync 11.22, and reenable el8 support
See merge request bgstack15/stackrpms!301
Diffstat (limited to 'freefilesync/03_sftp.patch')
| -rw-r--r-- | freefilesync/03_sftp.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/freefilesync/03_sftp.patch b/freefilesync/03_sftp.patch new file mode 100644 index 0000000..a51acc8 --- /dev/null +++ b/freefilesync/03_sftp.patch @@ -0,0 +1,25 @@ +Source: <none> +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: 2021-02-02T18:08:53Z +Version: 11.6 +https://github.com/libssh2/libssh2/issues/90 +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 +- +-const size_t SFTP_OPTIMAL_BLOCK_SIZE_READ = 8 * MAX_SFTP_READ_SIZE; //https://github.com/libssh2/libssh2/issues/90 +-const size_t SFTP_OPTIMAL_BLOCK_SIZE_WRITE = 8 * MAX_SFTP_OUTGOING_SIZE; // +-static_assert(MAX_SFTP_READ_SIZE == 30000 && MAX_SFTP_OUTGOING_SIZE == 30000, "reevaluate optimal block sizes if these constants change!"); ++// these values are all manually derived from https://github.com/libssh2/libssh2/blob/master/src/sftp.h which for some weak reason are not included in the libssh2-devel headers. ++const size_t SFTP_OPTIMAL_BLOCK_SIZE_READ = 8 * 30000; //https://github.com/libssh2/libssh2/issues/90 ++const size_t SFTP_OPTIMAL_BLOCK_SIZE_WRITE = 8 * 30000; // ++//static_assert(MAX_SFTP_READ_SIZE == 30000 && MAX_SFTP_OUTGOING_SIZE == 30000, "reevaluate optimal block sizes if these constants change!"); + + /* Perf Test, Sourceforge frs, SFTP upload, compressed 25 MB test file: + + |