gentoo auto-resync : 07:12:2024 - 02:07:26

6 files changed, 2 insertions, 303 deletions

diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 5f725a2bdf90..c2bc5a3439cb 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,10 +1,5 @@
-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
 DIST libssh2-1.11.1.tar.xz 721700 BLAKE2B 8ab227556f8e7f094b2b8dc77e311d6935580690dd7d46f8766654a30078fb0be4182f43136896a04b5a2d15175397fab76607472d5f3cd31c8837a86e0c3c83 SHA512 8322b54a522b0cbbb07916d29ec045c08f8ed94bd8abb5e524038640e90a317667a25be46d95b62b101ed726ade0a51a90fb246cf34c045c38f927f4e439e431
-EBUILD libssh2-1.11.0-r2.ebuild 1475 BLAKE2B d008d48739105848113d1b73d5f16682e8de50c55b6ee8301169e3c830a21c9764a1ecb2232695bd8f7074c523bc6848cbc60ccb8d2618a1cd98bd8b0bc34140 SHA512 4d1eacc93142a7eee3567a152425746400bc8871f3f78b2afe0bfcc3b1ae34c0dde2d22f8b1f47cd2e960a0f239c36dc1fc1880863c3b4b6762993bcda7e995a
-EBUILD libssh2-1.11.0-r3.ebuild 1622 BLAKE2B 754c3340c15d028a8d682263cf5d4ad76a67edee82380906cb117fbbcd704f2326a952a497286e6ca007f2edc004792eb672f1187db022976b9b5087bc54742f SHA512 a27f994ad1f055a2c88258123ab0616a5593bca01b2ef34d6462a11a83db693bb7b83b8bbe86dfda968043840dce917ec76bbf6dc92ba58c0a0ff78a537658d7
-EBUILD libssh2-1.11.1.ebuild 1453 BLAKE2B 7f6452adbcf5148165b54147d603c60affd18f5f21ecadc9789c0f0089311e5f1e5725eef279de7ce1f96e4e1cb2f94136a49741c702430e4dea1167be905322 SHA512 e0dcd715a059a98341462be907a3164c73725b60b9b1b653a6d5daf3114511976d361f75f2279589b550147b38561057138af9ac7b8f6413f90fa14eacdd3383
+EBUILD libssh2-1.11.1.ebuild 1452 BLAKE2B 98775eface42d790f29c8c0418e95ad14403681401c750069e70415ad00fcb5f975935f5340323142d2aa0cc985f0d51efd7ef3d8076fcd31586e2b22071c121 SHA512 ca2362db882b46e1a5066a8cbde07ac4ca61dbd383d1673860456f39f355b5626fe20a77c6bfa8b76c58bdf3534724caee8858feb3e1a8c6d0e7f4870de4c86b
 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
