diff options
Diffstat (limited to 'net-ftp/lftp')
| -rw-r--r-- | net-ftp/lftp/Manifest | 5 | ||||
| -rw-r--r-- | net-ftp/lftp/files/lftp-4.9.2-libressl.patch | 40 | ||||
| -rw-r--r-- | net-ftp/lftp/lftp-4.9.2.ebuild | 8 | ||||
| -rw-r--r-- | net-ftp/lftp/lftp-9999.ebuild | 9 |
4 files changed, 7 insertions, 55 deletions
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest index 92a2b621572d..4392af3a802e 100644 --- a/net-ftp/lftp/Manifest +++ b/net-ftp/lftp/Manifest @@ -9,8 +9,7 @@ AUX lftp-4.8.2-libdir-openssl.patch 658 BLAKE2B 430dab0713f82c3c10ac7395b8ca9ca1 AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8370cdf511303df4b17346275d936ebfcb658262102c01e61e11861d69e4c54f45baeddb246c062f3c66eadf8b0bcd SHA512 4a47a2e63bfe80faa640edc92c645e89d5c0063c0adc992f0b0613e01cfa0599f61f9bd07568432673addb1a981f101c474b1a0d99fd50fced455c9700b886e6 AUX lftp-4.9.1-libdir-readline.patch 404 BLAKE2B 88746dbfd082202950e54270519fa25c8a2042d3479342443394918722a8f0b7b2cde1580c7ac07c0c3408f86c12a83fa1973391ef25a9b3f348b7ad1afa68ac SHA512 e6ab456b237613f31c3e7e450a5127b5fac74a9d24d4bd5ca95f9b28d6c810ad0253d71d710e1daf15c43d0b2d5d2ecdb2b1fb7bbdaa4c3bc0b610d6cc6caf3b AUX lftp-4.9.2-ac-270.patch 1298 BLAKE2B 3431c649aa1f772a94640c1d1508b584eff0892098400eea5390c754ece5f23a877aa2eccb814bf1ece93e329980a29190aa784f4cc2b41efccc58c2921409d8 SHA512 efabe7cd6b3467b9212d47669842bf3b1b981ad6c8615bdfda4122d1a217e10fc0fda167903172502a13c63341ddab8e5bba91e5f39721c6fd304e29e6647a08 -AUX lftp-4.9.2-libressl.patch 1393 BLAKE2B fb014efb50ceb0ad1b0f58c8ebc70c43b474552f3e9f084a8d40e178c4d5dbf2b830fa987ac52a7249b790dfe8f84ed39f7676eedc66612acb2a83e3599bf952 SHA512 f427059a2047d817a1b0eab03cc861d78538a5bde7686ff9bf6955f7965f27b15f6b8ff5299fe821298e716d440b16f0fb61b922badf233fa88ba725a0a48396 DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad -EBUILD lftp-4.9.2.ebuild 2684 BLAKE2B 5181ba9e9737f23ca780e180a65fb0b82e4c1610f1d4c6ea51abae92fae6cdc3a3d1c5fe42cb01baefddd924e921964d457109d3975ff62246ec7e4d42a95eb2 SHA512 228e327e4885e23e0185521e843a4e5648fd6570081e16f2b44fa3593a195ad7d0755d31146a4d09de0cba79e3eb2570fca0b382fd47e5ae12e9531868164965 -EBUILD lftp-9999.ebuild 2438 BLAKE2B e96329335ad785af88182d486ba295a750c565136c41ebaa83f59b5430bf70de4f40f80d4abc79e68dd0b5b8d60e0ad8152c0e6ed6f119f687f95cfc6db783a1 SHA512 3b5a771d1be09c8b010ddc47cf2aa791a2924c464272feb7183a6f7da457fb0d6b7e2667828d41c405a47b93a5eb69b03616579cf0c501354719de5b35ad8f5a +EBUILD lftp-4.9.2.ebuild 2575 BLAKE2B 0b9a80e99149172fc5fb8f5fe5da36b55c93dd920ab0c876b896b82be66963b4c0bf10319055cb135aba79a9a9cb720ba1a9d784397ea1b1dafe4c0ea96a59d7 SHA512 3a5ff603d1a3fdc342eb15e456af1c363a2358867e460bab04343f08025b9f9c32f8603de746997a6650563db7b1843bf9c93d6b3b4eec4a294d9a74277bbd6d +EBUILD lftp-9999.ebuild 2371 BLAKE2B 24a9bb29753bae1cfc704ba0708932f04f46ce543e90da7107f19eeca0efd76a1de5d25a050808f2ef659f95b64e66068c8f95dd1750dc1394c8721be7346fc0 SHA512 945ca3ae74adb6837d63f5bc4df57dff88a27bbefeb4f6e1fe8ccf3c06309c1d0b2c42f752dd56f4a4561055d9c5daef1d47507423c8f6a27c08b834153d7068 MISC metadata.xml 592 BLAKE2B 87ed7484a2723b3f46c358e839930919c22b296c86e44b492136c553150b040b903da2361a71eeecd8f4a7b077389988b9f185fa222f6559ebf65c44609514f4 SHA512 86dc525bb6734b4bf7995df33ef4f8027b01263afa9f827916224abeff84a04079dc50a62aa8c93c55c588d94669fcd6eee17984ef4b8913aa777e9f03a6e1ed diff --git a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch deleted file mode 100644 index 51de51f780dd..000000000000 --- a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://github.com/lavv17/lftp/commit/0276d5c239c41b3a63f738a5dc47fd56ac389cf0.patch - -From 0276d5c239c41b3a63f738a5dc47fd56ac389cf0 Mon Sep 17 00:00:00 2001 -From: Ganael Laplanche <ganael.laplanche@martymac.org> -Date: Thu, 20 Aug 2020 12:29:05 +0200 -Subject: [PATCH] Fix build with LibreSSL (following commit 537f37898) - ---- - src/lftp_ssl.cc | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/src/lftp_ssl.cc -+++ b/src/lftp_ssl.cc -@@ -34,7 +34,7 @@ - #include "misc.h" - #include "network.h" - #include "buffer.h" --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER - #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject - #endif - extern "C" { -@@ -840,7 +840,7 @@ lftp_ssl_openssl_instance::lftp_ssl_openssl_instance() - ssl_ctx=SSL_CTX_new(); - X509_set_default_verify_paths(ssl_ctx->cert); - #else --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER - SSLeay_add_ssl_algorithms(); - #endif - ssl_ctx=SSL_CTX_new(SSLv23_client_method()); -@@ -1080,7 +1080,7 @@ void lftp_ssl_openssl::copy_sid(const lftp_ssl_openssl *o) - - const char *lftp_ssl_openssl::strerror() - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER - SSL_load_error_strings(); - #endif - int error=ERR_get_error(); diff --git a/net-ftp/lftp/lftp-4.9.2.ebuild b/net-ftp/lftp/lftp-4.9.2.ebuild index 8acf412956ac..4dc03770f601 100644 --- a/net-ftp/lftp/lftp-4.9.2.ebuild +++ b/net-ftp/lftp/lftp-4.9.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://lftp.tech/ftp/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file" +IUSE="convert-mozilla-cookies +gnutls idn ipv6 nls socks5 +ssl verify-file" RESTRICT="test" RDEPEND=" @@ -27,10 +27,7 @@ RDEPEND=" ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) + !gnutls? ( dev-libs/openssl:0= ) ) verify-file? ( dev-perl/String-CRC32 @@ -59,7 +56,6 @@ PATCHES=( "${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch "${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch "${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch - "${FILESDIR}"/${PN}-4.9.2-libressl.patch "${FILESDIR}"/${PN}-4.9.2-ac-270.patch ) diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild index 0f1f759f3377..f31213a5b6cf 100644 --- a/net-ftp/lftp/lftp-9999.ebuild +++ b/net-ftp/lftp/lftp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/lavv17/lftp" LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file" +IUSE="convert-mozilla-cookies +gnutls idn ipv6 nls socks5 +ssl verify-file" RDEPEND=" >=sys-libs/ncurses-5.1:= @@ -26,10 +26,7 @@ RDEPEND=" ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) + !gnutls? ( dev-libs/openssl:0= ) ) verify-file? ( dev-perl/String-CRC32 |