gentoo auto-resync : 30:08:2023 - 04:07:22

4 files changed, 163 insertions, 0 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 1e023a047140..015c3090519b 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index a967161f78f5..0f7b1805e467 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,8 +1,10 @@
 AUX libssh2-1.10.0-libressl.patch 1107 BLAKE2B 5ffb1ffb64da219203e71e335c5808036aaf414ffa1baa72567a33e8c60218a71996544bec3b0c56b448e2884df99c3017f9ac20b9ff6f44e0dc645c2bb1b8c8 SHA512 2e2e8db30b0c7c0d454f11f644630c5cef00ab46ca97104845943d6ab9806d99f952d1c194f9b28d5d0e565c86867d7d59bb9af0cde433017aeb0e8862124318
 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.10.0.tar.gz 965044 BLAKE2B 0e6f571cc723e0050bf7ba7492f361ef222547dcbc311019cb6762f01405b4906e0418207a7d484c5170bee5e6f666827a7ea0d0cf233f684f999f896ce0b415 SHA512 e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30
 DIST libssh2-1.11.0.tar.xz 686796 BLAKE2B 36903798c72f7261d9e997254169c10a4e69166017445276de8b0066fff15cd4dae4119a8d6cbbab8859d765b2d7f34f2911bbaf83c8d6ac5d1feead6b5de64e SHA512 6d50c71b778ca0f769fcc9d2cc257ab669cd0b6c35e8b0e047b6b38aea10638974cc591ba27c25bb7dd523020b4a8a62e2c1ae368287d9dc254d5e24d4a7cee7
 EBUILD libssh2-1.10.0.ebuild 1345 BLAKE2B 4c2fac289235288aaab718a78cf75113e1e7141e5ca58eb98b22a1f67722ad1f2266f31d8040005da35a3dedac68312898e7d466e7ddbc0f3d804893eec66bd2 SHA512 ffdbb9393595a75b2db0f551989fa2713fe19893798c2ad73efc86be17b9de13210a600830ba7e769048b0cb69294881754e9e5118b8570c6f7349b321cca328
 EBUILD libssh2-1.11.0-r1.ebuild 1442 BLAKE2B 290f1b4f0123ba47ae072c279a162105674778e589ff11ed0b017e4a0b0f4f8bd487fbf1414a3f2cbabb95efa25835ea79259d28d523cbfaf7aff5ee700bb7da SHA512 1c4e23333615065cca890270fe3e6e689fb7ce32f9fc37c760355be71c5aa9f662897685af9dbf293743ea4fa0e804fe6fcdb1acda206623187920cf25f0ecef
+EBUILD libssh2-1.11.0-r2.ebuild 1484 BLAKE2B 4b2d2ddead1fabbf0ff3d0725cf0c5d33a0df9bb82cdcfe1d474183d03e012977432c1bbf04cf5c7ceb48fe1af09cc346e67c6f11c35343e32782fec803e379e SHA512 c83ea41a599bef6d1065c864f9b02bc1306aa5fca392783cd3cc913651cdd1dce9aac8e83ae8ff9b3a3e2109759bd93b9a197b46601e25ff059240c4bff0ff28
 EBUILD libssh2-9999.ebuild 1363 BLAKE2B 784497be1fffce7873dc5913d4bdf08638c0feff8e0cd6c51141c3a2d8b75d37c7648d4590f73291153f7af1fd47ccebf1f952a2fa27aafee1d55e477948d945 SHA512 cebb0036b408cd3971c6d7307a47a54d617508085cb73f992fa124927d07e41eb136e9f80556bc6529fc8add65ae59200097c66132697e00be83dcdc8c1b35e0
 MISC metadata.xml 625 BLAKE2B 5b2b547a4378190e5fd38b0e4047556da2eb827db4b311aab8fd9456f15a711948bad53951d5b6f1f00620292f938ae097ea43044ab9cc926db941245de22887 SHA512 2ec081036258736ae097981cc5a997c81b09d235ac7f79500128675c0d9df0d8d83d3f570d6dfccac3340d1018f0ad3511f7a8df7e67e8bf9b0a17d4c7332d10
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
new file mode 100644
index 000000000000..ade3cdee8a49
--- /dev/null
+++ b/net-libs/libssh2/files/libssh2-1.11.0-size_t.patch
@@ -0,0 +1,95 @@
+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
new file mode 100644
index 000000000000..2afaa2f4cbe9
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
@@ -0,0 +1,66 @@
+# 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 ~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
+)
+
+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
+}