deleted file mode 100644
index a809420ca803..000000000000
--- a/net-libs/libssh2/files/0001-cmake-always-run-the-tests-even-when-static-libs-are.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-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/files/libssh2-1.11.0-size_t.patch b/net-libs/libssh2/files/libssh2-1.11.0-size_t.patch
deleted file mode 100644
index ade3cdee8a49..000000000000
--- a/net-libs/libssh2/files/libssh2-1.11.0-size_t.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-https://bugs.gentoo.org/911279
-Upstream: https://github.com/libssh2/libssh2/issues/1053
-Commit: https://github.com/libssh2/libssh2/commit/1153ebdeba563ac657b525edd6bf6da68b1fe5e2
-From: Viktor Szakats <commit@vsz.me>
-Date: Tue, 30 May 2023 17:28:03 +0000
-Subject: [PATCH] mbedtls: use more `size_t` to sync up with `crypto.h`
-
-Ref: 5a96f494ee0b00282afb2db2e091246fc5e1774a #846 #879
-
-Fixes #1053
-Closes #1054
---- a/src/mbedtls.c
-+++ b/src/mbedtls.c
-@@ -186,7 +186,7 @@ _libssh2_mbedtls_cipher_dtor(_libssh2_cipher_ctx *ctx)
- int
- _libssh2_mbedtls_hash_init(mbedtls_md_context_t *ctx,
-                            mbedtls_md_type_t mdtype,
--                           const unsigned char *key, unsigned long keylen)
-+                           const unsigned char *key, size_t keylen)
- {
-     const mbedtls_md_info_t *md_info;
-     int ret, hmac;
-@@ -221,7 +221,7 @@ _libssh2_mbedtls_hash_final(mbedtls_md_context_t *ctx, unsigned char *hash)
- }
- 
- int
--_libssh2_mbedtls_hash(const unsigned char *data, unsigned long datalen,
-+_libssh2_mbedtls_hash(const unsigned char *data, size_t datalen,
-                       mbedtls_md_type_t mdtype, unsigned char *hash)
- {
-     const mbedtls_md_info_t *md_info;
-@@ -497,8 +497,9 @@ int
- _libssh2_mbedtls_rsa_sha2_verify(libssh2_rsa_ctx * rsactx,
-                                  size_t hash_len,
-                                  const unsigned char *sig,
--                                 unsigned long sig_len,
--                                 const unsigned char *m, unsigned long m_len)
-+                                 size_t sig_len,
-+                                 const unsigned char *m,
-+                                 size_t m_len)
- {
-     int ret;
-     int md_type;
-@@ -548,8 +549,9 @@ _libssh2_mbedtls_rsa_sha2_verify(libssh2_rsa_ctx * rsactx,
- int
- _libssh2_mbedtls_rsa_sha1_verify(libssh2_rsa_ctx * rsactx,
-                                  const unsigned char *sig,
--                                 unsigned long sig_len,
--                                 const unsigned char *m, unsigned long m_len)
-+                                 size_t sig_len,
-+                                 const unsigned char *m,
-+                                 size_t m_len)
- {
-     return _libssh2_mbedtls_rsa_sha2_verify(rsactx, SHA_DIGEST_LENGTH,
-                                             sig, sig_len, m, m_len);
---- a/src/mbedtls.h
-+++ b/src/mbedtls.h
-@@ -478,12 +478,12 @@ _libssh2_mbedtls_cipher_dtor(_libssh2_cipher_ctx *ctx);
- int
- _libssh2_mbedtls_hash_init(mbedtls_md_context_t *ctx,
-                            mbedtls_md_type_t mdtype,
--                           const unsigned char *key, unsigned long keylen);
-+                           const unsigned char *key, size_t keylen);
- 
- int
- _libssh2_mbedtls_hash_final(mbedtls_md_context_t *ctx, unsigned char *hash);
- int
--_libssh2_mbedtls_hash(const unsigned char *data, unsigned long datalen,
-+_libssh2_mbedtls_hash(const unsigned char *data, size_t datalen,
-                       mbedtls_md_type_t mdtype, unsigned char *hash);
- 
- _libssh2_bn *
-@@ -526,9 +526,8 @@ _libssh2_mbedtls_rsa_new_private_frommemory(libssh2_rsa_ctx **rsa,
- int
- _libssh2_mbedtls_rsa_sha1_verify(libssh2_rsa_ctx *rsa,
-                                  const unsigned char *sig,
--                                 unsigned long sig_len,
--                                 const unsigned char *m,
--                                 unsigned long m_len);
-+                                 size_t sig_len,
-+                                 const unsigned char *m, size_t m_len);
- int
- _libssh2_mbedtls_rsa_sha1_sign(LIBSSH2_SESSION *session,
-                                libssh2_rsa_ctx *rsa,
-@@ -540,8 +539,8 @@ int
- _libssh2_mbedtls_rsa_sha2_verify(libssh2_rsa_ctx * rsactx,
-                                  size_t hash_len,
-                                  const unsigned char *sig,
--                                 unsigned long sig_len,
--                                 const unsigned char *m, unsigned long m_len);
-+                                 size_t sig_len,
-+                                 const unsigned char *m, size_t m_len);
- int
- _libssh2_mbedtls_rsa_sha2_sign(LIBSSH2_SESSION *session,
-                                libssh2_rsa_ctx *rsa,
diff --git a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
deleted file mode 100644
index 540db8213b04..000000000000
--- a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 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://www.libssh2.org"
-SRC_URI="https://www.libssh2.org/download/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~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
-)
-
-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_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-1.11.0-r3.ebuild b/net-libs/libssh2/libssh2-1.11.0-r3.ebuild
deleted file mode 100644
index 1714863f1368..000000000000
--- a/net-libs/libssh2/libssh2-1.11.0-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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 ~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-1.11.1.ebuild b/net-libs/libssh2/libssh2-1.11.1.ebuild
index d43bef9af884..e30c2f36adef 100644
--- a/net-libs/libssh2/libssh2-1.11.1.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://libssh2.org/download/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~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 )"