3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 01:08:17 +08:00
Code Issues Projects Releases Wiki Activity

[libssh2] Update to 1.11.1 (#41652)

Browse Source 
Co-authored-by: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com>
This commit is contained in:
Kai Pastor 2024-10-22 07:05:39 +02:00 committed by GitHub
parent 8c2f2d0dc7
commit 6a4359c5c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/cppfs/ssh-dependencies.diff
View File

@ -20,7 +20,7 @@ index aa37eda..d29176a 100644
-find_package(LibSSH2) -find_package(LibSSH2)
-find_package(LibCrypto) -find_package(LibCrypto)
+find_package(LibSSH2 NAMES Libssh2) +find_package(LibSSH2 NAMES libssh2)
find_package(ZLIB) find_package(ZLIB)
find_package(OpenSSL) find_package(OpenSSL)
+set(LibCrypto_FOUND "${OpenSSL_FOUND}") +set(LibCrypto_FOUND "${OpenSSL_FOUND}")
@ -36,7 +36,7 @@ index aa37eda..d29176a 100644
- ${LIBCRYPTO_LIBRARY} - ${LIBCRYPTO_LIBRARY}
- ${ZLIB_LIBRARY} - ${ZLIB_LIBRARY}
+ OpenSSL::SSL + OpenSSL::SSL
+ $<IF:$<TARGET_EXISTS:Libssh2::libssh2_shared>,Libssh2::libssh2_shared,Libssh2::libssh2_static> + libssh2::libssh2
+ OpenSSL::Crypto + OpenSSL::Crypto
+ ZLIB::ZLIB + ZLIB::ZLIB
) )

2
ports/cppfs/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "cppfs", "name": "cppfs",
"version": "1.3.0", "version": "1.3.0",
"port-version": 3, "port-version": 4,
"description": "Cross-platform C++ file system library supporting multiple backends", "description": "Cross-platform C++ file system library supporting multiple backends",
"license": "MIT", "license": "MIT",
"supports": "!uwp", "supports": "!uwp",

16
ports/curl/dependencies.patch
View File

@ -10,7 +10,7 @@ index 7dc1f99..e83617e 100644
+ find_dependency(c-ares CONFIG) + find_dependency(c-ares CONFIG)
+endif() +endif()
+if("@USE_LIBSSH2@") +if("@USE_LIBSSH2@")
+ find_dependency(Libssh2 CONFIG) + find_dependency(libssh2 CONFIG)
+endif() +endif()
+if("@HAVE_BROTLI@") +if("@HAVE_BROTLI@")
+ find_dependency(unofficial-brotli CONFIG) + find_dependency(unofficial-brotli CONFIG)
@ -112,22 +112,18 @@ index dbb0bf4..f1a18d1 100644
if(LIBPSL_FOUND) if(LIBPSL_FOUND)
list(APPEND CURL_LIBS ${LIBPSL_LIBRARIES}) list(APPEND CURL_LIBS ${LIBPSL_LIBRARIES})
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libpsl") list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libpsl")
@@ -1072,7 +1084,13 @@ mark_as_advanced(CURL_USE_LIBSSH2) @@ -1072,7 +1084,9 @@ mark_as_advanced(CURL_USE_LIBSSH2)
set(USE_LIBSSH2 OFF) set(USE_LIBSSH2 OFF)
if(CURL_USE_LIBSSH2) if(CURL_USE_LIBSSH2)
- find_package(Libssh2) - find_package(Libssh2)
+ find_package(LIBSSH2 NAMES Libssh2 REQUIRED) + find_package(LIBSSH2 NAMES libssh2 REQUIRED)
+ if(TARGET Libssh2::libssh2_shared) + set(LIBSSH2_LIBRARIES libssh2::libssh2)
+ set(LIBSSH2_LIBRARIES Libssh2::libssh2_shared)
+ else()
+ set(LIBSSH2_LIBRARIES Libssh2::libssh2_static)
+ endif()
+ get_target_property(LIBSSH2_INCLUDE_DIRS "${LIBSSH2_LIBRARIES}" INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(LIBSSH2_INCLUDE_DIRS "${LIBSSH2_LIBRARIES}" INTERFACE_INCLUDE_DIRECTORIES)
if(LIBSSH2_FOUND) if(LIBSSH2_FOUND)
list(APPEND CURL_LIBS ${LIBSSH2_LIBRARIES}) list(APPEND CURL_LIBS ${LIBSSH2_LIBRARIES})
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libssh2") list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libssh2")
@@ -1121,7 +1139,8 @@ endif() @@ -1121,7 +1135,8 @@ endif()
option(CURL_USE_GSASL "Use libgsasl" OFF) option(CURL_USE_GSASL "Use libgsasl" OFF)
mark_as_advanced(CURL_USE_GSASL) mark_as_advanced(CURL_USE_GSASL)
if(CURL_USE_GSASL) if(CURL_USE_GSASL)
@ -137,7 +133,7 @@ index dbb0bf4..f1a18d1 100644
if(LIBGSASL_FOUND) if(LIBGSASL_FOUND)
list(APPEND CURL_LIBS ${LIBGSASL_LIBRARIES}) list(APPEND CURL_LIBS ${LIBGSASL_LIBRARIES})
list(APPEND CURL_LIBDIRS ${LIBGSASL_LIBRARY_DIRS}) list(APPEND CURL_LIBDIRS ${LIBGSASL_LIBRARY_DIRS})
@@ -1139,7 +1158,10 @@ option(CURL_USE_GSSAPI "Use GSSAPI implementation" OFF) @@ -1139,7 +1154,10 @@ option(CURL_USE_GSSAPI "Use GSSAPI implementation" OFF)
mark_as_advanced(CURL_USE_GSSAPI) mark_as_advanced(CURL_USE_GSSAPI)
if(CURL_USE_GSSAPI) if(CURL_USE_GSSAPI)

