diff --git a/package/libssh/0001-cmake-Only-enable-CXX-when-running-the-coverage.patch b/package/libssh/0001-cmake-Only-enable-CXX-when-running-the-coverage.patch deleted file mode 100644 index c1f39b7d9a..0000000000 --- a/package/libssh/0001-cmake-Only-enable-CXX-when-running-the-coverage.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 328ae3d2306c9f65b5e85a2be98a368c07287a05 Mon Sep 17 00:00:00 2001 -From: Thomas Perale -Date: Sat, 14 Sep 2024 21:07:30 +0200 -Subject: [PATCH] cmake: Only enable CXX when running the coverage - -Commit 25a678190c42b24076fdd805a8d7a722a8a9c798 introduced code coverage -collection. That also introduced a dependency to CXX language. - -When cross-compiling libssh in an environment that doesn't have a C++ compiler -the following error is raised: "No CMAKE_CXX_COMPILER could be found.". - -Since the C++ part is only needed for the coverage part, this commit only enable -that language dependency when actually needing it. - -Signed-off-by: Thomas Perale -Upstream: https://gitlab.com/libssh/libssh-mirror/-/merge_requests/537 ---- - CMakeLists.txt | 3 ++- - cmake/Modules/AddCMockaTest.cmake | 1 + - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13330ea3..5595a47a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,7 +9,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules") - include(DefineCMakeDefaults) - include(DefineCompilerFlags) - --project(libssh VERSION 0.11.1 LANGUAGES C CXX) -+project(libssh VERSION 0.11.1 LANGUAGES C) - - # global needed variable - set(APPLICATION_NAME ${PROJECT_NAME}) -@@ -190,6 +190,7 @@ endif (WITH_SYMBOL_VERSIONING AND ABIMAP_FOUND) - - # Coverage - if (WITH_COVERAGE) -+ ENABLE_LANGUAGE(CXX) - include(CodeCoverage) - setup_target_for_coverage_lcov( - NAME "coverage" -diff --git a/cmake/Modules/AddCMockaTest.cmake b/cmake/Modules/AddCMockaTest.cmake -index 79178183..f49961ba 100644 ---- a/cmake/Modules/AddCMockaTest.cmake -+++ b/cmake/Modules/AddCMockaTest.cmake -@@ -117,6 +117,7 @@ function(ADD_CMOCKA_TEST _TARGET_NAME) - ${TARGET_SYSTEM_EMULATOR} ${_TARGET_NAME} - ) - if (WITH_COVERAGE) -+ ENABLE_LANGUAGE(CXX) - include(CodeCoverage) - append_coverage_compiler_flags_to_target(${_TARGET_NAME}) - endif (WITH_COVERAGE) --- -2.46.0 - diff --git a/package/libssh/libssh.hash b/package/libssh/libssh.hash index b131557ee8..161d5b1e58 100644 --- a/package/libssh/libssh.hash +++ b/package/libssh/libssh.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.libssh.org/files/0.11/libssh-0.11.1.tar.xz.asc +# https://www.libssh.org/files/0.11/libssh-0.11.2.tar.xz.asc # with key 88A228D89B07C2C77D0C780903D5DF8CFDD3E8E7 -sha256 14b7dcc72e91e08151c58b981a7b570ab2663f630e7d2837645d5a9c612c1b79 libssh-0.11.1.tar.xz +sha256 69529fc18f5b601f0baf0e5a4501a2bc26df5e2f116f5f8f07f19fafaa6d04e7 libssh-0.11.2.tar.xz sha256 1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a COPYING diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index a00e6a9445..7bcf077929 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -5,7 +5,7 @@ ################################################################################ LIBSSH_VERSION_MAJOR = 0.11 -LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).1 +LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).2 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR) LIBSSH_LICENSE = LGPL-2.1