diff options
| author | B Stack <bgstack15@gmail.com> | 2019-09-18 12:38:01 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2019-09-18 12:38:01 +0000 |
| commit | b09d20f3fc6c932ca39ddb17e421a80b4ee8c485 (patch) | |
| tree | 9ebd15eda3680efbb09f961344026c1a42108a91 /freefilesync/debian/patches/ffs_libssh2.patch | |
| parent | Merge branch 'libssh2-bump' into 'master' (diff) | |
| parent | actually bump ffs version to 10.16 in rpm (diff) | |
| download | stackrpms-b09d20f3fc6c932ca39ddb17e421a80b4ee8c485.tar.gz stackrpms-b09d20f3fc6c932ca39ddb17e421a80b4ee8c485.tar.bz2 stackrpms-b09d20f3fc6c932ca39ddb17e421a80b4ee8c485.zip | |
Merge branch 'freefilesync-bump' into 'master'
FreeFileSync 10.16
See merge request bgstack15/stackrpms!89
Diffstat (limited to 'freefilesync/debian/patches/ffs_libssh2.patch')
| -rw-r--r-- | freefilesync/debian/patches/ffs_libssh2.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/freefilesync/debian/patches/ffs_libssh2.patch b/freefilesync/debian/patches/ffs_libssh2.patch index 4fc1497..d901cf5 100644 --- a/freefilesync/debian/patches/ffs_libssh2.patch +++ b/freefilesync/debian/patches/ffs_libssh2.patch @@ -5,6 +5,24 @@ Method: sed -e 's/LIBSSH2_SFTP_DEFAULT_MODE/LIBSSH2_SFTP_S_IRWXU | LIBSSH2_SFTP_S_IRWXG | LIBSSH2_SFTP_S_IRWXO/g' -i 'FreeFileSync/Source/afs/sftp.cpp' +Source: <none> +Author: B Stack +Message: libssh2 v1.8.0 does not yet implement these two error messages. I do not know why distros are not serving libssh2 v1.9.0 which wa released June 20, 2019. +Date: 2019-09-17T13:41:23Z +diff -x '*.orig' -x '*.swp' -x '.git*' -Naur 10.16-0/FreeFileSync/Source/afs/sftp.cpp 10.16-1/FreeFileSync/Source/afs/sftp.cpp +--- 10.16-0/FreeFileSync/Source/afs/sftp.cpp 2019-09-17 07:56:37.359051676 -0400 ++++ 10.16-1/FreeFileSync/Source/afs/sftp.cpp 2019-09-17 09:30:59.293824626 -0400 +@@ -218,8 +218,8 @@ + ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_ENCRYPT); + ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_BAD_SOCKET); + ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_KNOWN_HOSTS); +- ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_CHANNEL_WINDOW_FULL); +- ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_KEYFILE_AUTH_FAILED); ++ //ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_CHANNEL_WINDOW_FULL); ++ //ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_KEYFILE_AUTH_FAILED); + } + return replaceCpy<std::wstring>(L"SSH status %x.", L"%x", numberTo<std::wstring>(sc)); + } diff -x '*.swp' -x .git -Naur 10.10-0/FreeFileSync/Source/afs/sftp.cpp 10.10-1/FreeFileSync/Source/afs/sftp.cpp --- 10.10-0/FreeFileSync/Source/afs/sftp.cpp 2019-03-12 08:09:58.465098982 -0400 +++ 10.10-1/FreeFileSync/Source/afs/sftp.cpp 2019-03-12 08:27:05.718963710 -0400 |