summaryrefslogtreecommitdiff
path: root/net-libs
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/Manifest.gzbin31007 -> 31007 bytes
-rw-r--r--net-libs/libssh2/Manifest4
-rw-r--r--net-libs/libssh2/files/0001-cmake-always-run-the-tests-even-when-static-libs-are.patch66
-rw-r--r--net-libs/libssh2/libssh2-1.11.0-r3.ebuild69
-rw-r--r--net-libs/libssh2/libssh2-9999.ebuild11
5 files changed, 144 insertions, 6 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 6338c5429a73..b1d2cdfd3860 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
Binary files differ
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index c625215dd954..6e5256a24024 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,6 +1,8 @@
+AUX 0001-cmake-always-run-the-tests-even-when-static-libs-are.patch 2738 BLAKE2B e39dd6a0d63a137d20ee10dea596c3ed4a6e6e4ef9a49dbc9de24f144ec6c3f06c05270b44758cd397ed7906a863130ffea22394ce23d49bcc8b2892fc599f8b SHA512 32acf70a1d7ba79c17f625f289b97eea12f189c9f27812dc6bdbf87fb12ad70a3adb261423d608fa262375f6185a6ad1e5e97fc0a9ab0103de6c3ed28197c506
AUX libssh2-1.11.0-mansyntax_sh.patch 304 BLAKE2B 465b6cf0a67fb9d4db83b0ae1556a2cc5d40a2feb981129b8bbe80fcbd75c26fb551a7a33de997ef70101418b094fd18cda55078e2147843c9852b9f7f069451 SHA512 657a6980c505d7359d544d802039325a9e91d2c08f76c499b189c356f47102d793c447aae03d82a22ca25e37c4a02e2c3f7f9cd2cefd37a2c91e0efbf99e86c7
AUX libssh2-1.11.0-size_t.patch 4251 BLAKE2B e5ef686f8c3d0211d33524b81433f3a8be86b6ce7ac274d788075e827c8b37c6adb6fc790e471d1702118123ae0919f2b2bdd78b3788feffaf94672d1d32b328 SHA512 e52a0f2a531daf8c0e512b3ab802fbe7e7705f793f50455399f1d5e905e1b4d26299ac649b0da7f5856eb451eeaff814124e751d39996927f5cd931c85046981
DIST libssh2-1.11.0.tar.xz 686796 BLAKE2B 36903798c72f7261d9e997254169c10a4e69166017445276de8b0066fff15cd4dae4119a8d6cbbab8859d765b2d7f34f2911bbaf83c8d6ac5d1feead6b5de64e SHA512 6d50c71b778ca0f769fcc9d2cc257ab669cd0b6c35e8b0e047b6b38aea10638974cc591ba27c25bb7dd523020b4a8a62e2c1ae368287d9dc254d5e24d4a7cee7
EBUILD libssh2-1.11.0-r2.ebuild 1481 BLAKE2B 2df9adf384209518bb8ba9fe02d511aa421a58694ee419518d0199ff3fc519b0fbd926c6080631ed9a45b88197ff3e45925f1fd6fb6fb319d171cd4d7aac8b15 SHA512 3e326a9074eef6530699a7dd133b46b784fa1b751f23e31f0c1225e2eacad63a55bf8401fc9d882a6e289b40cbecc0b2cac9517c98dca9aeb3be7d2f7b2be532
-EBUILD libssh2-9999.ebuild 1363 BLAKE2B 784497be1fffce7873dc5913d4bdf08638c0feff8e0cd6c51141c3a2d8b75d37c7648d4590f73291153f7af1fd47ccebf1f952a2fa27aafee1d55e477948d945 SHA512 cebb0036b408cd3971c6d7307a47a54d617508085cb73f992fa124927d07e41eb136e9f80556bc6529fc8add65ae59200097c66132697e00be83dcdc8c1b35e0
+EBUILD libssh2-1.11.0-r3.ebuild 1634 BLAKE2B 1083567f229cf082d764706c86017f4183d9dacb939f0a2245be91cd5df43aa06e074f5f18d67f19c9ebe8c232be851f4c1e70f99b0aa1a43a84e34f324939f5 SHA512 503b60bf6325ceae25171d5e668c00d36efe9c64fe9a890f944431177c0a8150982b86bf5c0226c313db5876d43b50b8f71cbe2cbd843e5afe2faa482b341efb
+EBUILD libssh2-9999.ebuild 1340 BLAKE2B 20782fca446145ee85fa31929878dacb60fcd8a223a730545443d646524d80bc055753651e7cfb09d6d93123656e50548ab1661e1858a74e5d81e726a1783808 SHA512 f774ba8bbaae89a0cfa12eb572915f71a2fe653da635f26be723f875e9d06054ec5dd7aa6766399f2d0c74ed98142449b5cf5d6acbcb30fe2f35c1b567325a16
MISC metadata.xml 684 BLAKE2B 24abefd923c417602ceba0d1eda1c43a14c20b3b7091b30e4a17d729e01ad8247fb6b5d10df16f26f89ea53c006a5cad03b227213b76c3d7953047ac9bfe8b30 SHA512 c4ca1fb726c643206c3db74c5ed92e4755afa65310695ca3f8e5bed67308dedadc4ff44e5554af706ac0e618748c8cf52b9616e60c1b872841817f193b56af3b
diff --git a/net-libs/libssh2/files/0001-cmake-always-run-the-tests-even-when-static-libs-are.patch b/net-libs/libssh2/files/0001-cmake-always-run-the-tests-even-when-static-libs-are.patch
new file mode 100644
index 000000000000..a809420ca803
--- /dev/null
+++ b/net-libs/libssh2/files/0001-cmake-always-run-the-tests-even-when-static-libs-are.patch
@@ -0,0 +1,66 @@
+From 9a769054fc03f02db75355f0850360a26fae7324 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@gentoo.org>
+Date: Thu, 5 Sep 2024 23:18:47 -0400
+Subject: [PATCH] cmake: always run the tests even when static libs are
+ disabled
+
+The BUILD_STATIC_LIBS option is intended for the use case where users do
+not wish to build and install a static lib because it is not one of the
+artifacts they are interested in. The option should not be used to
+disable running the testsuite.
+
+Instead, when tests are enabled, define the target. Just don't export or
+install it. Build systems build lots of things that aren't deliverable
+artifacts, and this becomes just one more of them.
+
+(cherry-picked from PR https://github.com/libssh2/libssh2/pull/1450)
+
+Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
+---
+ src/CMakeLists.txt | 6 ++++--
+ tests/CMakeLists.txt | 8 ++------
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5bbed5e5..eb2fb7c2 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -97,8 +97,10 @@ if(WIN32 AND BUILD_STATIC_LIBS AND BUILD_SHARED_LIBS AND
+ endif()
+
+ # we want it to be called libssh2 on all platforms
+-if(BUILD_STATIC_LIBS)
+- list(APPEND libssh2_export ${LIB_STATIC})
++if(BUILD_STATIC_LIBS OR BUILD_TESTING)
++ if(BUILD_STATIC_LIBS)
++ list(APPEND libssh2_export ${LIB_STATIC})
++ endif()
+ add_library(${LIB_STATIC} STATIC ${SOURCES})
+ target_compile_definitions(${LIB_STATIC} PRIVATE ${PRIVATE_COMPILE_DEFINITIONS} ${libssh2_DEFINITIONS})
+ target_link_libraries(${LIB_STATIC} PRIVATE ${LIBRARIES})
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 76eb78ef..a61ea5a3 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -73,16 +73,12 @@ target_include_directories(runner PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../src" .
+ foreach(test ${DOCKER_TESTS} ${STANDALONE_TESTS} ${SSHD_TESTS})
+ if(NOT ";${TESTS_WITH_LIB_STATIC};" MATCHES ";${test};")
+ set(LIB_FOR_TESTS ${LIB_SELECTED})
+- elseif(TARGET ${LIB_STATIC})
+- set(LIB_FOR_TESTS ${LIB_STATIC})
+ else()
+- unset(LIB_FOR_TESTS)
+- message(STATUS "Skip test requiring static libssh2 lib: ${test}")
++ set(LIB_FOR_TESTS ${LIB_STATIC})
+ endif()
+
+ # We support the same target as both Docker and SSHD test. Build those just once.
+- # Skip building tests that require the static lib when the static lib is disabled.
+- if(NOT TARGET ${test} AND LIB_FOR_TESTS)
++ if(NOT TARGET ${test})
+ add_executable(${test} ${test}.c)
+ target_compile_definitions(${test} PRIVATE "${CRYPTO_BACKEND_DEFINE}")
+ target_include_directories(${test} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../src" ../src ../include "${CRYPTO_BACKEND_INCLUDE_DIR}")
+--
+2.44.2
+
diff --git a/net-libs/libssh2/libssh2-1.11.0-r3.ebuild b/net-libs/libssh2/libssh2-1.11.0-r3.ebuild
new file mode 100644
index 000000000000..3c699abeb4e6
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.11.0-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Library implementing the SSH2 protocol"
+HOMEPAGE="https://libssh2.org"
+SRC_URI="https://libssh2.org/download/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="gcrypt mbedtls test zlib"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+ !gcrypt? (
+ mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
+ !mbedtls? (
+ >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+ )
+ )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+ ${RDEPEND}
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.11.0-mansyntax_sh.patch
+ "${FILESDIR}"/${PN}-1.11.0-size_t.patch
+ # https://github.com/libssh2/libssh2/pull/1450
+ "${FILESDIR}"/0001-cmake-always-run-the-tests-even-when-static-libs-are.patch
+)
+
+multilib_src_configure() {
+ local crypto_backend=OpenSSL
+ if use gcrypt; then
+ crypto_backend=Libgcrypt
+ elif use mbedtls; then
+ crypto_backend=mbedTLS
+ fi
+
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_STATIC_LIBS=OFF
+ -DBUILD_TESTING=$(usex test)
+ -DCRYPTO_BACKEND=${crypto_backend}
+ -DENABLE_ZLIB_COMPRESSION=$(usex zlib)
+ )
+
+ if use test ; then
+ # Pass separately to avoid unused var warnings w/ USE=-test
+ mycmakeargs+=(
+ -DRUN_SSHD_TESTS=OFF
+ -DRUN_DOCKER_TESTS=OFF
+ )
+ fi
+
+ cmake_src_configure
+}
+
+multilib_src_install_all() {
+ einstalldocs
+}
diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild
index 70a9e03a7d0b..939a5d0804a7 100644
--- a/net-libs/libssh2/libssh2-9999.ebuild
+++ b/net-libs/libssh2/libssh2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
inherit cmake-multilib git-r3
DESCRIPTION="Library implementing the SSH2 protocol"
-HOMEPAGE="https://www.libssh2.org"
+HOMEPAGE="https://libssh2.org"
EGIT_REPO_URI="https://github.com/libssh2/libssh2"
LICENSE="BSD"
@@ -26,7 +26,9 @@ RDEPEND="
)
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
"
-DEPEND="${RDEPEND}"
+DEPEND="
+ ${RDEPEND}
+"
PATCHES=(
"${FILESDIR}"/${PN}-1.11.0-mansyntax_sh.patch
@@ -42,11 +44,10 @@ multilib_src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=ON
+ -DBUILD_STATIC_LIBS=OFF
-DBUILD_TESTING=$(usex test)
-DCRYPTO_BACKEND=${crypto_backend}
-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
- -DRUN_SSHD_TESTS=OFF
- -DRUN_DOCKER_TESTS=OFF
)
if use test ; then
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-27 12:37:08 +0000