From 192f646c59ab492184c52ce455485935096a2c2e Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 6 Mar 2024 15:55:02 +0100 Subject: [PATCH 1/2] net-libs/libssh2: Drop unused package --- .../portage-stable/net-libs/libssh2/Manifest | 1 - .../files/libssh2-1.11.0-mansyntax_sh.patch | 10 -- .../libssh2/files/libssh2-1.11.0-size_t.patch | 95 ------------------- .../net-libs/libssh2/libssh2-1.11.0-r2.ebuild | 66 ------------- .../net-libs/libssh2/libssh2-9999.ebuild | 65 ------------- .../net-libs/libssh2/metadata.xml | 19 ---- 6 files changed, 256 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libssh2/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.11.0-mansyntax_sh.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.11.0-size_t.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.11.0-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-9999.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libssh2/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/Manifest b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/Manifest deleted file mode 100644 index d161b27f79..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libssh2-1.11.0.tar.xz 686796 BLAKE2B 36903798c72f7261d9e997254169c10a4e69166017445276de8b0066fff15cd4dae4119a8d6cbbab8859d765b2d7f34f2911bbaf83c8d6ac5d1feead6b5de64e SHA512 6d50c71b778ca0f769fcc9d2cc257ab669cd0b6c35e8b0e047b6b38aea10638974cc591ba27c25bb7dd523020b4a8a62e2c1ae368287d9dc254d5e24d4a7cee7 diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.11.0-mansyntax_sh.patch b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.11.0-mansyntax_sh.patch deleted file mode 100644 index 8d8e93cda4..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.11.0-mansyntax_sh.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -63,7 +63,6 @@ if(SH_EXECUTABLE) - mark_as_advanced(SSHD_EXECUTABLE) - endif() - -- add_test(NAME mansyntax COMMAND ${SH_EXECUTABLE} -c "${CMAKE_CURRENT_SOURCE_DIR}/mansyntax.sh") - endif() - - add_library(runner STATIC ${librunner_la_SOURCES}) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.11.0-size_t.patch b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/files/libssh2-1.11.0-size_t.patch deleted file mode 100644 index ade3cdee8a..0000000000 --- a/sdk_container/src/third_party/portage-stable/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 -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/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.11.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.11.0-r2.ebuild deleted file mode 100644 index eb37955cf5..0000000000 --- a/sdk_container/src/third_party/portage-stable/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 ~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 -} diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-9999.ebuild deleted file mode 100644 index 70a9e03a7d..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-9999.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib git-r3 - -DESCRIPTION="Library implementing the SSH2 protocol" -HOMEPAGE="https://www.libssh2.org" -EGIT_REPO_URI="https://github.com/libssh2/libssh2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="" -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 -) - -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) - -DRUN_SSHD_TESTS=OFF - -DRUN_DOCKER_TESTS=OFF - ) - - 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/sdk_container/src/third_party/portage-stable/net-libs/libssh2/metadata.xml b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/metadata.xml deleted file mode 100644 index 72168fb364..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - netmon@gentoo.org - - - mgorny@gentoo.org - Michał Górny - - - Use dev-libs/libgcrypt instead of dev-libs/openssl - Use net-libs/mbedtls instead of dev-libs/openssl - - - libssh2/libssh2 - cpe:/a:libssh2:libssh2 - - From 985fb10a4f4660c1378fe6fe1a4d8410d38efb5d Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 6 Mar 2024 15:55:44 +0100 Subject: [PATCH 2/2] .github: Drop net-libs/libssh2 from automation --- .github/workflows/portage-stable-packages-list | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 1e521d54ff..8260c0991e 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -418,7 +418,6 @@ net-libs/libnsl net-libs/libpcap net-libs/libpsl net-libs/libslirp -net-libs/libssh2 net-libs/nghttp2 net-libs/rpcsvc-proto