diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-09-02 22:17:17 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-09-02 22:17:17 +0100 |
commit | f247b36fc6df2694a347f5305eeb7f927d7c0ffe (patch) | |
tree | c80963b87f0b1c0c5019d9259ccda86498c7edcd /net-libs/libssh2 | |
parent | e5206efa6e88d32e3819685adee35c49124ccf0e (diff) |
gentoo auto-resync : 02:09:2023 - 22:17:17
Diffstat (limited to 'net-libs/libssh2')
-rw-r--r-- | net-libs/libssh2/Manifest | 3 | ||||
-rw-r--r-- | net-libs/libssh2/files/libssh2-1.10.0-libressl.patch | 33 | ||||
-rw-r--r-- | net-libs/libssh2/libssh2-1.10.0.ebuild | 56 |
3 files changed, 0 insertions, 92 deletions
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest index 0f7b1805e467..a2a24080def4 100644 --- a/net-libs/libssh2/Manifest +++ b/net-libs/libssh2/Manifest @@ -1,9 +1,6 @@ -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 diff --git a/net-libs/libssh2/files/libssh2-1.10.0-libressl.patch b/net-libs/libssh2/files/libssh2-1.10.0-libressl.patch deleted file mode 100644 index 9cecabd5d01e..000000000000 --- a/net-libs/libssh2/files/libssh2-1.10.0-libressl.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://bugs.gentoo.org/903001 -https://github.com/libssh2/libssh2/pull/700 -https://github.com/libssh2/libssh2/commit/b952674f120748174ed2c0fb93e7bd78cf355cac - -From f0681a4573d7c7f7484d3157ddff7063a200295b Mon Sep 17 00:00:00 2001 -From: Viktor Szakats <commit@vsz.me> -Date: Thu, 19 May 2022 13:25:06 +0000 -Subject: [PATCH] openssl: add support for LibreSSL 3.5.x - -LibreSSL 3.5.0 made more structures opaque, so let's enable existing -support for that when building against these LibreSSL versions. - -Ref: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.5.0-relnotes.txt ---- - src/openssl.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/openssl.h b/src/openssl.h -index 658b040..09bfd7c 100644 ---- a/src/openssl.h -+++ b/src/openssl.h -@@ -57,8 +57,9 @@ - #include <openssl/pem.h> - #include <openssl/rand.h> - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ -- !defined(LIBRESSL_VERSION_NUMBER) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && \ -+ !defined(LIBRESSL_VERSION_NUMBER)) || \ -+ LIBRESSL_VERSION_NUMBER >= 0x3050000fL - # define HAVE_OPAQUE_STRUCTS 1 - #endif - diff --git a/net-libs/libssh2/libssh2-1.10.0.ebuild b/net-libs/libssh2/libssh2-1.10.0.ebuild deleted file mode 100644 index a4c6f0460f8e..000000000000 --- a/net-libs/libssh2/libssh2-1.10.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit cmake-multilib - -DESCRIPTION="Library implementing the SSH2 protocol" -HOMEPAGE="https://www.libssh2.org" -SRC_URI="https://www.libssh2.org/download/${P}.tar.gz" - -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 zlib" -REQUIRED_USE="?? ( gcrypt mbedtls )" -# Tests try to set containers up using docker (and fail for some reason). -RESTRICT="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}"/${P}-libressl.patch #903001 -) - -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 - -DCRYPTO_BACKEND=${crypto_backend} - -DENABLE_ZLIB_COMPRESSION=$(usex zlib) - ) - cmake_src_configure -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} |