2
ports/curl/vcpkg-cmake-wrapper.cmake
View File

@ -28,7 +28,7 @@ if(CURL_FOUND)
if(_curl_link_libraries MATCHES "OpenSSL::") if(_curl_link_libraries MATCHES "OpenSSL::")
string(REGEX REPLACE "([\$]<[^;]*)?OpenSSL::(SSL|Crypto)([^;]*>)?" "${OPENSSL_LIBRARIES}" _curl_link_libraries "${_curl_link_libraries}") string(REGEX REPLACE "([\$]<[^;]*)?OpenSSL::(SSL|Crypto)([^;]*>)?" "${OPENSSL_LIBRARIES}" _curl_link_libraries "${_curl_link_libraries}")
endif() endif()
if(_curl_link_libraries MATCHES "Libssh2::libssh2_(shared|static)") if(_curl_link_libraries MATCHES "libssh2::libssh2")
# TODO: move find_dependency(Libssh2 CONFIG) into CURL config # TODO: move find_dependency(Libssh2 CONFIG) into CURL config
set(_libssh2_target "${CMAKE_MATCH_0}") set(_libssh2_target "${CMAKE_MATCH_0}")
find_package(Libssh2 CONFIG QUIET) find_package(Libssh2 CONFIG QUIET)

1
ports/curl/vcpkg.json
View File

