diff mbox series

[meta-oe] libssh: Upgrade 0.11.3 -> 0.12.0

Message ID 20260312014911.822219-1-mingli.yu@windriver.com
State New
Headers show
Series [meta-oe] libssh: Upgrade 0.11.3 -> 0.12.0 | expand

Commit Message

Yu, Mingli March 12, 2026, 1:49 a.m. UTC 
From: Mingli Yu <mingli.yu@windriver.com>

Changelog:
https://www.libssh.org/2026/02/10/libssh-0-12-0-and-0-11-4-security-releases/

Rebase 0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch to
avoid patch fuzz error.

 # ./run-ptest
PASS: torture_bignum
PASS: torture_bind_config
PASS: torture_buffer
PASS: torture_bytearray
PASS: torture_callbacks
PASS: torture_channel
PASS: torture_config
PASS: torture_config_match_localnetwork
PASS: torture_crypto
PASS: torture_forwarded_tcpip_callback
PASS: torture_hashes
PASS: torture_init
PASS: torture_isipaddr
PASS: torture_keyfiles
PASS: torture_knownhosts_parsing
PASS: torture_list
PASS: torture_misc
PASS: torture_moduli
PASS: torture_options
PASS: torture_packet
PASS: torture_packet_filter
PASS: torture_pki
PASS: torture_pki_dsa
PASS: torture_pki_ecdsa
PASS: torture_pki_ed25519
PASS: torture_pki_rsa
PASS: torture_pki_sk_ecdsa
PASS: torture_pki_sk_ed25519
PASS: torture_pki_sshsig
PASS: torture_push_pop_dir
PASS: torture_rand
PASS: torture_server_direct_tcpip
PASS: torture_server_x11
PASS: torture_session_keys
PASS: torture_string
PASS: torture_temp_dir
PASS: torture_temp_file
PASS: torture_threads_buffer
PASS: torture_threads_crypto
PASS: torture_threads_init
PASS: torture_threads_pki_rsa
PASS: torture_tokens
PASS: torture_unit_server
PASS: torture_unit_sftp

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 ...akeLists.txt-do-not-search-ssh-sshd-commands.patch | 11 ++++-------
 .../libssh/{libssh_0.11.3.bb => libssh_0.12.0.bb}     |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)
 rename meta-oe/recipes-support/libssh/{libssh_0.11.3.bb => libssh_0.12.0.bb} (94%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch b/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch
index 4803ff81d8..72353164f7 100644
--- a/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch
+++ b/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch
@@ -14,18 +14,18 @@  Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 89b95d08..e481534c 100644
+index cf1adf56..713b1512 100644
 --- a/tests/CMakeLists.txt
 +++ b/tests/CMakeLists.txt
-@@ -96,6 +96,7 @@ set(TEST_TARGET_LIBRARIES
+@@ -138,6 +138,7 @@ set(TEST_TARGET_LIBRARIES
  
  add_subdirectory(unittests)
  
 +if (CLIENT_TESTING OR SERVER_TESTING)
  # OpenSSH Capabilities are required for all unit tests
  find_program(SSH_EXECUTABLE NAMES ssh)
- if (SSH_EXECUTABLE)
-@@ -345,6 +346,7 @@ endif (WITH_PKCS11_URI)
+ find_program(SSH_KEYGEN_EXECUTABLE NAMES ssh-keygen)
+@@ -440,6 +441,7 @@ endif ()
  file(COPY gss/kdcsetup.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/gss FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
  
  message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}")
@@ -33,6 +33,3 @@  index 89b95d08..e481534c 100644
  
  configure_file(tests_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/tests_config.h)
  
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-support/libssh/libssh_0.11.3.bb b/meta-oe/recipes-support/libssh/libssh_0.12.0.bb
similarity index 94%
rename from meta-oe/recipes-support/libssh/libssh_0.11.3.bb
rename to meta-oe/recipes-support/libssh/libssh_0.12.0.bb
index 5928581312..632f60a049 100644
--- a/meta-oe/recipes-support/libssh/libssh_0.11.3.bb
+++ b/meta-oe/recipes-support/libssh/libssh_0.12.0.bb
@@ -6,14 +6,14 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0"
 
 DEPENDS = "zlib openssl"
 
-SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.11;tag=${BPN}-${PV} \
+SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=master;tag=${BPN}-${PV} \
            file://0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch \
            file://run-ptest \
           "
 
 SRC_URI:append:toolchain-clang = " file://0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch"
 
-SRCREV = "301d0e16dfa8a5cac1cff956b6880ca90eb82864"
+SRCREV = "50313883f3a077458cde4ea95bf46bfeb0771b34"
 
 
 inherit cmake ptest