From f80fc82ff61ea19621f4ac4603d342d1344d5b9b Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Thu, 9 Sep 2021 17:48:43 +0800 Subject: [PATCH 01/17] [libssh/libssh2/libssh2] update to the latest version --- ports/libressl/portfile.cmake | 11 +-- ports/libressl/vcpkg.json | 12 ++- ports/libssh/0002-mingw_for_Android.patch | 29 +++--- .../0003-create_symlink_unix_only.patch | 33 ++++--- ports/libssh/portfile.cmake | 27 +++-- ports/libssh/vcpkg.json | 11 ++- ports/libssh2/0001-Fix-UWP.patch | 98 ++++++++++--------- ports/libssh2/fix-dellexport.patch | 16 +++ ports/libssh2/fix-pkgconfig.patch | 12 +++ ports/libssh2/portfile.cmake | 29 +++--- ports/libssh2/vcpkg.json | 11 ++- 11 files changed, 170 insertions(+), 119 deletions(-) create mode 100644 ports/libssh2/fix-dellexport.patch create mode 100644 ports/libssh2/fix-pkgconfig.patch diff --git a/ports/libressl/portfile.cmake b/ports/libressl/portfile.cmake index 7483e02c880e92..01b1ed8dd8dd59 100644 --- a/ports/libressl/portfile.cmake +++ b/ports/libressl/portfile.cmake @@ -6,8 +6,8 @@ endif() vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") -set(LIBRESSL_VERSION 3.3.3) -set(LIBRESSL_HASH 2d0b5f4cfe37d573bc64d5967abb77f536dbe581fbad9637d925332bcdfd185fe6810335b2af80a89f92d7e6edaa8ea3ba2492c60a117e47ea1b2d6aacf01f0f) +set(LIBRESSL_VERSION 3.3.4) +set(LIBRESSL_HASH 11defdde8169d3653c24e149e698ffc5a8ead5ac0808111d1986cb11ef72e9912c463d4891d4635877021e73a8a045dbdbe5e83ec785a59150f170d2ca2031de) vcpkg_download_distfile( LIBRESSL_SOURCE_ARCHIVE @@ -30,9 +30,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "tools" LIBRESSL_APPS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DLIBRESSL_TESTS=OFF @@ -40,7 +39,7 @@ vcpkg_configure_cmake( -DLIBRESSL_APPS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() if("tools" IN_LIST FEATURES) if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) diff --git a/ports/libressl/vcpkg.json b/ports/libressl/vcpkg.json index 59c18243c2fb50..ff08a3b587b5e4 100644 --- a/ports/libressl/vcpkg.json +++ b/ports/libressl/vcpkg.json @@ -1,8 +1,18 @@ { "name": "libressl", - "version": "3.3.3", + "version": "3.3.4", "description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.", "supports": "!(uwp | arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "tools": { "description": "Build openssl and ocspcheck executables" diff --git a/ports/libssh/0002-mingw_for_Android.patch b/ports/libssh/0002-mingw_for_Android.patch index 973f6eafa9671b..7b5ba303fb90ad 100644 --- a/ports/libssh/0002-mingw_for_Android.patch +++ b/ports/libssh/0002-mingw_for_Android.patch @@ -1,16 +1,13 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index ccf5a33..8e88494 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -361,9 +361,9 @@ if (WITH_VISIBILITY_HIDDEN) - set_target_properties(ssh PROPERTIES COMPILE_FLAGS "-fvisibility=hidden") - endif (WITH_VISIBILITY_HIDDEN) - --if (MINGW) -+if (MINGW AND NOT ANDROID) - set_target_properties(ssh PROPERTIES LINK_FLAGS "-Wl,--enable-stdcall-fixup") -- set_target_properties(ssh PROPERTIES COMPILE_FLAGS "-D_POSIX_SOURCE") -+ set_property(TARGET ssh APPEND PROPERTY COMPILE_FLAGS "-D_POSIX_SOURCE") - endif () - - +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index a576cf7..1f6a048 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -359,7 +359,7 @@ if (WITH_VISIBILITY_HIDDEN) + set_target_properties(ssh PROPERTIES C_VISIBILITY_PRESET hidden) + endif (WITH_VISIBILITY_HIDDEN) + +-if (MINGW) ++if (MINGW AND NOT ANDROID) + target_link_libraries(ssh PRIVATE "-Wl,--enable-stdcall-fixup") + target_compile_definitions(ssh PRIVATE "_POSIX_SOURCE") + endif () diff --git a/ports/libssh/0003-create_symlink_unix_only.patch b/ports/libssh/0003-create_symlink_unix_only.patch index 140d7e1c8449fc..1ac60e1f5a42a9 100644 --- a/ports/libssh/0003-create_symlink_unix_only.patch +++ b/ports/libssh/0003-create_symlink_unix_only.patch @@ -1,16 +1,17 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1f5b0bf..6559468 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -206,9 +206,11 @@ endif (WITH_SYMBOL_VERSIONING AND ABIMAP_FOUND) - add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source DEPENDS ${_SYMBOL_TARGET}) - - # Link compile database for clangd -+if(UNIX) - execute_process(COMMAND cmake -E create_symlink - "${CMAKE_BINARY_DIR}/compile_commands.json" - "${CMAKE_SOURCE_DIR}/compile_commands.json") -+endif() - - message(STATUS "********************************************") - message(STATUS "********** ${PROJECT_NAME} build options : **********") +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 53e6bd5..51d76c5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -231,10 +231,11 @@ endif (WITH_SYMBOL_VERSIONING AND ABIMAP_FOUND) + add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source DEPENDS ${_SYMBOL_TARGET} VERBATIM) + + # Link compile database for clangd ++if(UNIX) + execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink + "${CMAKE_BINARY_DIR}/compile_commands.json" + "${CMAKE_SOURCE_DIR}/compile_commands.json") +- ++endif() + message(STATUS "********************************************") + message(STATUS "********** ${PROJECT_NAME} build options : **********") + diff --git a/ports/libssh/portfile.cmake b/ports/libssh/portfile.cmake index c15cc0a9c1d602..de552fd110daa8 100644 --- a/ports/libssh/portfile.cmake +++ b/ports/libssh/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://git.libssh.org/projects/libssh.git - REF 9c4af47965d284b2de26407bcd80473aba4ee4c9 # REFERENCE VERSION 0.9.5 + REF 47fd6e56c1058dca54afee1638c11fb6ec41911d # REFERENCE VERSION 0.9.6 SHA512 64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18 PATCHES 0001-export-pkgconfig-file.patch @@ -13,8 +13,8 @@ vcpkg_from_git( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - mbedtls WITH_MBEDTLS - zlib WITH_ZLIB + mbedtls WITH_MBEDTLS + zlib WITH_ZLIB ) if (VCPKG_TARGET_IS_ANDROID) @@ -23,9 +23,8 @@ if (VCPKG_TARGET_IS_ANDROID) ) endif () -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${EXTRA_ARGS} ${FEATURE_OPTIONS} @@ -36,8 +35,8 @@ vcpkg_configure_cmake( -DWITH_NACL=OFF -DWITH_GSSAPI=OFF) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_copy_pdbs() #Fixup pthread naming if(NOT VCPKG_TARGET_IS_MINGW AND VCPKG_TARGET_IS_WINDOWS) @@ -49,9 +48,9 @@ endif() vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/include/libssh/libssh.h + "${CURRENT_PACKAGES_DIR}/include/libssh/libssh.h" "#ifdef LIBSSH_STATIC" "#if 1" ) @@ -59,12 +58,12 @@ endif() if(VCPKG_TARGET_IS_WINDOWS) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/share/libssh/libssh-config.cmake + "${CURRENT_PACKAGES_DIR}/share/libssh/libssh-config.cmake" ".dll" ".lib" ) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libssh/vcpkg.json b/ports/libssh/vcpkg.json index 47669c5a226fbd..6a75d94d29e9d0 100644 --- a/ports/libssh/vcpkg.json +++ b/ports/libssh/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libssh", - "version-string": "0.9.5", - "port-version": 6, + "version-string": "0.9.6", "description": "libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side", "homepage": "https://www.libssh.org/", "supports": "!(uwp | arm)", @@ -13,6 +12,14 @@ "mbedtls" ], "platform": "android" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ diff --git a/ports/libssh2/0001-Fix-UWP.patch b/ports/libssh2/0001-Fix-UWP.patch index 270dd7b9038fc5..3dfdc2787a5c01 100644 --- a/ports/libssh2/0001-Fix-UWP.patch +++ b/ports/libssh2/0001-Fix-UWP.patch @@ -1,48 +1,50 @@ -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 -@@ -51,6 +51,10 @@ - #include "userauth.h" - #include "session.h" - -+#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}, - #endif /* WIN32 */ - #ifdef PF_UNIX - {"Unix", &agent_ops_unix}, +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index eee1a80..2539607 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -354,7 +354,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 85c3e34..19768d4 100644 +--- a/src/agent.c ++++ b/src/agent.c +@@ -55,6 +55,10 @@ + #include + #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 +@@ -245,7 +249,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 +@@ -354,9 +358,9 @@ static struct { + const char *name; + struct agent_ops *ops; + } supported_backends[] = { +-#ifdef WIN32 +- {"Pageant", &agent_ops_pageant}, +- {"OpenSSH", &agent_ops_openssh}, ++#if defined(WIN32) && !defined(IS_UWP) ++ {"Pageant", &agent_ops_pageant}, ++ {"OpenSSH", &agent_ops_openssh}, + #endif /* WIN32 */ + #ifdef PF_UNIX + {"Unix", &agent_ops_unix}, diff --git a/ports/libssh2/fix-dellexport.patch b/ports/libssh2/fix-dellexport.patch new file mode 100644 index 00000000000000..3203c3b2f6dc71 --- /dev/null +++ b/ports/libssh2/fix-dellexport.patch @@ -0,0 +1,16 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d9f3a37..ce9712c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -354,9 +354,9 @@ 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 PRIVATE LIBSSH2_WIN32 _WINDLL) + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") +- target_compile_definitions(libssh2 PRIVATE LIBSSH2_DARWIN) ++ target_compile_definitions(libssh2 PRIVATE LIBSSH2_DARWIN _WINDLL) + endif() + + if(MSVC) diff --git a/ports/libssh2/fix-pkgconfig.patch b/ports/libssh2/fix-pkgconfig.patch new file mode 100644 index 00000000000000..a9f4e2a38ceef1 --- /dev/null +++ b/ports/libssh2/fix-pkgconfig.patch @@ -0,0 +1,12 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 3965bb8..ce9712c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -68,7 +68,6 @@ if(CRYPTO_BACKEND STREQUAL "OpenSSL" OR NOT CRYPTO_BACKEND) + list(APPEND PRIVATE_COMPILE_DEFINITIONS LIBSSH2_OPENSSL) + list(APPEND PRIVATE_INCLUDE_DIRECTORIES ${OPENSSL_INCLUDE_DIR}) + list(APPEND LIBRARIES ${OPENSSL_LIBRARIES}) +- list(APPEND PC_REQUIRES_PRIVATE libssl libcrypto) + + if (WIN32) + # Statically linking to OpenSSL requires crypt32 for some Windows APIs. diff --git a/ports/libssh2/portfile.cmake b/ports/libssh2/portfile.cmake index 0922bb7c8bcabe..8b47fe070e32e9 100644 --- a/ports/libssh2/portfile.cmake +++ b/ports/libssh2/portfile.cmake @@ -1,14 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libssh2/libssh2 - REF 42d37aa63129a1b2644bf6495198923534322d64 + REF 635caa90787220ac3773c1d5ba11f1236c22eae8 #v1.10.0 SHA512 e86c0787e2aa7be5e9f19356e543493e53c7d1b51b585c46facfb05f769e6491209f820b207bf594348f4760c492c32dda3fcc94fc0af93cb09c736492a8e231 HEAD_REF master - PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Fix-UWP.patch" + PATCHES + 0001-Fix-UWP.patch + fix-dellexport.patch + fix-pkgconfig.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF @@ -17,16 +20,14 @@ vcpkg_configure_cmake( -DENABLE_DEBUG_LOGGING=OFF ) -vcpkg_install_cmake() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share) +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libssh2) +vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libssh2) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share") -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libssh2 RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_copy_pdbs() diff --git a/ports/libssh2/vcpkg.json b/ports/libssh2/vcpkg.json index c5692d464608df..5013f9cedad127 100644 --- a/ports/libssh2/vcpkg.json +++ b/ports/libssh2/vcpkg.json @@ -1,11 +1,18 @@ { "name": "libssh2", - "version-string": "1.9.0", - "port-version": 1, + "version-semver": "1.10.0", "description": "The SSH library", "homepage": "https://www.libssh2.org", "dependencies": [ "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } From a8d7b3a9b884869db7dcd0af606d7619da6626b9 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Thu, 9 Sep 2021 17:50:39 +0800 Subject: [PATCH 02/17] update version --- versions/baseline.json | 10 +++++----- versions/l-/libressl.json | 5 +++++ versions/l-/libssh.json | 5 +++++ versions/l-/libssh2.json | 5 +++++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index e2da5b296233cb..5e356034254fbe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3605,7 +3605,7 @@ "port-version": 1 }, "libressl": { - "baseline": "3.3.3", + "baseline": "3.3.4", "port-version": 0 }, "librsvg": { @@ -3693,12 +3693,12 @@ "port-version": 1 }, "libssh": { - "baseline": "0.9.5", - "port-version": 6 + "baseline": "0.9.6", + "port-version": 0 }, "libssh2": { - "baseline": "1.9.0", - "port-version": 1 + "baseline": "1.10.0", + "port-version": 0 }, "libstemmer": { "baseline": "2017-9", diff --git a/versions/l-/libressl.json b/versions/l-/libressl.json index c8d28210087c96..cacad21e948fe6 100644 --- a/versions/l-/libressl.json +++ b/versions/l-/libressl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e31f444443774c282eb94a2f27f95ed6a4872942", + "version": "3.3.4", + "port-version": 0 + }, { "git-tree": "24a18d6ed79f2b8c4c01c5201998981b2d831a1a", "version": "3.3.3", diff --git a/versions/l-/libssh.json b/versions/l-/libssh.json index 2de41c959d9073..ef489fddf698ba 100644 --- a/versions/l-/libssh.json +++ b/versions/l-/libssh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9590cf4f48fb572ce4561327f4cec3bc0627645", + "version-string": "0.9.6", + "port-version": 0 + }, { "git-tree": "0eb17d68736a224ca8ce341b1b84bbae2f2f43a5", "version-string": "0.9.5", diff --git a/versions/l-/libssh2.json b/versions/l-/libssh2.json index 3dca2e58596e93..369f6059a947aa 100644 --- a/versions/l-/libssh2.json +++ b/versions/l-/libssh2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7329063e7b6a9b5e12871c8775e5a194dd5b2cbf", + "version-semver": "1.10.0", + "port-version": 0 + }, { "git-tree": "d448a6d5c97053355abbfa84171fcc7624dcd509", "version-string": "1.9.0", From 23e4b9cd80e9030f5d715270bffb8c586cc6be6d Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Thu, 9 Sep 2021 18:05:21 +0800 Subject: [PATCH 03/17] update patches formating --- ports/libressl/vcpkg.json | 2 +- ports/libssh/0002-mingw_for_Android.patch | 26 ++--- .../0003-create_symlink_unix_only.patch | 34 +++--- ports/libssh/vcpkg.json | 2 +- ports/libssh2/0001-Fix-UWP.patch | 100 +++++++++--------- 5 files changed, 82 insertions(+), 82 deletions(-) diff --git a/ports/libressl/vcpkg.json b/ports/libressl/vcpkg.json index ff08a3b587b5e4..4b117512ad0ebb 100644 --- a/ports/libressl/vcpkg.json +++ b/ports/libressl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libressl", - "version": "3.3.4", + "version-semver": "3.3.4", "description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.", "supports": "!(uwp | arm)", "dependencies": [ diff --git a/ports/libssh/0002-mingw_for_Android.patch b/ports/libssh/0002-mingw_for_Android.patch index 7b5ba303fb90ad..963eb6f61a4b64 100644 --- a/ports/libssh/0002-mingw_for_Android.patch +++ b/ports/libssh/0002-mingw_for_Android.patch @@ -1,13 +1,13 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index a576cf7..1f6a048 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -359,7 +359,7 @@ if (WITH_VISIBILITY_HIDDEN) - set_target_properties(ssh PROPERTIES C_VISIBILITY_PRESET hidden) - endif (WITH_VISIBILITY_HIDDEN) - --if (MINGW) -+if (MINGW AND NOT ANDROID) - target_link_libraries(ssh PRIVATE "-Wl,--enable-stdcall-fixup") - target_compile_definitions(ssh PRIVATE "_POSIX_SOURCE") - endif () +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index a576cf7..1f6a048 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -359,7 +359,7 @@ if (WITH_VISIBILITY_HIDDEN) + set_target_properties(ssh PROPERTIES C_VISIBILITY_PRESET hidden) + endif (WITH_VISIBILITY_HIDDEN) + +-if (MINGW) ++if (MINGW AND NOT ANDROID) + target_link_libraries(ssh PRIVATE "-Wl,--enable-stdcall-fixup") + target_compile_definitions(ssh PRIVATE "_POSIX_SOURCE") + endif () diff --git a/ports/libssh/0003-create_symlink_unix_only.patch b/ports/libssh/0003-create_symlink_unix_only.patch index 1ac60e1f5a42a9..20b2b646233e62 100644 --- a/ports/libssh/0003-create_symlink_unix_only.patch +++ b/ports/libssh/0003-create_symlink_unix_only.patch @@ -1,17 +1,17 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 53e6bd5..51d76c5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -231,10 +231,11 @@ endif (WITH_SYMBOL_VERSIONING AND ABIMAP_FOUND) - add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source DEPENDS ${_SYMBOL_TARGET} VERBATIM) - - # Link compile database for clangd -+if(UNIX) - execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink - "${CMAKE_BINARY_DIR}/compile_commands.json" - "${CMAKE_SOURCE_DIR}/compile_commands.json") -- -+endif() - message(STATUS "********************************************") - message(STATUS "********** ${PROJECT_NAME} build options : **********") - +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 53e6bd5..51d76c5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -231,10 +231,11 @@ endif (WITH_SYMBOL_VERSIONING AND ABIMAP_FOUND) + add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source DEPENDS ${_SYMBOL_TARGET} VERBATIM) + + # Link compile database for clangd ++if(UNIX) + execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink + "${CMAKE_BINARY_DIR}/compile_commands.json" + "${CMAKE_SOURCE_DIR}/compile_commands.json") +- ++endif() + message(STATUS "********************************************") + message(STATUS "********** ${PROJECT_NAME} build options : **********") + diff --git a/ports/libssh/vcpkg.json b/ports/libssh/vcpkg.json index 6a75d94d29e9d0..85dae41b00a02d 100644 --- a/ports/libssh/vcpkg.json +++ b/ports/libssh/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libssh", - "version-string": "0.9.6", + "version-semver": "0.9.6", "description": "libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side", "homepage": "https://www.libssh.org/", "supports": "!(uwp | arm)", diff --git a/ports/libssh2/0001-Fix-UWP.patch b/ports/libssh2/0001-Fix-UWP.patch index 3dfdc2787a5c01..4fe88a955ceea5 100644 --- a/ports/libssh2/0001-Fix-UWP.patch +++ b/ports/libssh2/0001-Fix-UWP.patch @@ -1,50 +1,50 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index eee1a80..2539607 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -354,7 +354,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 85c3e34..19768d4 100644 ---- a/src/agent.c -+++ b/src/agent.c -@@ -55,6 +55,10 @@ - #include - #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 -@@ -245,7 +249,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 -@@ -354,9 +358,9 @@ static struct { - const char *name; - struct agent_ops *ops; - } supported_backends[] = { --#ifdef WIN32 -- {"Pageant", &agent_ops_pageant}, -- {"OpenSSH", &agent_ops_openssh}, -+#if defined(WIN32) && !defined(IS_UWP) -+ {"Pageant", &agent_ops_pageant}, -+ {"OpenSSH", &agent_ops_openssh}, - #endif /* WIN32 */ - #ifdef PF_UNIX - {"Unix", &agent_ops_unix}, +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index eee1a80..2539607 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -354,7 +354,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 85c3e34..19768d4 100644 +--- a/src/agent.c ++++ b/src/agent.c +@@ -55,6 +55,10 @@ + #include + #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 +@@ -245,7 +249,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 +@@ -354,9 +358,9 @@ static struct { + const char *name; + struct agent_ops *ops; + } supported_backends[] = { +-#ifdef WIN32 +- {"Pageant", &agent_ops_pageant}, +- {"OpenSSH", &agent_ops_openssh}, ++#if defined(WIN32) && !defined(IS_UWP) ++ {"Pageant", &agent_ops_pageant}, ++ {"OpenSSH", &agent_ops_openssh}, + #endif /* WIN32 */ + #ifdef PF_UNIX + {"Unix", &agent_ops_unix}, From 78012542b4192bdbac4e1d2637bfd15e4587ae04 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Thu, 9 Sep 2021 18:06:18 +0800 Subject: [PATCH 04/17] update version --- versions/l-/libressl.json | 4 ++-- versions/l-/libssh.json | 4 ++-- versions/l-/libssh2.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/versions/l-/libressl.json b/versions/l-/libressl.json index cacad21e948fe6..6fd9dc224beb81 100644 --- a/versions/l-/libressl.json +++ b/versions/l-/libressl.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "e31f444443774c282eb94a2f27f95ed6a4872942", - "version": "3.3.4", + "git-tree": "8c4b053a1c4be151b59bdb30a6fee1c68025c108", + "version-semver": "3.3.4", "port-version": 0 }, { diff --git a/versions/l-/libssh.json b/versions/l-/libssh.json index ef489fddf698ba..2bf524bf717596 100644 --- a/versions/l-/libssh.json +++ b/versions/l-/libssh.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "e9590cf4f48fb572ce4561327f4cec3bc0627645", - "version-string": "0.9.6", + "git-tree": "bf952f340e1bf0ad12b52b437a45e98b6e988397", + "version-semver": "0.9.6", "port-version": 0 }, { diff --git a/versions/l-/libssh2.json b/versions/l-/libssh2.json index 369f6059a947aa..d07ed0c8ade5b6 100644 --- a/versions/l-/libssh2.json +++ b/versions/l-/libssh2.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7329063e7b6a9b5e12871c8775e5a194dd5b2cbf", + "git-tree": "f28bb6e4fc2538d37282143068e413a47242005d", "version-semver": "1.10.0", "port-version": 0 }, From 4dc1c68a81c662301c9a312cdf992701ade4b5d5 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Thu, 9 Sep 2021 19:30:51 +0800 Subject: [PATCH 05/17] update hash512 --- ports/libssh2/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libssh2/portfile.cmake b/ports/libssh2/portfile.cmake index 8b47fe070e32e9..4e6ad539c4dd9b 100644 --- a/ports/libssh2/portfile.cmake +++ b/ports/libssh2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libssh2/libssh2 REF 635caa90787220ac3773c1d5ba11f1236c22eae8 #v1.10.0 - SHA512 e86c0787e2aa7be5e9f19356e543493e53c7d1b51b585c46facfb05f769e6491209f820b207bf594348f4760c492c32dda3fcc94fc0af93cb09c736492a8e231 + SHA512 ccc3328565e6840464345ac4fa093293733f3320e36358e87d18d5eabc7c250e855c03b058703a1c2a7c8e005335c671e3cdf6ee937322edf1c7812026f71534 HEAD_REF master PATCHES 0001-Fix-UWP.patch From e4bff9cb4d145d65a819faac575c94e8a2a0ade5 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Thu, 9 Sep 2021 19:31:28 +0800 Subject: [PATCH 06/17] update version' --- versions/l-/libssh2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libssh2.json b/versions/l-/libssh2.json index d07ed0c8ade5b6..749d0e3a696b80 100644 --- a/versions/l-/libssh2.json +++ b/versions/l-/libssh2.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f28bb6e4fc2538d37282143068e413a47242005d", + "git-tree": "dd3c4dfab4345ad5a4589530bddfe7819a4f37e7", "version-semver": "1.10.0", "port-version": 0 }, From 4587d21e8d68e4fbf0ae9b60b60d43caddea5bec Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Fri, 17 Sep 2021 17:01:13 +0800 Subject: [PATCH 07/17] fix CI build error --- ports/libssh2/fix-error-c2065.patch | 13 +++++++++++++ ports/libssh2/portfile.cmake | 1 + 2 files changed, 14 insertions(+) create mode 100644 ports/libssh2/fix-error-c2065.patch diff --git a/ports/libssh2/fix-error-c2065.patch b/ports/libssh2/fix-error-c2065.patch new file mode 100644 index 00000000000000..3e011d73e621d0 --- /dev/null +++ b/ports/libssh2/fix-error-c2065.patch @@ -0,0 +1,13 @@ +diff --git a/src/agent_win.c b/src/agent_win.c +index a1605a9..81f6881 100644 +--- a/src/agent_win.c ++++ b/src/agent_win.c +@@ -36,7 +36,7 @@ + * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + */ +- ++#define HANDLE_FLAG_INHERIT 0x00000001 + #include "libssh2_priv.h" + #include "agent.h" + #include "misc.h" diff --git a/ports/libssh2/portfile.cmake b/ports/libssh2/portfile.cmake index 4e6ad539c4dd9b..2da4cb6d905e69 100644 --- a/ports/libssh2/portfile.cmake +++ b/ports/libssh2/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( 0001-Fix-UWP.patch fix-dellexport.patch fix-pkgconfig.patch + fix-error-c2065.patch #fix error C2065: 'HANDLE_FLAG_INHERIT': undeclared identifier ) vcpkg_cmake_configure( From cefbf802b265e47dcc4042d3c1c7b88a10bde1aa Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Fri, 17 Sep 2021 17:03:21 +0800 Subject: [PATCH 08/17] update version --- versions/l-/libssh2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libssh2.json b/versions/l-/libssh2.json index 749d0e3a696b80..8acb170b08599d 100644 --- a/versions/l-/libssh2.json +++ b/versions/l-/libssh2.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "dd3c4dfab4345ad5a4589530bddfe7819a4f37e7", + "git-tree": "a774e92dfc170e7025bf8dff7230edd85c2a31b9", "version-semver": "1.10.0", "port-version": 0 }, From 6165145791a687f8f460f72e0024b6db933f11c4 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Sat, 18 Sep 2021 16:35:41 +0800 Subject: [PATCH 09/17] update vcpkg.json and portifile.cmake --- ports/libressl/portfile.cmake | 8 +------- ports/libressl/vcpkg.json | 2 +- ports/libssh/vcpkg.json | 2 +- ports/libssh2/vcpkg.json | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ports/libressl/portfile.cmake b/ports/libressl/portfile.cmake index 01b1ed8dd8dd59..641988b95793c5 100644 --- a/ports/libressl/portfile.cmake +++ b/ports/libressl/portfile.cmake @@ -42,13 +42,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() if("tools" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) - set(EXECUTABLE_SUFFIX .exe) - endif() - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/openssl") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/openssl${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/openssl/openssl${EXECUTABLE_SUFFIX}") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/ocspcheck${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/openssl/ocspcheck${EXECUTABLE_SUFFIX}") - vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/openssl") + vcpkg_copy_tools(TOOL_NAMES ocspcheck openssl AUTO_CLEAN) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/libressl/vcpkg.json b/ports/libressl/vcpkg.json index 4b117512ad0ebb..ff08a3b587b5e4 100644 --- a/ports/libressl/vcpkg.json +++ b/ports/libressl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libressl", - "version-semver": "3.3.4", + "version": "3.3.4", "description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.", "supports": "!(uwp | arm)", "dependencies": [ diff --git a/ports/libssh/vcpkg.json b/ports/libssh/vcpkg.json index 85dae41b00a02d..28a190f64d784c 100644 --- a/ports/libssh/vcpkg.json +++ b/ports/libssh/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libssh", - "version-semver": "0.9.6", + "version": "0.9.6", "description": "libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side", "homepage": "https://www.libssh.org/", "supports": "!(uwp | arm)", diff --git a/ports/libssh2/vcpkg.json b/ports/libssh2/vcpkg.json index 5013f9cedad127..9caee22812badd 100644 --- a/ports/libssh2/vcpkg.json +++ b/ports/libssh2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libssh2", - "version-semver": "1.10.0", + "version": "1.10.0", "description": "The SSH library", "homepage": "https://www.libssh2.org", "dependencies": [ From 97f578e077e39c519dc9e8ca1b3169e54454b33c Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Sat, 18 Sep 2021 16:36:50 +0800 Subject: [PATCH 10/17] update version --- versions/l-/libressl.json | 4 ++-- versions/l-/libssh.json | 4 ++-- versions/l-/libssh2.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/versions/l-/libressl.json b/versions/l-/libressl.json index 6fd9dc224beb81..12c1f32d83b35f 100644 --- a/versions/l-/libressl.json +++ b/versions/l-/libressl.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "8c4b053a1c4be151b59bdb30a6fee1c68025c108", - "version-semver": "3.3.4", + "git-tree": "3a1b7777d6fb4193cc400d69ce591ccde005a1bb", + "version": "3.3.4", "port-version": 0 }, { diff --git a/versions/l-/libssh.json b/versions/l-/libssh.json index 2bf524bf717596..e56106d86a9e92 100644 --- a/versions/l-/libssh.json +++ b/versions/l-/libssh.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "bf952f340e1bf0ad12b52b437a45e98b6e988397", - "version-semver": "0.9.6", + "git-tree": "65c695c9a36304d94b892395578a5ade25148a5c", + "version": "0.9.6", "port-version": 0 }, { diff --git a/versions/l-/libssh2.json b/versions/l-/libssh2.json index 8acb170b08599d..c6cb8a76c0b2e4 100644 --- a/versions/l-/libssh2.json +++ b/versions/l-/libssh2.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "a774e92dfc170e7025bf8dff7230edd85c2a31b9", - "version-semver": "1.10.0", + "git-tree": "c4f9e409dfb94f778bc3513c1804f46b3df6aeff", + "version": "1.10.0", "port-version": 0 }, { From 694004a3eda0e807d6c669d9985febfab9c97313 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Sun, 26 Sep 2021 16:48:42 +0800 Subject: [PATCH 11/17] delete hash --- ports/libssh/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/libssh/portfile.cmake b/ports/libssh/portfile.cmake index de552fd110daa8..3cd1ea915a63c5 100644 --- a/ports/libssh/portfile.cmake +++ b/ports/libssh/portfile.cmake @@ -4,7 +4,6 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://git.libssh.org/projects/libssh.git REF 47fd6e56c1058dca54afee1638c11fb6ec41911d # REFERENCE VERSION 0.9.6 - SHA512 64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18 PATCHES 0001-export-pkgconfig-file.patch 0002-mingw_for_Android.patch From 1a15e8875e3017ee880337a9b6a786214df86cf2 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Sun, 26 Sep 2021 16:49:09 +0800 Subject: [PATCH 12/17] update version --- versions/l-/libssh.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libssh.json b/versions/l-/libssh.json index e56106d86a9e92..e9fb5170c12953 100644 --- a/versions/l-/libssh.json +++ b/versions/l-/libssh.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "65c695c9a36304d94b892395578a5ade25148a5c", + "git-tree": "02a95a0ab1a26e3395173bc59e9f041f23b7f5c9", "version": "0.9.6", "port-version": 0 }, From 48f07e50fcffe822f5b21b28f8b6a0f1de2ef6e2 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Mon, 27 Sep 2021 15:12:18 +0800 Subject: [PATCH 13/17] revert libssh2 --- ports/libssh2/0001-Fix-UWP.patch | 18 ++++++++-------- ports/libssh2/fix-dellexport.patch | 16 --------------- ports/libssh2/fix-error-c2065.patch | 13 ------------ ports/libssh2/fix-pkgconfig.patch | 12 ----------- ports/libssh2/portfile.cmake | 32 ++++++++++++++--------------- ports/libssh2/vcpkg.json | 11 ++-------- 6 files changed, 25 insertions(+), 77 deletions(-) delete mode 100644 ports/libssh2/fix-dellexport.patch delete mode 100644 ports/libssh2/fix-error-c2065.patch delete mode 100644 ports/libssh2/fix-pkgconfig.patch diff --git a/ports/libssh2/0001-Fix-UWP.patch b/ports/libssh2/0001-Fix-UWP.patch index 4fe88a955ceea5..270dd7b9038fc5 100644 --- a/ports/libssh2/0001-Fix-UWP.patch +++ b/ports/libssh2/0001-Fix-UWP.patch @@ -1,8 +1,8 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index eee1a80..2539607 100644 +index 6401acf..64de3e9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -354,7 +354,7 @@ target_include_directories(libssh2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) +@@ -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. @@ -12,12 +12,12 @@ index eee1a80..2539607 100644 elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") target_compile_definitions(libssh2 PRIVATE LIBSSH2_DARWIN) diff --git a/src/agent.c b/src/agent.c -index 85c3e34..19768d4 100644 +index c2ba422..f1799f8 100644 --- a/src/agent.c +++ b/src/agent.c -@@ -55,6 +55,10 @@ - #include - #endif +@@ -51,6 +51,10 @@ + #include "userauth.h" + #include "session.h" +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) +#define IS_UWP 1 @@ -26,7 +26,7 @@ index 85c3e34..19768d4 100644 /* Requests from client to agent for protocol 1 key operations */ #define SSH_AGENTC_REQUEST_RSA_IDENTITIES 1 #define SSH_AGENTC_RSA_CHALLENGE 3 -@@ -245,7 +249,7 @@ struct agent_ops agent_ops_unix = { +@@ -254,7 +258,7 @@ struct agent_ops agent_ops_unix = { }; #endif /* PF_UNIX */ @@ -35,16 +35,14 @@ index 85c3e34..19768d4 100644 /* Code to talk to Pageant was taken from PuTTY. * * Portions copyright Robert de Bath, Joris van Rantwijk, Delian -@@ -354,9 +358,9 @@ static struct { +@@ -362,8 +366,8 @@ static struct { const char *name; struct agent_ops *ops; } supported_backends[] = { -#ifdef WIN32 - {"Pageant", &agent_ops_pageant}, -- {"OpenSSH", &agent_ops_openssh}, +#if defined(WIN32) && !defined(IS_UWP) + {"Pageant", &agent_ops_pageant}, -+ {"OpenSSH", &agent_ops_openssh}, #endif /* WIN32 */ #ifdef PF_UNIX {"Unix", &agent_ops_unix}, diff --git a/ports/libssh2/fix-dellexport.patch b/ports/libssh2/fix-dellexport.patch deleted file mode 100644 index 3203c3b2f6dc71..00000000000000 --- a/ports/libssh2/fix-dellexport.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index d9f3a37..ce9712c 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -354,9 +354,9 @@ 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 PRIVATE LIBSSH2_WIN32 _WINDLL) - elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") -- target_compile_definitions(libssh2 PRIVATE LIBSSH2_DARWIN) -+ target_compile_definitions(libssh2 PRIVATE LIBSSH2_DARWIN _WINDLL) - endif() - - if(MSVC) diff --git a/ports/libssh2/fix-error-c2065.patch b/ports/libssh2/fix-error-c2065.patch deleted file mode 100644 index 3e011d73e621d0..00000000000000 --- a/ports/libssh2/fix-error-c2065.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/agent_win.c b/src/agent_win.c -index a1605a9..81f6881 100644 ---- a/src/agent_win.c -+++ b/src/agent_win.c -@@ -36,7 +36,7 @@ - * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - */ -- -+#define HANDLE_FLAG_INHERIT 0x00000001 - #include "libssh2_priv.h" - #include "agent.h" - #include "misc.h" diff --git a/ports/libssh2/fix-pkgconfig.patch b/ports/libssh2/fix-pkgconfig.patch deleted file mode 100644 index a9f4e2a38ceef1..00000000000000 --- a/ports/libssh2/fix-pkgconfig.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 3965bb8..ce9712c 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -68,7 +68,6 @@ if(CRYPTO_BACKEND STREQUAL "OpenSSL" OR NOT CRYPTO_BACKEND) - list(APPEND PRIVATE_COMPILE_DEFINITIONS LIBSSH2_OPENSSL) - list(APPEND PRIVATE_INCLUDE_DIRECTORIES ${OPENSSL_INCLUDE_DIR}) - list(APPEND LIBRARIES ${OPENSSL_LIBRARIES}) -- list(APPEND PC_REQUIRES_PRIVATE libssl libcrypto) - - if (WIN32) - # Statically linking to OpenSSL requires crypt32 for some Windows APIs. diff --git a/ports/libssh2/portfile.cmake b/ports/libssh2/portfile.cmake index 2da4cb6d905e69..0922bb7c8bcabe 100644 --- a/ports/libssh2/portfile.cmake +++ b/ports/libssh2/portfile.cmake @@ -1,18 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libssh2/libssh2 - REF 635caa90787220ac3773c1d5ba11f1236c22eae8 #v1.10.0 - SHA512 ccc3328565e6840464345ac4fa093293733f3320e36358e87d18d5eabc7c250e855c03b058703a1c2a7c8e005335c671e3cdf6ee937322edf1c7812026f71534 + REF 42d37aa63129a1b2644bf6495198923534322d64 + SHA512 e86c0787e2aa7be5e9f19356e543493e53c7d1b51b585c46facfb05f769e6491209f820b207bf594348f4760c492c32dda3fcc94fc0af93cb09c736492a8e231 HEAD_REF master - PATCHES - 0001-Fix-UWP.patch - fix-dellexport.patch - fix-pkgconfig.patch - fix-error-c2065.patch #fix error C2065: 'HANDLE_FLAG_INHERIT': undeclared identifier + PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Fix-UWP.patch" ) -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF @@ -21,14 +17,16 @@ vcpkg_cmake_configure( -DENABLE_DEBUG_LOGGING=OFF ) -vcpkg_cmake_install() -vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libssh2) -vcpkg_copy_pdbs() +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libssh2) -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libssh2 RENAME copyright) +vcpkg_copy_pdbs() diff --git a/ports/libssh2/vcpkg.json b/ports/libssh2/vcpkg.json index 9caee22812badd..c5692d464608df 100644 --- a/ports/libssh2/vcpkg.json +++ b/ports/libssh2/vcpkg.json @@ -1,18 +1,11 @@ { "name": "libssh2", - "version": "1.10.0", + "version-string": "1.9.0", + "port-version": 1, "description": "The SSH library", "homepage": "https://www.libssh2.org", "dependencies": [ "openssl", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, "zlib" ] } From 02fdcac7b45de504295252c5930e813602be4af3 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Mon, 27 Sep 2021 15:13:21 +0800 Subject: [PATCH 14/17] update version --- versions/baseline.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 78c81489ebcfaf..1ee634c6aa6db2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3765,8 +3765,8 @@ "port-version": 0 }, "libssh2": { - "baseline": "1.10.0", - "port-version": 0 + "baseline": "1.9.0", + "port-version": 1 }, "libstemmer": { "baseline": "2017-9", From 2d428d1b9d2eab49ddf86d382f1c4ca11b294568 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Mon, 27 Sep 2021 15:17:55 +0800 Subject: [PATCH 15/17] revert libssh2 --- versions/l-/libssh2.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/l-/libssh2.json b/versions/l-/libssh2.json index c6cb8a76c0b2e4..3dca2e58596e93 100644 --- a/versions/l-/libssh2.json +++ b/versions/l-/libssh2.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "c4f9e409dfb94f778bc3513c1804f46b3df6aeff", - "version": "1.10.0", - "port-version": 0 - }, { "git-tree": "d448a6d5c97053355abbfa84171fcc7624dcd509", "version-string": "1.9.0", From 8333003d1f9b826ec222d02b503a5dc01f2353b8 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Mon, 27 Sep 2021 15:37:20 +0800 Subject: [PATCH 16/17] update portfile.cmake --- ports/libressl/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libressl/portfile.cmake b/ports/libressl/portfile.cmake index 641988b95793c5..32ca4d767919e4 100644 --- a/ports/libressl/portfile.cmake +++ b/ports/libressl/portfile.cmake @@ -42,7 +42,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() if("tools" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES ocspcheck openssl AUTO_CLEAN) + vcpkg_copy_tools(TOOL_NAMES ocspcheck openssl DESTINATION "${CURRENT_PACKAGES_DIR}/tools/openssl" AUTO_CLEAN) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") From 36f8cc44eec2c25103f9e60acbbcc75efaceed5c Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Mon, 27 Sep 2021 15:39:52 +0800 Subject: [PATCH 17/17] update version --- versions/l-/libressl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libressl.json b/versions/l-/libressl.json index 12c1f32d83b35f..0ba04b1e1c91c2 100644 --- a/versions/l-/libressl.json +++ b/versions/l-/libressl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3a1b7777d6fb4193cc400d69ce591ccde005a1bb", + "git-tree": "2dcc81c2e764c5f32d9c35280ab9ae06fda622c3", "version": "3.3.4", "port-version": 0 },