early-access version 2853
This commit is contained in:
pineappleEA
64
externals/vcpkg/ports/libssh2/0001-Fix-UWP.patch
vendored
Executable file
64
externals/vcpkg/ports/libssh2/0001-Fix-UWP.patch
vendored
Executable file
@@ -0,0 +1,64 @@
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 6401acf..64de3e9 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -349,7 +349,7 @@ target_include_directories(libssh2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
|
||||
# Check for the OS.
|
||||
# Daniel's note: this should not be necessary and we need to work to
|
||||
# get this removed.
|
||||
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
||||
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" OR ${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore")
|
||||
target_compile_definitions(libssh2 PRIVATE LIBSSH2_WIN32)
|
||||
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
|
||||
target_compile_definitions(libssh2 PRIVATE LIBSSH2_DARWIN)
|
||||
diff --git a/src/agent.c b/src/agent.c
|
||||
index c2ba422..f1799f8 100644
|
||||
--- a/src/agent.c
|
||||
+++ b/src/agent.c
|
||||
@@ -55,6 +55,10 @@
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
|
||||
+#define IS_UWP 1
|
||||
+#endif /* #if defined(WINAPI_FAMILY) */
|
||||
+
|
||||
/* Requests from client to agent for protocol 1 key operations */
|
||||
#define SSH_AGENTC_REQUEST_RSA_IDENTITIES 1
|
||||
#define SSH_AGENTC_RSA_CHALLENGE 3
|
||||
@@ -254,7 +258,7 @@ struct agent_ops agent_ops_unix = {
|
||||
};
|
||||
#endif /* PF_UNIX */
|
||||
|
||||
-#ifdef WIN32
|
||||
+#if defined(WIN32) && !defined(IS_UWP)
|
||||
/* Code to talk to Pageant was taken from PuTTY.
|
||||
*
|
||||
* Portions copyright Robert de Bath, Joris van Rantwijk, Delian
|
||||
@@ -362,8 +366,8 @@ static struct {
|
||||
const char *name;
|
||||
struct agent_ops *ops;
|
||||
} supported_backends[] = {
|
||||
-#ifdef WIN32
|
||||
- {"Pageant", &agent_ops_pageant},
|
||||
+#if defined(WIN32) && !defined(IS_UWP)
|
||||
+ {"Pageant", &agent_ops_pageant},
|
||||
{"OpenSSH", &agent_ops_openssh},
|
||||
#endif /* WIN32 */
|
||||
#ifdef PF_UNIX
|
||||
diff --git a/src/agent_win.c b/src/agent_win.c
|
||||
--- a/src/agent_win.c
|
||||
+++ b/src/agent_win.c
|
||||
@@ -55,7 +55,11 @@
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
-#ifdef WIN32
|
||||
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
|
||||
+#define IS_UWP 1
|
||||
+#endif /* #if defined(WINAPI_FAMILY) */
|
||||
+
|
||||
+#if defined(WIN32) && !defined(IS_UWP)
|
||||
/* Code to talk to OpenSSH was taken and modified from the Win32 port of
|
||||
* Portable OpenSSH by the PowerShell team. Commit
|
||||
* 8ab565c53f3619d6a1f5ac229e212cad8a52852c of
|
||||
19
externals/vcpkg/ports/libssh2/0002-fix-macros.patch
vendored
Executable file
19
externals/vcpkg/ports/libssh2/0002-fix-macros.patch
vendored
Executable file
@@ -0,0 +1,19 @@
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 2539607..eceb5a0 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -355,9 +355,12 @@ target_include_directories(libssh2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
|
||||
# Daniel's note: this should not be necessary and we need to work to
|
||||
# get this removed.
|
||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" OR ${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore")
|
||||
- target_compile_definitions(libssh2 PRIVATE LIBSSH2_WIN32)
|
||||
+ target_compile_definitions(libssh2 PUBLIC LIBSSH2_WIN32)
|
||||
+ if (BUILD_SHARED_LIBS)
|
||||
+ target_compile_definitions(libssh2 PUBLIC _WINDLL PRIVATE LIBSSH2_LIBRARY)
|
||||
+ endif()
|
||||
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
|
||||
- target_compile_definitions(libssh2 PRIVATE LIBSSH2_DARWIN)
|
||||
+ target_compile_definitions(libssh2 PUBLIC LIBSSH2_DARWIN)
|
||||
endif()
|
||||
|
||||
if(MSVC)
|
||||
13
externals/vcpkg/ports/libssh2/0003-fix-openssl3.patch
vendored
Executable file
13
externals/vcpkg/ports/libssh2/0003-fix-openssl3.patch
vendored
Executable file
@@ -0,0 +1,13 @@
|
||||
diff --git a/cmake/max_warnings.cmake b/cmake/max_warnings.cmake
|
||||
index b176d30..e986461 100644
|
||||
--- a/cmake/max_warnings.cmake
|
||||
+++ b/cmake/max_warnings.cmake
|
||||
@@ -13,6 +13,8 @@ if(MSVC)
|
||||
|
||||
# Disable broken warnings
|
||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996")
|
||||
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996")
|
||||
elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
|
||||
if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
|
||||
50
externals/vcpkg/ports/libssh2/portfile.cmake
vendored
Executable file
50
externals/vcpkg/ports/libssh2/portfile.cmake
vendored
Executable file
@@ -0,0 +1,50 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO libssh2/libssh2
|
||||
REF libssh2-1.10.0
|
||||
SHA512 615E28880695911F5700CC7AC3DDA6B894384C0B1D8B02B53C2EB58F1839F47211934A292F490AD7DDEF7E63F332E0EBF44F8E6334F64BE8D143C72032356C1F
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
0001-Fix-UWP.patch
|
||||
0002-fix-macros.patch
|
||||
0003-fix-openssl3.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
zlib ENABLE_ZLIB_COMPRESSION
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DBUILD_EXAMPLES=OFF
|
||||
-DBUILD_TESTING=OFF
|
||||
${FEATURE_OPTIONS}
|
||||
OPTIONS_DEBUG
|
||||
-DENABLE_DEBUG_LOGGING=OFF
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libssh2)
|
||||
|
||||
if (VCPKG_TARGET_IS_WINDOWS)
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef LIBSSH2_WIN32" "if 1")
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef _WINDLL" "if 1")
|
||||
else()
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef _WINDLL" "if 0")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
# Do not delete the entire share directory as it contains the *-config.cmake files
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man")
|
||||
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
30
externals/vcpkg/ports/libssh2/vcpkg.json
vendored
Executable file
30
externals/vcpkg/ports/libssh2/vcpkg.json
vendored
Executable file
@@ -0,0 +1,30 @@
|
||||
{
|
||||
"name": "libssh2",
|
||||
"version": "1.10.0",
|
||||
"port-version": 4,
|
||||
"description": "libssh2 is a client-side C library implementing the SSH2 protocol.",
|
||||
"homepage": "https://www.libssh2.org",
|
||||
"license": "BSD-3-Clause",
|
||||
"dependencies": [
|
||||
"openssl",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
],
|
||||
"default-features": [
|
||||
"zlib"
|
||||
],
|
||||
"features": {
|
||||
"zlib": {
|
||||
"description": "Use compressing via zlib",
|
||||
"dependencies": [
|
||||
"zlib"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user