diff options
| author | B Stack <bgstack15@gmail.com> | 2019-03-13 15:11:55 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2019-03-13 15:11:55 +0000 |
| commit | a19ded9efc54c53c83980ae48bbf78b3adf4b889 (patch) | |
| tree | ec01f6b1b4e944f8d945f5557e70101e43a26888 /freefilesync/debian/patches | |
| parent | Merge branch 'move-dpkg' into 'master' (diff) | |
| parent | Freefilesync 10.10 (diff) | |
| download | stackrpms-a19ded9efc54c53c83980ae48bbf78b3adf4b889.tar.gz stackrpms-a19ded9efc54c53c83980ae48bbf78b3adf4b889.tar.bz2 stackrpms-a19ded9efc54c53c83980ae48bbf78b3adf4b889.zip | |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 10.10
See merge request bgstack15/stackrpms!46
Diffstat (limited to 'freefilesync/debian/patches')
| -rw-r--r-- | freefilesync/debian/patches/ffs_libssh2.patch | 21 | ||||
| -rw-r--r-- | freefilesync/debian/patches/series | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/freefilesync/debian/patches/ffs_libssh2.patch b/freefilesync/debian/patches/ffs_libssh2.patch new file mode 100644 index 0000000..81287a3 --- /dev/null +++ b/freefilesync/debian/patches/ffs_libssh2.patch @@ -0,0 +1,21 @@ +Source: https://aur.archlinux.org/cgit/aur.git/commit/?h=freefilesync&id=7e1524db8e0243ff9d7b7dcba64a3a5228295725 +Author: Simon Brulhart +Message: libssh2 v1.8.0 does not yet implement LIBSSH2_SFTP_DEFAULT_MODE, revert to previous impl. +Method: + + sed -e 's/LIBSSH2_SFTP_DEFAULT_MODE/LIBSSH2_SFTP_S_IRWXU | LIBSSH2_SFTP_S_IRWXG | LIBSSH2_SFTP_S_IRWXO/g' -i 'FreeFileSync/Source/fs/sftp.cpp' + +diff -x '*.swp' -x .git -Naur 10.10-0/FreeFileSync/Source/fs/sftp.cpp 10.10-1/FreeFileSync/Source/fs/sftp.cpp +--- 10.10-0/FreeFileSync/Source/fs/sftp.cpp 2019-03-12 08:09:58.465098982 -0400 ++++ 10.10-1/FreeFileSync/Source/fs/sftp.cpp 2019-03-12 08:27:05.718963710 -0400 +@@ -1657,8 +1657,8 @@ + runSftpCommand(login_, L"libssh2_sftp_mkdir", //throw SysError + [&](const SshSession::Details& sd) //noexcept! + { +-#if 1 //let's see how LIBSSH2_SFTP_DEFAULT_MODE works out: +- return ::libssh2_sftp_mkdir(sd.sftpChannel, getLibssh2Path(afsPath).c_str(), LIBSSH2_SFTP_DEFAULT_MODE); ++#if 1 //let's see how LIBSSH2_SFTP_S_IRWXU | LIBSSH2_SFTP_S_IRWXG | LIBSSH2_SFTP_S_IRWXO works out: ++ return ::libssh2_sftp_mkdir(sd.sftpChannel, getLibssh2Path(afsPath).c_str(), LIBSSH2_SFTP_S_IRWXU | LIBSSH2_SFTP_S_IRWXG | LIBSSH2_SFTP_S_IRWXO); + #else //default for newly created directories: 0777 + return ::libssh2_sftp_mkdir(sd.sftpChannel, getLibssh2Path(afsPath).c_str(), LIBSSH2_SFTP_S_IRWXU | LIBSSH2_SFTP_S_IRWXG | LIBSSH2_SFTP_S_IRWXO); + #endif diff --git a/freefilesync/debian/patches/series b/freefilesync/debian/patches/series index 2dbed63..dcbf30c 100644 --- a/freefilesync/debian/patches/series +++ b/freefilesync/debian/patches/series @@ -5,3 +5,4 @@ ffs_no_check_updates.patch ffs_no_wx311.patch ffs_old_libcurl.patch ffs_sftp.patch +ffs_libssh2.patch |