@ -1,6 +1,7 @@
{ {
"name": "curl", "name": "curl",
"version": "8.10.1", "version": "8.10.1",
"port-version": 1,
"description": "A library for transferring data with URLs", "description": "A library for transferring data with URLs",
"homepage": "https://curl.se/", "homepage": "https://curl.se/",
"license": "curl AND ISC AND BSD-3-Clause", "license": "curl AND ISC AND BSD-3-Clause",

9
ports/libssh2/portfile.cmake
View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO libssh2/libssh2 REPO libssh2/libssh2
REF "libssh2-${VERSION}" REF "libssh2-${VERSION}"
SHA512 8ae38d76e7fae82843c7c6990760ad5827cb55e2aba096f684b832016614d76983d1871ae0857ba28efcb9fd65018ae0b34420f6841da6bb6c6ccebd9689ec0f SHA512 616efcd7f5c1fb1046104ebce70549e4756e2a55150efa2df5bb7123051d3bf336023cedcbfe932cd7c690a0b4d1f1a93c760ea39f1dba50c2b06d0945dca958
HEAD_REF master HEAD_REF master
) )
@ -42,11 +42,8 @@ vcpkg_fixup_pkgconfig()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libssh2) vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libssh2)
if (VCPKG_TARGET_IS_WINDOWS) 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")
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "defined(_WINDLL)" "1")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef _WINDLL" "if 1" IGNORE_UNCHANGED)
else()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef _WINDLL" "if 0" IGNORE_UNCHANGED)
endif() endif()
if(VCPKG_TARGET_STATIC_LIBRARY_PREFIX STREQUAL "") if(VCPKG_TARGET_STATIC_LIBRARY_PREFIX STREQUAL "")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libssh2.pc" " -lssh2" " -llibssh2") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libssh2.pc" " -lssh2" " -llibssh2")

4
ports/libssh2/usage
View File

@ -1,4 +1,4 @@
libssh2 provides CMake targets: libssh2 provides CMake targets:
find_package(Libssh2 CONFIG REQUIRED) find_package(libssh2 CONFIG REQUIRED)
target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:Libssh2::libssh2_shared>,Libssh2::libssh2_shared,Libssh2::libssh2_static>) target_link_libraries(main PRIVATE libssh2::libssh2)

3
ports/libssh2/vcpkg.json
View File

@ -1,7 +1,6 @@
{ {
"name": "libssh2", "name": "libssh2",
"version": "1.11.0", "version": "1.11.1",
"port-version": 2,
"description": "libssh2 is a client-side C library implementing the SSH2 protocol.", "description": "libssh2 is a client-side C library implementing the SSH2 protocol.",
"homepage": "https://www.libssh2.org", "homepage": "https://www.libssh2.org",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",

8
versions/baseline.json
View File

@ -1950,7 +1950,7 @@
}, },
"cppfs": { "cppfs": {
"baseline": "1.3.0", "baseline": "1.3.0",
"port-version": 3 "port-version": 4
}, },
"cppgraphqlgen": { "cppgraphqlgen": {
"baseline": "4.5.7", "baseline": "4.5.7",
@ -2126,7 +2126,7 @@
}, },
"curl": { "curl": {
"baseline": "8.10.1", "baseline": "8.10.1",
"port-version": 0 "port-version": 1
}, },
"curlcpp": { "curlcpp": {
"baseline": "3.1", "baseline": "3.1",
@ -5133,8 +5133,8 @@
"port-version": 0 "port-version": 0
}, },
"libssh2": { "libssh2": {
"baseline": "1.11.0", "baseline": "1.11.1",
"port-version": 2 "port-version": 0
}, },
"libstemmer": { "libstemmer": {
"baseline": "2021.2.2.0", "baseline": "2021.2.2.0",

5
versions/c-/cppfs.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "e705e7775f54232e723bcf5bb8fefb55ed4e715f",
"version": "1.3.0",
"port-version": 4
},
{ {
"git-tree": "effae8e598d06cff2d1c7b0a084e6394ff1ee6ed", "git-tree": "effae8e598d06cff2d1c7b0a084e6394ff1ee6ed",
"version": "1.3.0", "version": "1.3.0",

5
versions/c-/curl.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "31d4981751582248fd2983bcadc540584a906a9a",
"version": "8.10.1",
"port-version": 1
},
{ {
"git-tree": "9fa54a801b36fad7852cd4174d00fd3e5675abdb", "git-tree": "9fa54a801b36fad7852cd4174d00fd3e5675abdb",
"version": "8.10.1", "version": "8.10.1",

5
versions/l-/libssh2.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "0711b8dc1f6946f612076f4b60a60fa022e8e8e7",
"version": "1.11.1",
"port-version": 0
},
{ {
"git-tree": "6963d92a0f19203e7f8d4369b089cc4d1b613782", "git-tree": "6963d92a0f19203e7f8d4369b089cc4d1b613782",
"version": "1.11.0", "version": "1.11.0",