AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added zlib to submodules. Added build and link zlib, libssh in CMakeLists.txt

Browse source
This commit is contained in:
vladimir.kuznetsov 2022-12-06 18:17:10 +03:00
parent a87610c856
commit 3742583508
5 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -28,3 +28,6 @@
[submodule "client/3rd/libssh"] [submodule "client/3rd/libssh"]
path = client/3rd/libssh path = client/3rd/libssh
url = https://git.libssh.org/projects/libssh.git/ url = https://git.libssh.org/projects/libssh.git/
[submodule "client/3rd/zlib"]
path = client/3rd/zlib
url = https://github.com/madler/zlib.git

2
client/3rd/libssh

@ -1 +1 @@
Subproject commit 438cc6df52ca234ba8f04734e628ca74c03b2971 Subproject commit e8322817a9e5aaef0698d779ddd467a209a85d85

1
client/3rd/zlib Submodule

@ -0,0 +1 @@
Subproject commit 04f42ceca40f73e2978b50e93806c2a18c1281fc

12
client/CMakeLists.txt
View file

@ -37,14 +37,20 @@ set(LIBS ${LIBS} SortFilterProxyModel)
include(${CMAKE_CURRENT_LIST_DIR}/3rd/qrcodegen/qrcodegen.cmake) include(${CMAKE_CURRENT_LIST_DIR}/3rd/qrcodegen/qrcodegen.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/3rd/QSimpleCrypto/QSimpleCrypto.cmake) include(${CMAKE_CURRENT_LIST_DIR}/3rd/QSimpleCrypto/QSimpleCrypto.cmake)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/zlib)
set(ZLIB_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/3rd/zlib)
set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/3rd/zlib)
set(WITH_SERVER OFF)
set(WITH_GSSAPI OFF)
set(WITH_EXAMPLES OFF)
set(OPENSSL_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/include)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/libssh)
set(BUILD_WITH_QT6 ON) set(BUILD_WITH_QT6 ON)
set(BUILD_SHARED_LIBS OFF) set(BUILD_SHARED_LIBS OFF)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/qtkeychain) add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/qtkeychain)
set(LIBS ${LIBS} qt6keychain) set(LIBS ${LIBS} qt6keychain)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/libssh/include)
set(LIBS ${LIBS} ssh)
include_directories( include_directories(
${CMAKE_CURRENT_LIST_DIR}/3rd/QSimpleCrypto/include ${CMAKE_CURRENT_LIST_DIR}/3rd/QSimpleCrypto/include
${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/include ${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/include

2
client/core/servercontroller.cpp
View file

@ -410,7 +410,7 @@ ErrorCode ServerController::copyFileToRemoteHost(ssh_session& ssh, sftp_session&
char buffer[SFTP_TRANSFER_CHUNK_SIZE]; char buffer[SFTP_TRANSFER_CHUNK_SIZE];
int length {sizeof (buffer)}; int length {sizeof (buffer)};
file = sftp_open(sftp, remote_path.c_str(), access_type, S_IRWXU); file = sftp_open(sftp, remote_path.c_str(), access_type, 0);//S_IRWXU);
if (file == NULL) { if (file == NULL) {
return ErrorCode::SshSftpError; return ErrorCode::SshSftpError;