From 624cdacd4e1044be3ad9a5f1a705cdf2390c769e Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Sun, 21 May 2023 13:50:42 -0700 Subject: [PATCH] Windows: Update our libssh packages and add Lua for Arm64 Update libssh to 0.10.5 and add an Arm64 version. Add an Arm64 version of our customized Lua. --- cmake/modules/FindLIBSSH.cmake | 3 +-- tools/win-setup.ps1 | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cmake/modules/FindLIBSSH.cmake b/cmake/modules/FindLIBSSH.cmake index 1a758a1adb..31346a3979 100644 --- a/cmake/modules/FindLIBSSH.cmake +++ b/cmake/modules/FindLIBSSH.cmake @@ -94,8 +94,7 @@ else () CACHE PATH "Path to libssh DLLs" ) file(GLOB _libssh_dlls RELATIVE "${LIBSSH_DLL_DIR}" - "${LIBSSH_DLL_DIR}/ssh.dll" - "${LIBSSH_DLL_DIR}/pthreadVC3.dll" + "${LIBSSH_DLL_DIR}/libssh.dll" ) set(LIBSSH_DLLS ${_libssh_dlls} # We're storing filenames only. Should we use STRING instead? diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index aed3dd593d..2d045462d4 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -82,7 +82,7 @@ $Win64Archives = @{ "libmaxminddb/libmaxminddb-1.4.3-1-win64ws.zip" = "ee89944a19ab6e1c873bdecb9fc6205d317c41e6da6ec1d30bc892fddfd143da"; "libpcap/libpcap-1.10.1-1-win64ws.zip" = "59f8e0e90a3ab5671df561266ed2b02870a6f8f3a895b80c9db19fea9a12ffb2"; "libsmi/libsmi-svn-40773-win64ws.zip" = "571fcee71d741bf847c3247d4c2e1c42388ca6a9feebe08fc0d4ce053571d15d"; - "libssh/libssh-0.9.5-win64ws.zip" = "3226fcb89969a77643bd2bca7a1ff6b5a79261b680a09a6bfedb3d40f7a187e3"; + "libssh/libssh-0.10.5-1-x64-mingw-dynamic-ws.zip" = "9c1410d1033a540d118e17938905144956291b4c6ca7a9b7af6959b2632a1aaa"; "lua/lua-5.2.4-unicode-win64-vc14.zip" = "e8968d2c7871ce1ea82cbd29ac1b3a2c59d3dec25e483c5e12de85df66f5d928"; "lz4/lz4-1.9.3-1-win64ws.zip" = "7129515893ffdc439f4ffe9673c4bc43f9042e910bb2607e68dde6b99a1ab058"; "minizip/minizip-1.2.11-4-win64ws.zip" = "dd6bf24e2d946465ad19aa4f8c38e0db91da6585887935de68011982cd6fb2cb"; @@ -109,8 +109,8 @@ $Win64ArmArchives = @{ "libmaxminddb/libmaxminddb-1.4.3-1-win64armws.zip" = "9996327f301cb4a4de797bc024ad0471acd95c1850a2afc849c57fcc93360610"; "libpcap/libpcap-1.10.1-1-win64armws.zip" = "c0c5d42d96cc407303d71ba5afd06615c660228fa2260d7ecbc8453140529137"; # "libsmi/libsmi-svn-40773-win64armws.zip" = ""; - # "libssh/libssh-0.9.5-win64armws.zip" = ""; - # "lua/lua-5.2.4-unicode-win64arm-vc14.zip" = ""; + "libssh/libssh-0.10.5-1-arm64-mingw-dynamic-ws.zip" = "b99c9573d9a30ba2898ce6ac131b23b1699009761d5dbe351a1a958cca0f85ca"; + "lua/lua-5.2.4-unicode-arm64-windows-vc17.zip" = "5848e23352e35b69f4cdabaca3754c2c5fb11e5461bb92b71e059e558e4b2d12"; "lz4/lz4-1.9.4-1-win64armws.zip" = "59a3ed3f9161be7614a89afd2ca21c43f26dd916afd4aa7bfdc4b148fb10d485"; "minizip/minizip-1.2.13-1-win64armws.zip" = "b1e79d8feb01b89cebc1e9fed7765d29f5eb412d11bfcf07217fb645863deb2c"; "nghttp2/nghttp2-1.51.0-1-win64armws.zip" = "ede5c53fd46ab12b15ff9758cdc2891731bc1475c589681aa10e6aaf2217656c";