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 111E9158074 for ; Thu, 26 Jun 2025 02:14:46 +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) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id F023A34108C for ; Thu, 26 Jun 2025 02:14:45 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 8791311055D; Thu, 26 Jun 2025 02:14:39 +0000 (UTC) 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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 7D5F411055D for ; Thu, 26 Jun 2025 02:14:39 +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 3BC6A34106C for ; Thu, 26 Jun 2025 02:14:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 796532A89 for ; Thu, 26 Jun 2025 02:14:37 +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: <1750903972.1ad83a84728ca9719c46198f3e911fb678b1f230.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libssh/Manifest net-libs/libssh/libssh-0.11.2.ebuild net-libs/libssh/libssh-9999.ebuild X-VCS-Directories: net-libs/libssh/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1ad83a84728ca9719c46198f3e911fb678b1f230 X-VCS-Branch: master Date: Thu, 26 Jun 2025 02:14:37 +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: b5b9a7e3-b5df-4a3f-b372-96d309eca392 X-Archives-Hash: b0b5da2b5737dd34a9a3eeeae348f290 commit: 1ad83a84728ca9719c46198f3e911fb678b1f230 Author: Sam James gentoo org> AuthorDate: Thu Jun 26 02:12:38 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jun 26 02:12:52 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ad83a84 net-libs/libssh: add 0.11.2, use dot-a.eclass for LTO static libs There are two upstream commits to improve test timeouts: * 1d157c57a3c8a34abbbff96266687101ecf246e4 * 747dd17e64141d4875f2616f3e520ee3245b8b7b I'm not going to drop our timeout increases and such now as this is a security bump and we don't want to jeopardise stabilisation beind held up by avoidable test failures. Bug: https://bugs.gentoo.org/959101 Signed-off-by: Sam James gentoo.org> net-libs/libssh/Manifest | 1 + .../libssh/{libssh-9999.ebuild => libssh-0.11.2.ebuild} | 13 ++++++++++--- net-libs/libssh/libssh-9999.ebuild | 13 ++++++++++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest index 90d6e58cd728..5f56d66035ff 100644 --- a/net-libs/libssh/Manifest +++ b/net-libs/libssh/Manifest @@ -1 +1,2 @@ DIST libssh-0.11.1.tar.xz 621108 BLAKE2B 87079b4eaf66ceb77803b3d854f847b3f3fb6a67ac3bfa756ebcf8f06bf2b313e976044e0a1d81227fb5278fb04bc56f1a82877d14a6ee76bec0c690b14f38a7 SHA512 284d376ad9ea30b0274b4ac754b27d168286dca862ece43ef15ca6d89e66865ad7a6703cc12dd4a8564a60b8449ae9b36e6496fd51d34cc27ac4030f6cf216d6 +DIST libssh-0.11.2.tar.xz 619428 BLAKE2B 7f4a97b2027e386f5bfd308b1aac1938484722d4d1bb55ce0fa2de8358bedea47955df1cb4e68679033d1a5538058422770872f2f6513a82199ff506eccfad0e SHA512 15d56c3f82ee81c3ab4af2b17eba054626bb53c3337ef45f829479f8b64c552f6e7cbf307e41c9792bcb3438f282d2690acbe994150bd03a8b6c21ba8b1cfe50 diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-0.11.2.ebuild similarity index 95% copy from net-libs/libssh/libssh-9999.ebuild copy to net-libs/libssh/libssh-0.11.2.ebuild index 7d741cff2c57..26043006a47a 100644 --- a/net-libs/libssh/libssh-9999.ebuild +++ b/net-libs/libssh/libssh-0.11.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake-multilib +inherit cmake-multilib dot-a DESCRIPTION="Access a working SSH implementation by means of a library" HOMEPAGE="https://www.libssh.org/" @@ -20,7 +20,6 @@ LICENSE="LGPL-2.1" SLOT="0/4" # subslot = soname major version IUSE="debug doc examples gssapi mbedtls pcap server +sftp static-libs test zlib" # Maintainer: check IUSE-defaults at DefineOptions.cmake - RESTRICT="!test? ( test )" RDEPEND=" @@ -29,7 +28,8 @@ RDEPEND=" mbedtls? ( net-libs/mbedtls:3=[${MULTILIB_USEDEP},threads] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] elibc_musl? ( sys-libs/argp-standalone ) @@ -81,6 +81,11 @@ src_prepare() { fi } +src_configure() { + lto-guarantee-fat + multilib-minimal_src_configure +} + multilib_src_configure() { local mycmakeargs=( -DWITH_NACL=OFF @@ -88,6 +93,7 @@ multilib_src_configure() { -DWITH_STACK_PROTECTOR_STRONG=OFF -DWITH_DEBUG_CALLTRACE=$(usex debug) -DWITH_DEBUG_CRYPTO=$(usex debug) + # Deprecated per CMakeLists.txt -DWITH_GCRYPT=OFF -DWITH_GSSAPI=$(usex gssapi) -DWITH_MBEDTLS=$(usex mbedtls) @@ -127,6 +133,7 @@ multilib_src_install() { } multilib_src_install_all() { + strip-lto-bytecode use mbedtls && DOCS+=( README.mbedtls ) einstalldocs diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild index 7d741cff2c57..26043006a47a 100644 --- a/net-libs/libssh/libssh-9999.ebuild +++ b/net-libs/libssh/libssh-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake-multilib +inherit cmake-multilib dot-a DESCRIPTION="Access a working SSH implementation by means of a library" HOMEPAGE="https://www.libssh.org/" @@ -20,7 +20,6 @@ LICENSE="LGPL-2.1" SLOT="0/4" # subslot = soname major version IUSE="debug doc examples gssapi mbedtls pcap server +sftp static-libs test zlib" # Maintainer: check IUSE-defaults at DefineOptions.cmake - RESTRICT="!test? ( test )" RDEPEND=" @@ -29,7 +28,8 @@ RDEPEND=" mbedtls? ( net-libs/mbedtls:3=[${MULTILIB_USEDEP},threads] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] elibc_musl? ( sys-libs/argp-standalone ) @@ -81,6 +81,11 @@ src_prepare() { fi } +src_configure() { + lto-guarantee-fat + multilib-minimal_src_configure +} + multilib_src_configure() { local mycmakeargs=( -DWITH_NACL=OFF @@ -88,6 +93,7 @@ multilib_src_configure() { -DWITH_STACK_PROTECTOR_STRONG=OFF -DWITH_DEBUG_CALLTRACE=$(usex debug) -DWITH_DEBUG_CRYPTO=$(usex debug) + # Deprecated per CMakeLists.txt -DWITH_GCRYPT=OFF -DWITH_GSSAPI=$(usex gssapi) -DWITH_MBEDTLS=$(usex mbedtls) @@ -127,6 +133,7 @@ multilib_src_install() { } multilib_src_install_all() { + strip-lto-bytecode use mbedtls && DOCS+=( README.mbedtls ) einstalldocs