commit: 69b63c93ffe75a7c376db0dafc89ee65e2deb16f Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Sat Jan 4 23:19:20 2025 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sat Jan 4 23:25:29 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69b63c93
net-ftp/lftp: add 4.9.3 Bug: https://bugs.gentoo.org/923095 Bug: https://bugs.gentoo.org/862816 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> net-ftp/lftp/Manifest | 1 + net-ftp/lftp/files/lftp-4.9.3-gnulib.patch | 45 ++++++++++++ net-ftp/lftp/lftp-4.9.3.ebuild | 112 +++++++++++++++++++++++++++++ 3 files changed, 158 insertions(+) diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest index 2ccaa2a45a9c..fd973c80c40f 100644 --- a/net-ftp/lftp/Manifest +++ b/net-ftp/lftp/Manifest @@ -1 +1,2 @@ DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad +DIST lftp-4.9.3.tar.gz 3385456 BLAKE2B 10d96a8d10d95ab205b63adb1fa31ffa71ee88aeea6ba1740e4f9e24fbc7499387507cb9a9d6b7025cd8ff05c4d4ac0acc9ddbc5e6d04561ad1a4fc644faf86a SHA512 3168077f065ab71d1c49fda9c6e22ecc67bc0a16c27206c413f2103ba343e0c1364f63a1ee10a4c0f06203cbb9a2a81f94f736f7ef8a3dd667445e17ea75206f diff --git a/net-ftp/lftp/files/lftp-4.9.3-gnulib.patch b/net-ftp/lftp/files/lftp-4.9.3-gnulib.patch new file mode 100644 index 000000000000..2d821907f2d7 --- /dev/null +++ b/net-ftp/lftp/files/lftp-4.9.3-gnulib.patch @@ -0,0 +1,45 @@ +From: Jan Palus <[email protected]> +Date: Sun, 17 Nov 2024 17:58:42 +0000 (+0100) +Subject: md5-stream, sha*-stream, sm3-stream: Avoid duplicate symbols. +X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff_plain;h=353a3236d9328349c18ce2e4e984755cb4a76ea7 + +md5-stream, sha*-stream, sm3-stream: Avoid duplicate symbols. + +* lib/md5-stream.c (GL_OPENSSL_INLINE): Remove definition, that caused +the symbols defined in md5.o to be defined in md5-stream.o as well. +* lib/sha1-stream.c (GL_OPENSSL_INLINE): Likewise. +* lib/sha256-stream.c (GL_OPENSSL_INLINE): Likewise. +* lib/sha512-stream.c (GL_OPENSSL_INLINE): Likewise. +* lib/sm3-stream.c (GL_OPENSSL_INLINE): Likewise. + +Copyright-paperwork-exempt: Yes +--- + +diff --git a/lib/md5-stream.c b/lib/md5-stream.c +index fdd2bd8b4b..2cbdda6b0f 100644 +--- a/lib/md5-stream.c ++++ b/lib/md5-stream.c +@@ -22,9 +22,6 @@ + #include <config.h> + + /* Specification. */ +-#if HAVE_OPENSSL_MD5 +-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE +-#endif + #include "md5.h" + + #include <stdlib.h> +diff --git a/lib/sha1-stream.c b/lib/sha1-stream.c +index cbdf95ab76..b713e678a6 100644 +--- a/lib/sha1-stream.c ++++ b/lib/sha1-stream.c +@@ -24,9 +24,6 @@ + #include <config.h> + + /* Specification. */ +-#if HAVE_OPENSSL_SHA1 +-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE +-#endif + #include "sha1.h" + + #include <stdlib.h> diff --git a/net-ftp/lftp/lftp-4.9.3.ebuild b/net-ftp/lftp/lftp-4.9.3.ebuild new file mode 100644 index 000000000000..b7c5e998433f --- /dev/null +++ b/net-ftp/lftp/lftp-4.9.3.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools libtool xdg-utils + +DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program" +HOMEPAGE="http://lftp.yar.ru/"; +SRC_URI="https://github.com/lavv17/${PN}/releases/download/v${PV}/${P}.tar.gz"; + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="convert-mozilla-cookies +gnutls idn 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? ( dev-libs/openssl:0= ) + ) + verify-file? ( + dev-perl/String-CRC32 + virtual/perl-Digest-MD5 + ) +" + +DEPEND=" + ${RDEPEND} + =dev-build/libtool-2* + app-arch/xz-utils + nls? ( >=sys-devel/gettext-0.21 ) + 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.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 + "${FILESDIR}"/${PN}-4.9.2-socks.patch + "${FILESDIR}"/${PN}-4.9.3-gnulib.patch +) + +# Gnulib false positive #900064 +QA_CONFIG_IMPL_DECL_SKIP="( MIN )" + +src_prepare() { + default + + # bug #875692 + sed -e '/#include/s/cmath/math.h/' -i trio/*.c || die + + 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 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-ipv6 \ + --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 +}
