From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- net-ftp/lftp/Manifest | 16 +--- .../lftp/files/lftp-4.7.5-libdir-readline.patch | 11 --- net-ftp/lftp/files/lftp-4.9.0-ipv6.patch | 18 ---- net-ftp/lftp/files/lftp-4.9.2-libressl.patch | 40 ++++++++ net-ftp/lftp/files/lftp-9999-libdir-readline.patch | 11 --- net-ftp/lftp/lftp-4.8.4-r1.ebuild | 105 -------------------- net-ftp/lftp/lftp-4.9.0.ebuild | 106 --------------------- net-ftp/lftp/lftp-4.9.1.ebuild | 105 -------------------- net-ftp/lftp/lftp-4.9.2.ebuild | 3 +- net-ftp/lftp/lftp-9999.ebuild | 2 +- net-ftp/lftp/metadata.xml | 20 ++-- 11 files changed, 59 insertions(+), 378 deletions(-) delete mode 100644 net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch delete mode 100644 net-ftp/lftp/files/lftp-4.9.0-ipv6.patch create mode 100644 net-ftp/lftp/files/lftp-4.9.2-libressl.patch delete mode 100644 net-ftp/lftp/files/lftp-9999-libdir-readline.patch delete mode 100644 net-ftp/lftp/lftp-4.8.4-r1.ebuild delete mode 100644 net-ftp/lftp/lftp-4.9.0.ebuild delete mode 100644 net-ftp/lftp/lftp-4.9.1.ebuild (limited to 'net-ftp/lftp') diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest index c601e04ff35a..0e00ca3e20f5 100644 --- a/net-ftp/lftp/Manifest +++ b/net-ftp/lftp/Manifest @@ -3,21 +3,13 @@ AUX lftp-4.5.5-am_config_header.patch 306 BLAKE2B 6e4fc3b3940dbfa6745dae2e6abf82 AUX lftp-4.7.0-gettext.patch 421 BLAKE2B 3d1583173e610983d93e44c8411729a0ed90f64c943e7005840308730325f05129001dac521c5149ace051035ea66cf70e526a5aab951f7c5343d30140baf20d SHA512 5b90dc5ae24c2b5e7ef630ecfb709c139ff176644c5a351d97ae78b4adc28266ed09ea17e1cfd875ec52eb15e719eb12d796eb02859875a5c099d99b04035a69 AUX lftp-4.7.5-libdir-additional.patch 369 BLAKE2B 8a9c2bca001d4975ed8d08a2bae2bbcd1219345e307b953e635bd9833bab81b4b7c94d96955c4df84e20ea08b3c41f49914ae6e74b466018e60bcdb7da1db6e9 SHA512 97e81ecc2db5a71ae36393e2f3f7ba60466d5dc7e7979ebab3be3f36fef220ce927c9d6716dc380028b8e6436c490fb3c8771b0beb3a6e9c7ff8b6bf2e608ca1 AUX lftp-4.7.5-libdir-expat.patch 356 BLAKE2B 62a89c02aa89ed746e28b13f08fb649804cdb81a31e4d20d12d049b16cf53f0bed3b36a8b2f85a8ff271d354498c0dc1ff778793d0dbafcf5aec220629508354 SHA512 ef748260275dacee08baff3b922e9e1e559fe2fedcc64e7c3125e57e16e04330b80bd1bca16d53ba7970ae5b20a396cd2de0ef1ba2c14320bf56111d4db6a8a9 -AUX lftp-4.7.5-libdir-readline.patch 424 BLAKE2B 323da25222e0dfc47ebcc123a243006927514ce77fbae1656e831d2c1e96c0d7bb1c55c92570d0d60f6bd004843b5ec89a6311b5c453f9d5e5f97da1c58cce8f SHA512 6b926598702d222dcb8cb0ed348f1c1f62ddbafd8b6b227dce8acca7ac5d6b1c1f5743d3c43e721a5ac36fe9bfd5725fdb7d0d2d16bde685e75ad9c9c760a86c AUX lftp-4.8.2-libdir-configure.patch 530 BLAKE2B b376a53130563d37329e701d77b5a9c0a98d37deba6cae4d1446d8cc38deec45e80e49407507b7556aaf165c6d8c74f9f4fb31d1c1057f3156b261bb3292f37a SHA512 dc97d62360079b525b1735faf1c5238e5f03661fca81445a3e3ad21826d6559cefa3cefa987eeb01bc76df65ff92243b9cecbf4585820fd51fddc55fbc3b322d AUX lftp-4.8.2-libdir-libidn2.patch 315 BLAKE2B 0ebb68e3d4175b2c4900cb540049dabd08dd5acc3b36bb487433612bc391527091e10ef22f522980f7b5fdb8966918aee49713848eb2af7e349834a398854340 SHA512 5476169b31d9704db9ae00834a8e8cdcbbaea13a88b2288ed8ea69300d8734af1bf80d994e42a9a47bf179c14fe9471d931cd9ca231fff0974ee206163801cd2 AUX lftp-4.8.2-libdir-openssl.patch 658 BLAKE2B 430dab0713f82c3c10ac7395b8ca9ca1fc12afedf9eae52e5aaa34aad518cbee5ab225fca3a524e21efc583ab9e103bb8dafa6c9154da18962d4b03400a939d0 SHA512 a48e46873d9134693452cc55c2562d1a7d7b6bb7124dba061db029e6e1c611ed9787518c86043213629683727cf0fff07afc8ce7298a30fd237941300a1aeae0 AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8370cdf511303df4b17346275d936ebfcb658262102c01e61e11861d69e4c54f45baeddb246c062f3c66eadf8b0bcd SHA512 4a47a2e63bfe80faa640edc92c645e89d5c0063c0adc992f0b0613e01cfa0599f61f9bd07568432673addb1a981f101c474b1a0d99fd50fced455c9700b886e6 -AUX lftp-4.9.0-ipv6.patch 496 BLAKE2B 66ea52d0f7d23b851de91b96753a76d9269c09de1666252c2120fb0c362f411703ddc8c748e642b6e57165fcd7132d5d8b6573539340eb6b542b1a73e80f04e5 SHA512 e9c58552f7491c1fb8a1834c535330f68ab325e79cd474ab259d6d3297c36342a350a21aba39df00b58daf37f175736485c285035b1c903ee8afa19e82e50dba AUX lftp-4.9.1-libdir-readline.patch 404 BLAKE2B 88746dbfd082202950e54270519fa25c8a2042d3479342443394918722a8f0b7b2cde1580c7ac07c0c3408f86c12a83fa1973391ef25a9b3f348b7ad1afa68ac SHA512 e6ab456b237613f31c3e7e450a5127b5fac74a9d24d4bd5ca95f9b28d6c810ad0253d71d710e1daf15c43d0b2d5d2ecdb2b1fb7bbdaa4c3bc0b610d6cc6caf3b -AUX lftp-9999-libdir-readline.patch 404 BLAKE2B 88746dbfd082202950e54270519fa25c8a2042d3479342443394918722a8f0b7b2cde1580c7ac07c0c3408f86c12a83fa1973391ef25a9b3f348b7ad1afa68ac SHA512 e6ab456b237613f31c3e7e450a5127b5fac74a9d24d4bd5ca95f9b28d6c810ad0253d71d710e1daf15c43d0b2d5d2ecdb2b1fb7bbdaa4c3bc0b610d6cc6caf3b -DIST lftp-4.8.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1 -DIST lftp-4.9.0.tar.xz 1642596 BLAKE2B 111e559c98e0572e1ca79f935a1db8c45c99275c8aa7b584be06d1738296b32808e97d696a02751575c5d1ea24a30a52f5d9f177a193f70addf1168e3208aa13 SHA512 8d83ea76390d38cb1f84f02eb7bf45780758afb9fe61f5b7278a48c9a5d216d03bc8b699c0f449a0036bdb441b4225af074da1b5e92a77ddb61aca704758211e -DIST lftp-4.9.1.tar.xz 1648564 BLAKE2B 2f36dec3de01dd3f9e7316567912a04196732a1e71a4d1c3a5124471d2941673d7b58bc3182d73d3cf154def905f57d37667d33fedec6ea9434f74850aa64f4d SHA512 303e2354bd61a850403a02ac5b71e54719c12b026c7e36194a6382e9044f1fee93ea581ba0a55fea19981e07b896216e92c7d961c719350762eb0cfb51a2c506 +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.8.4-r1.ebuild 2612 BLAKE2B a776ff29cedc7c19669e310b534bc87f738853fcb6735c4627131d8a3dd630a44bd94a0bb178a5beb36cf4e01cf5f14f43ced074bc510bd958ba86671bd1f05a SHA512 14846e9298ae8ba723f6e842c763afa5378782c4def76fca23e650ce656dd7bb762545c055bb8111466f4a8cb397ea46a9f3dab547acc213a17d5c3615781788 -EBUILD lftp-4.9.0.ebuild 2657 BLAKE2B 7095bcdb0e05167dafa7830de785fddfeb07613b0ba3cadd49bb43e0d2660df5c78ce48d5c618edc2ee34f040f3bd57df85b0f839b326686f694f0aae9c18620 SHA512 6a821056ed70d3c4dc16b503133f8f648f7bb2119f98d13b0ecfbc5a9f296fe8c62eee7226b2328bdcdde970ae80830cdcd63c6b9a8ec59dd29f296ff7f21689 -EBUILD lftp-4.9.1.ebuild 2619 BLAKE2B 7759921cdf8e16fd6f0a3b72c17d194ef85fc0ce8ac3b5fbfc4de2ed30bf3506f8472c52e5b9ae2c88eee2672553dad275d631bb2181da839cca419685fd1b0e SHA512 4bd69847fe02d6e5810d94bb88b2f1d33d72190c9a6aab35ab24f37d47a76cde6facc1a2d276cf3410f744516b7b50b49d9a1e789e93938aa12cbe764807a5e3 -EBUILD lftp-4.9.2.ebuild 2619 BLAKE2B 7759921cdf8e16fd6f0a3b72c17d194ef85fc0ce8ac3b5fbfc4de2ed30bf3506f8472c52e5b9ae2c88eee2672553dad275d631bb2181da839cca419685fd1b0e SHA512 4bd69847fe02d6e5810d94bb88b2f1d33d72190c9a6aab35ab24f37d47a76cde6facc1a2d276cf3410f744516b7b50b49d9a1e789e93938aa12cbe764807a5e3 -EBUILD lftp-9999.ebuild 2437 BLAKE2B 231733a4f693e72104f2276cc254eae3ecc205738bccdd1efd3dd362caa6a3d08216a93dc2ceeb7a4ae001a6a5e0845a1e7a271d7d53b47426b59bf2d241d700 SHA512 5a51e8c3d1c1f3a435c405ed31417b902c2158dee815268f91c40acf5b0e8e29d3b6bbfc8068e41c501d4250812639f2137ad87b4d01da0d6b3fb62e359fceac -MISC metadata.xml 465 BLAKE2B b2c378d349c81c2e99b76a1a5585d58a7aa1bb866e3336e37336c838a87f78425f04a0eeca9d49ee246e085b934a9da4d5b17adf72a4b224d03b76d37bdd84db SHA512 542f366f55d7c19bb3e17a57d060824db5933f2ea3b3aaa8dd3520dc757be53e1dcf4f91fa34f15abc478e9c6b68799df3ad14836e0579f02977843e8d330bfd +EBUILD lftp-4.9.2.ebuild 2654 BLAKE2B b5f0ef3c1121ef5106717a9b03741ee52952c4c2fd388c222fda10c379c4437a253600c2862b39b31cfa457da1b621f5d8c355d1738c1bd9f55c301cc0a07050 SHA512 31ac9e54465f7f233e7292ffac7eccb18bd55948c8aa505c50611e52413bb7ddafba38eafa3cf208abaf5f36845e71c2d094f5c5c476f7cb3aa9932e3472515f +EBUILD lftp-9999.ebuild 2438 BLAKE2B e96329335ad785af88182d486ba295a750c565136c41ebaa83f59b5430bf70de4f40f80d4abc79e68dd0b5b8d60e0ad8152c0e6ed6f119f687f95cfc6db783a1 SHA512 3b5a771d1be09c8b010ddc47cf2aa791a2924c464272feb7183a6f7da457fb0d6b7e2667828d41c405a47b93a5eb69b03616579cf0c501354719de5b35ad8f5a +MISC metadata.xml 592 BLAKE2B 87ed7484a2723b3f46c358e839930919c22b296c86e44b492136c553150b040b903da2361a71eeecd8f4a7b077389988b9f185fa222f6559ebf65c44609514f4 SHA512 86dc525bb6734b4bf7995df33ef4f8027b01263afa9f827916224abeff84a04079dc50a62aa8c93c55c588d94669fcd6eee17984ef4b8913aa777e9f03a6e1ed diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch deleted file mode 100644 index 01c9371870c0..000000000000 --- a/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/m4/lftp_lib_readline.m4 -+++ b/m4/lftp_lib_readline.m4 -@@ -107,7 +107,7 @@ - if test -f "$readline_include_dir/readline/readline.h"; then - readline_include_dir="$readline_include_dir/readline" - fi -- readline_ld_flags="-L$readline_prefix/lib" -+ readline_ld_flags="-L$libdir" - readline_lib_flags="-lreadline" - run_readline_test="yes" - elif test "$readline_requested" = "yes"; then diff --git a/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch b/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch deleted file mode 100644 index 2c02ce5e787b..000000000000 --- a/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/src/ftpclass.cc -+++ b/src/ftpclass.cc -@@ -848,6 +848,7 @@ Ftp::pasv_state_t Ftp::Handle_EPSV_CEPR() - conn->data_sa.in.sin_port=htons(port); - conn->data_sa.sa.sa_family=AF_INET; - } -+#if INET6 - // V6 / AF_INET6 - else if (proto == 2) - { -@@ -855,6 +856,7 @@ Ftp::pasv_state_t Ftp::Handle_EPSV_CEPR() - conn->data_sa.in6.sin6_port=htons(port); - conn->data_sa.sa.sa_family=AF_INET6; - } -+#endif - else - { - Disconnect("unsupported address family"); diff --git a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch new file mode 100644 index 000000000000..51de51f780dd --- /dev/null +++ b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch @@ -0,0 +1,40 @@ +https://github.com/lavv17/lftp/commit/0276d5c239c41b3a63f738a5dc47fd56ac389cf0.patch + +From 0276d5c239c41b3a63f738a5dc47fd56ac389cf0 Mon Sep 17 00:00:00 2001 +From: Ganael Laplanche +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/files/lftp-9999-libdir-readline.patch b/net-ftp/lftp/files/lftp-9999-libdir-readline.patch deleted file mode 100644 index fde1017f4bdc..000000000000 --- a/net-ftp/lftp/files/lftp-9999-libdir-readline.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/m4/lftp_lib_readline.m4 -+++ b/m4/lftp_lib_readline.m4 -@@ -107,7 +107,7 @@ - if test -f "$readline_include_dir/readline/readline.h"; then - readline_include_dir="$readline_include_dir/readline" - fi -- readline_ld_flags="-L$readline_prefix/lib" -+ readline_ld_flags="-L$libdir" - if test -z "$readline_lib_flags"; then - readline_lib_flags="-lreadline" - fi diff --git a/net-ftp/lftp/lftp-4.8.4-r1.ebuild b/net-ftp/lftp/lftp-4.8.4-r1.ebuild deleted file mode 100644 index b687dc9df2fe..000000000000 --- a/net-ftp/lftp/lftp-4.8.4-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools libtool xdg-utils - -DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program" -HOMEPAGE="https://lftp.tech/" -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 ~x86-macos" -IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file" -RESTRICT="test" - -RDEPEND=" - >=sys-libs/ncurses-5.1:= - >=sys-libs/readline-5.1:= - dev-libs/expat - sys-libs/zlib - convert-mozilla-cookies? ( dev-perl/DBI ) - idn? ( net-dns/libidn2:= ) - socks5? ( - >=net-proxy/dante-1.1.12 - sys-libs/pam - ) - ssl? ( - gnutls? ( >=net-libs/gnutls-1.2.3:0= ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ) - verify-file? ( - dev-perl/String-CRC32 - virtual/perl-Digest-MD5 - ) -" -DEPEND=" - ${RDEPEND} - =sys-devel/libtool-2* - app-arch/xz-utils - nls? ( >=sys-devel/gettext-0.19 ) - virtual/pkgconfig -" -DOCS=( - BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels - README.dnssec README.modules THANKS TODO -) -PATCHES=( - "${FILESDIR}"/${PN}-4.0.2.91-lafile.patch - "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch - "${FILESDIR}"/${PN}-4.7.0-gettext.patch - "${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch - "${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch - "${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch - "${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch - "${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch - "${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch - "${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch -) - -src_prepare() { - default - - eautoreconf - - elibtoolize # for Darwin bundles - - # bug #536036 - printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die -} - -src_configure() { - econf \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_with idn libidn2) \ - $(use_with socks5 socksdante "${EPREFIX}"/usr) \ - $(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \ - $(usex ssl "$(use_with gnutls)" '--without-gnutls') \ - --enable-packager-mode \ - --sysconfdir="${EPREFIX}"/etc/${PN} \ - --with-modules \ - --with-readline="${EPREFIX}"/usr \ - --without-included-regex -} - -src_install() { - default - - local script - for script in {convert-mozilla-cookies,verify-file}; do - use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;} - done -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/net-ftp/lftp/lftp-4.9.0.ebuild b/net-ftp/lftp/lftp-4.9.0.ebuild deleted file mode 100644 index 91f68b2cd962..000000000000 --- a/net-ftp/lftp/lftp-4.9.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools libtool xdg-utils - -DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program" -HOMEPAGE="https://lftp.tech/" -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 ~x86-macos" -IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file" -RESTRICT="test" - -RDEPEND=" - >=sys-libs/ncurses-5.1:= - >=sys-libs/readline-5.1:= - dev-libs/expat - sys-libs/zlib - convert-mozilla-cookies? ( dev-perl/DBI ) - idn? ( net-dns/libidn2:= ) - socks5? ( - >=net-proxy/dante-1.1.12 - sys-libs/pam - ) - ssl? ( - gnutls? ( >=net-libs/gnutls-1.2.3:0= ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ) - verify-file? ( - dev-perl/String-CRC32 - virtual/perl-Digest-MD5 - ) -" -DEPEND=" - ${RDEPEND} - =sys-devel/libtool-2* - app-arch/xz-utils - nls? ( >=sys-devel/gettext-0.19 ) - virtual/pkgconfig -" -DOCS=( - BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels - README.dnssec README.modules THANKS TODO -) -PATCHES=( - "${FILESDIR}"/${PN}-4.0.2.91-lafile.patch - "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch - "${FILESDIR}"/${PN}-4.7.0-gettext.patch - "${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch - "${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch - "${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch - "${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch - "${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch - "${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch - "${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch - "${FILESDIR}"/${PN}-4.9.0-ipv6.patch -) - -src_prepare() { - default - - eautoreconf - - elibtoolize # for Darwin bundles - - # bug #536036 - printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die -} - -src_configure() { - econf \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_with idn libidn2) \ - $(use_with socks5 socksdante "${EPREFIX}"/usr) \ - $(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \ - $(usex ssl "$(use_with gnutls)" '--without-gnutls') \ - --enable-packager-mode \ - --sysconfdir="${EPREFIX}"/etc/${PN} \ - --with-modules \ - --with-readline="${EPREFIX}"/usr \ - --without-included-regex -} - -src_install() { - default - - local script - for script in {convert-mozilla-cookies,verify-file}; do - use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;} - done -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/net-ftp/lftp/lftp-4.9.1.ebuild b/net-ftp/lftp/lftp-4.9.1.ebuild deleted file mode 100644 index 8724b4d9622d..000000000000 --- a/net-ftp/lftp/lftp-4.9.1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools libtool xdg-utils - -DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program" -HOMEPAGE="https://lftp.tech/" -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 ~x86-macos" -IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file" -RESTRICT="test" - -RDEPEND=" - >=sys-libs/ncurses-5.1:= - >=sys-libs/readline-5.1:= - dev-libs/expat - sys-libs/zlib - convert-mozilla-cookies? ( dev-perl/DBI ) - idn? ( net-dns/libidn2:= ) - socks5? ( - >=net-proxy/dante-1.1.12 - sys-libs/pam - ) - ssl? ( - gnutls? ( >=net-libs/gnutls-1.2.3:0= ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ) - verify-file? ( - dev-perl/String-CRC32 - virtual/perl-Digest-MD5 - ) -" -DEPEND=" - ${RDEPEND} - =sys-devel/libtool-2* - app-arch/xz-utils - nls? ( >=sys-devel/gettext-0.19 ) - virtual/pkgconfig -" -DOCS=( - BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels - README.dnssec README.modules THANKS TODO -) -PATCHES=( - "${FILESDIR}"/${PN}-4.0.2.91-lafile.patch - "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch - "${FILESDIR}"/${PN}-4.7.0-gettext.patch - "${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch - "${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch - "${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch - "${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch - "${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch - "${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch - "${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch -) - -src_prepare() { - default - - eautoreconf - - elibtoolize # for Darwin bundles - - # bug #536036 - printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die -} - -src_configure() { - econf \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_with idn libidn2) \ - $(use_with socks5 socksdante "${EPREFIX}"/usr) \ - $(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \ - $(usex ssl "$(use_with gnutls)" '--without-gnutls') \ - --enable-packager-mode \ - --sysconfdir="${EPREFIX}"/etc/${PN} \ - --with-modules \ - --with-readline="${EPREFIX}"/usr \ - --without-included-regex -} - -src_install() { - default - - local script - for script in {convert-mozilla-cookies,verify-file}; do - use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;} - done -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/net-ftp/lftp/lftp-4.9.2.ebuild b/net-ftp/lftp/lftp-4.9.2.ebuild index 8724b4d9622d..121ccc94638b 100644 --- a/net-ftp/lftp/lftp-4.9.2.ebuild +++ b/net-ftp/lftp/lftp-4.9.2.ebuild @@ -10,7 +10,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 ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file" RESTRICT="test" @@ -59,6 +59,7 @@ 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 ) src_prepare() { diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild index b38775a32ae7..0f1f759f3377 100644 --- a/net-ftp/lftp/lftp-9999.ebuild +++ b/net-ftp/lftp/lftp-9999.ebuild @@ -57,7 +57,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch "${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch "${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch - "${FILESDIR}"/${PN}-9999-libdir-readline.patch + "${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch ) src_prepare() { diff --git a/net-ftp/lftp/metadata.xml b/net-ftp/lftp/metadata.xml index 1c23e9e44b2d..de1ae65d712e 100644 --- a/net-ftp/lftp/metadata.xml +++ b/net-ftp/lftp/metadata.xml @@ -1,12 +1,16 @@ - - jer@gentoo.org - Jeroen Roovers - - -Install the convert-mozilla-cookies script and its run-time dependencies -Install the verify-file script and its run-time dependencies - + + slyfox@gentoo.org + Sergei Trofimovich + + + polynomial-c@gentoo.org + Lars Wendler + + + Install the convert-mozilla-cookies script and its run-time dependencies + Install the verify-file script and its run-time dependencies + -- cgit v1.2.3