diff options
| author | B Stack <bgstack15@gmail.com> | 2020-02-18 16:02:40 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-02-18 16:02:40 +0000 |
| commit | 819051f5d8489d6193a56b5d02c3b9d21fe41775 (patch) | |
| tree | a5aecb01558219c0d302312fd8bc4d4766d2d3e9 /freefilesync/ffs_libssh2.patch | |
| parent | Merge branch 'mktrayicon-bump' into 'master' (diff) | |
| parent | fix libssh2 patch for rpm to match it for dpkg (diff) | |
| download | stackrpms-819051f5d8489d6193a56b5d02c3b9d21fe41775.tar.gz stackrpms-819051f5d8489d6193a56b5d02c3b9d21fe41775.tar.bz2 stackrpms-819051f5d8489d6193a56b5d02c3b9d21fe41775.zip | |
Merge branch 'freefilesync-bump' into 'master'
FreeFileSync 10.20
Closes #14
See merge request bgstack15/stackrpms!126
Diffstat (limited to 'freefilesync/ffs_libssh2.patch')
| -rw-r--r-- | freefilesync/ffs_libssh2.patch | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/freefilesync/ffs_libssh2.patch b/freefilesync/ffs_libssh2.patch index 0abd660..66c6a88 100644 --- a/freefilesync/ffs_libssh2.patch +++ b/freefilesync/ffs_libssh2.patch @@ -22,15 +22,18 @@ Date: 2019-09-17T13:41:23Z } 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.17-1/FreeFileSync/Source/afs/sftp.cpp 2019-10-21 08:46:07.562161269 -0400 -@@ -1588,7 +1588,7 @@ - runSftpCommand(login_, L"libssh2_sftp_mkdir", //throw SysError - [&](const SshSession::Details& sd) //noexcept! - { -- return ::libssh2_sftp_mkdir(sd.sftpChannel, getLibssh2Path(afsPath), LIBSSH2_SFTP_DEFAULT_MODE); -+ return ::libssh2_sftp_mkdir(sd.sftpChannel, getLibssh2Path(afsPath), LIBSSH2_SFTP_S_IRWXU | LIBSSH2_SFTP_S_IRWXG | LIBSSH2_SFTP_S_IRWXO); - //default for newly created directories: 0777 (LIBSSH2_SFTP_S_IRWXU | LIBSSH2_SFTP_S_IRWXG | LIBSSH2_SFTP_S_IRWXO) - }); - } +Message: It appears upstream moved libssh2_wrap, but the above file patches correctly, so we will leave it while adding this new, identical patch. +diff -Naur /usr/src/freefilesync/10.20-0/libssh2/libssh2_wrap.h /usr/src/freefilesync/10.20-1/libssh2/libssh2_wrap.h +--- 10.20-0/libssh2/libssh2_wrap.h 2020-02-15 14:50:08.356617565 -0500 ++++ 10.20-1/libssh2/libssh2_wrap.h 2020-02-15 15:11:25.992842154 -0500 +@@ -172,8 +172,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)); + } |