From 9893ea9ad81abdb3b1035beede5719942ab4d8c5 Mon Sep 17 00:00:00 2001 From: Trevor Shoe Date: Tue, 15 Oct 2024 09:37:42 -0400 Subject: [PATCH 1/2] [3rd party] revert libssh update --- 3rd-party/libssh/libssh | 2 +- 3rd-party/submodule_info.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/3rd-party/libssh/libssh b/3rd-party/libssh/libssh index f23d1454e5..a09a5a5b5d 160000 --- a/3rd-party/libssh/libssh +++ b/3rd-party/libssh/libssh @@ -1 +1 @@ -Subproject commit f23d1454e50d0dbb314edd9bf4227ab72303484b +Subproject commit a09a5a5b5dd414bf422ab3ac3c50626eb46e8d67 diff --git a/3rd-party/submodule_info.md b/3rd-party/submodule_info.md index eaf19314af..4e1aa30c29 100644 --- a/3rd-party/submodule_info.md +++ b/3rd-party/submodule_info.md @@ -12,7 +12,7 @@ Version: 1.52.1 (+[our patches](https://github.com/CanonicalLtd/grpc/compare/v1. ### libssh -Version: 0.11.1 (+[our patches](https://github.com/canonical/libssh/compare/libssh-0.11.1...multipass)) | +Version: 0.10.6 (+[our patches](https://github.com/canonical/libssh/compare/libssh-0.10.6...multipass)) | | From 707ee92358b6c3407f1c847a1332b95f9631a84c Mon Sep 17 00:00:00 2001 From: Trevor Shoe Date: Tue, 15 Oct 2024 09:57:02 -0400 Subject: [PATCH 2/2] [3rd-party] revert libssh cmake changes --- 3rd-party/libssh/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rd-party/libssh/CMakeLists.txt b/3rd-party/libssh/CMakeLists.txt index 20a3602806..e778b24ac3 100644 --- a/3rd-party/libssh/CMakeLists.txt +++ b/3rd-party/libssh/CMakeLists.txt @@ -59,7 +59,7 @@ file(STRINGS libssh/CMakeLists.txt libssh_VERSION REGEX "^project\\(libssh") file(STRINGS libssh/CMakeLists.txt LIBRARY_VERSION REGEX "^set\\(LIBRARY_VERSION") file(STRINGS libssh/CMakeLists.txt LIBRARY_SOVERSION REGEX "^set\\(LIBRARY_SOVERSION") -string(REGEX MATCH "^project\\(libssh VERSION ([0-9]+)\\.([0-9]+)\\.([0-9]+) LANGUAGES C CXX\\)$" +string(REGEX MATCH "^project\\(libssh VERSION ([0-9]+)\\.([0-9]+)\\.([0-9]+) LANGUAGES C\\)$" libssh_VERSION "${libssh_VERSION}") if (NOT libssh_VERSION) message(FATAL_ERROR "unable to find libssh project version")