From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8A2671584AD for ; Tue, 15 Apr 2025 03:23:38 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 70FE3343065 for ; Tue, 15 Apr 2025 03:23:38 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 5FDF51104B0; Tue, 15 Apr 2025 03:23:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 555521104B0 for ; Tue, 15 Apr 2025 03:23:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 04B82343029 for ; Tue, 15 Apr 2025 03:23:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 641791748 for ; Tue, 15 Apr 2025 03:23:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1744687375.f4a38a6b89cc12ed110c48cdd74e50dd28e56c10.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/, net-libs/libssh/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libssh/files/libssh-0.11.1-openssh-10.patch net-libs/libssh/libssh-0.11.1-r1.ebuild X-VCS-Directories: net-libs/libssh/ net-libs/libssh/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f4a38a6b89cc12ed110c48cdd74e50dd28e56c10 X-VCS-Branch: master Date: Tue, 15 Apr 2025 03:23:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 59e637cb-e8fd-4149-89c5-b13dd2f9b63f X-Archives-Hash: 660250d7b1034623ba23aa99d29ef6a8 commit: f4a38a6b89cc12ed110c48cdd74e50dd28e56c10 Author: Sam James gentoo org> AuthorDate: Tue Apr 15 03:22:55 2025 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 15 03:22:55 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4a38a6b net-libs/libssh: fix tests with >=net-misc/openssh-10.0_p1 Signed-off-by: Sam James gentoo.org> .../libssh/files/libssh-0.11.1-openssh-10.patch | 48 ++++++++++++++++++++++ net-libs/libssh/libssh-0.11.1-r1.ebuild | 4 ++ 2 files changed, 52 insertions(+) diff --git a/net-libs/libssh/files/libssh-0.11.1-openssh-10.patch b/net-libs/libssh/files/libssh-0.11.1-openssh-10.patch new file mode 100644 index 000000000000..e8c9d64872d5 --- /dev/null +++ b/net-libs/libssh/files/libssh-0.11.1-openssh-10.patch @@ -0,0 +1,48 @@ +https://gitlab.com/libssh/libssh-mirror/-/issues/298 +https://gitlab.com/libssh/libssh-mirror/-/commit/af10857aa3216f40c5c2e5d7116803fb03c166f9 + +From af10857aa3216f40c5c2e5d7116803fb03c166f9 Mon Sep 17 00:00:00 2001 +From: Norbert Pocs +Date: Fri, 11 Apr 2025 09:04:40 +0200 +Subject: [PATCH] CmakeLists: Fix multiple digit major version for OpenSSH + +Signed-off-by: Norbert Pocs +Reviewed-by: Jakub Jelen +--- + tests/CMakeLists.txt | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 8d4e94b69..e8b196b83 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -104,9 +104,10 @@ add_subdirectory(unittests) + find_program(SSH_EXECUTABLE NAMES ssh) + if (SSH_EXECUTABLE) + execute_process(COMMAND ${SSH_EXECUTABLE} -V ERROR_VARIABLE OPENSSH_VERSION_STR) +- string(REGEX REPLACE "^.*OpenSSH_([0-9]).[0-9].*$" "\\1" OPENSSH_VERSION_MAJOR "${OPENSSH_VERSION_STR}") +- string(REGEX REPLACE "^.*OpenSSH_[0-9].([0-9]).*$" "\\1" OPENSSH_VERSION_MINOR "${OPENSSH_VERSION_STR}") ++ string(REGEX REPLACE "^.*OpenSSH_([0-9]+).[0-9].*$" "\\1" OPENSSH_VERSION_MAJOR "${OPENSSH_VERSION_STR}") ++ string(REGEX REPLACE "^.*OpenSSH_[0-9]+.([0-9]).*$" "\\1" OPENSSH_VERSION_MINOR "${OPENSSH_VERSION_STR}") + set(OPENSSH_VERSION "${OPENSSH_VERSION_MAJOR}.${OPENSSH_VERSION_MINOR}") ++ add_definitions(-DOPENSSH_VERSION_MAJOR=${OPENSSH_VERSION_MAJOR} -DOPENSSH_VERSION_MINOR=${OPENSSH_VERSION_MINOR}) + if("${OPENSSH_VERSION}" VERSION_LESS "6.3") + # ssh - Q was introduced in 6.3 + message("Version less than 6.3, hardcoding cipher list") +@@ -207,14 +208,6 @@ if (CLIENT_TESTING OR SERVER_TESTING) + /usr/bin + /usr/local/bin) + +- find_program(SSH_EXECUTABLE NAMES ssh) +- if (SSH_EXECUTABLE) +- execute_process(COMMAND ${SSH_EXECUTABLE} -V ERROR_VARIABLE OPENSSH_VERSION_STR) +- string(REGEX REPLACE "^.*OpenSSH_([0-9]).[0-9].*$" "\\1" OPENSSH_VERSION_MAJOR "${OPENSSH_VERSION_STR}") +- string(REGEX REPLACE "^.*OpenSSH_[0-9].([0-9]).*$" "\\1" OPENSSH_VERSION_MINOR "${OPENSSH_VERSION_STR}") +- add_definitions(-DOPENSSH_VERSION_MAJOR=${OPENSSH_VERSION_MAJOR} -DOPENSSH_VERSION_MINOR=${OPENSSH_VERSION_MINOR}) +- endif() +- + set(LOCAL_USER "nobody") + set(LOCAL_UID "65533") + find_program(ID_EXECUTABLE NAMES id) +-- +GitLab diff --git a/net-libs/libssh/libssh-0.11.1-r1.ebuild b/net-libs/libssh/libssh-0.11.1-r1.ebuild index ff8dea4ce6d1..4badd5848619 100644 --- a/net-libs/libssh/libssh-0.11.1-r1.ebuild +++ b/net-libs/libssh/libssh-0.11.1-r1.ebuild @@ -39,6 +39,10 @@ BDEPEND="doc? ( app-text/doxygen[dot] )" DOCS=( AUTHORS CHANGELOG README ) +PATCHES=( + "${FILESDIR}"/${PN}-0.11.1-openssh-10.patch +) + src_prepare() { cmake_src_prepare