commit: 74ec7e2bfeb9810571a753015d73276dcbac9bce Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Sun Feb 23 22:12:29 2025 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Feb 23 22:16:47 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74ec7e2b
net-ftp/lftp: drop 4.9.2-r1 Closes: https://bugs.gentoo.org/862816 Closes: https://bugs.gentoo.org/923095 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> net-ftp/lftp/Manifest | 1 - .../lftp/files/lftp-4.5.5-am_config_header.patch | 11 -- net-ftp/lftp/files/lftp-4.7.0-gettext.patch | 11 -- net-ftp/lftp/files/lftp-4.9.2-ac-270.patch | 36 ------- .../lftp/files/lftp-4.9.2-configure-clang16.patch | 22 ---- net-ftp/lftp/files/lftp-4.9.2-libressl.patch | 38 ------- net-ftp/lftp/lftp-4.9.2-r1.ebuild | 112 --------------------- 7 files changed, 231 deletions(-) diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest index fd973c80c40f..4d8496fa08aa 100644 --- a/net-ftp/lftp/Manifest +++ b/net-ftp/lftp/Manifest @@ -1,2 +1 @@ -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.5.5-am_config_header.patch b/net-ftp/lftp/files/lftp-4.5.5-am_config_header.patch deleted file mode 100644 index 28a9e80504a5..000000000000 --- a/net-ftp/lftp/files/lftp-4.5.5-am_config_header.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -5,7 +5,7 @@ - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_LIBOBJ_DIR([lib]) - AC_CONFIG_SRCDIR([src/ftpclass.cc]) --AM_CONFIG_HEADER([lib/config.h]) -+AC_CONFIG_HEADERS([lib/config.h]) - AM_INIT_AUTOMAKE - - dnl This doesn't *require* GNU extensions; it merely enables them if diff --git a/net-ftp/lftp/files/lftp-4.7.0-gettext.patch b/net-ftp/lftp/files/lftp-4.7.0-gettext.patch deleted file mode 100644 index 729410a9ddf6..000000000000 --- a/net-ftp/lftp/files/lftp-4.7.0-gettext.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -138,7 +138,7 @@ - - ALL_LINGUAS="de es fr it ja ko pl pt_BR ru uk zh_CN zh_TW zh_HK cs" - AM_GNU_GETTEXT([external]) --AM_GNU_GETTEXT_VERSION([0.15]) -+AM_GNU_GETTEXT_VERSION([0.19]) - test "$MSGFMT" = "no" && MSGFMT ="$missing_dir/missing msgfmt" - test "$GMSGFMT" = "no" && GMSGFMT ="$missing_dir/missing msgfmt" - test "$XGETTEXT" = ":" && XGETTEXT="$missing_dir/missing xgettext" diff --git a/net-ftp/lftp/files/lftp-4.9.2-ac-270.patch b/net-ftp/lftp/files/lftp-4.9.2-ac-270.patch deleted file mode 100644 index a2a558db5a64..000000000000 --- a/net-ftp/lftp/files/lftp-4.9.2-ac-270.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/m4/std-gnu11.m4 -+++ b/m4/std-gnu11.m4 -@@ -6,6 +6,8 @@ - # This implementation will be obsolete once we can assume Autoconf 2.70 - # or later is installed everywhere a Gnulib program might be developed. - -+m4_version_prereq([2.70], [], [ -+ - - # Copyright (C) 2001-2020 Free Software Foundation, Inc. - -@@ -70,7 +72,7 @@ _AS_ECHO_LOG([checking for _AC_LANG compiler version]) - set X $ac_compile - ac_compiler=$[2] - for ac_option in --version -v -V -qversion -version; do -- m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD]) -+ _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD]) - done - - m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl -@@ -135,7 +137,7 @@ _AS_ECHO_LOG([checking for _AC_LANG compiler version]) - set X $ac_compile - ac_compiler=$[2] - for ac_option in --version -v -V -qversion; do -- m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD]) -+ _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD]) - done - - m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl -@@ -822,3 +824,6 @@ dnl Tru64 N/A (no support) - dnl with extended modes being tried first. - [[-std=gnu++11 -std=c++11 -std=gnu++0x -std=c++0x -qlanglvl=extended0x -AA]], [$1], [$2])[]dnl - ])# _AC_PROG_CXX_CXX11 -+ -+ -+])# m4_version_prereq diff --git a/net-ftp/lftp/files/lftp-4.9.2-configure-clang16.patch b/net-ftp/lftp/files/lftp-4.9.2-configure-clang16.patch deleted file mode 100644 index d039390ffb80..000000000000 --- a/net-ftp/lftp/files/lftp-4.9.2-configure-clang16.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/lavv17/lftp/commit/8af97cc255c3d2488adb107515bd1047dbedadfe - -From 8af97cc255c3d2488adb107515bd1047dbedadfe Mon Sep 17 00:00:00 2001 -From: DJ Delorie <[email protected]> -Date: Wed, 8 Feb 2023 23:37:37 -0500 -Subject: [PATCH] Fix C99 compatibility issue - -Related to: - - <https://fedoraproject.org/wiki/Changes/PortingToModernC> - <https://fedoraproject.org/wiki/Toolchain/PortingToModernC> ---- a/m4/needtrio.m4 -+++ b/m4/needtrio.m4 -@@ -9,6 +9,7 @@ AC_DEFUN([LFTP_NEED_TRIO],[ - else - - AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+ #include <stdio.h> - int main() - { - unsigned long long x=0,x1; - 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 a0b52df4a9e5..000000000000 --- a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://bugs.gentoo.org/903001 -https://github.com/lavv17/lftp/pull/663 -https://github.com/lavv17/lftp/commit/3ffa0132987bdde986c82c924bc51b13b37f8b54 - -From 3ffa0132987bdde986c82c924bc51b13b37f8b54 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Wed, 6 Apr 2022 22:56:21 +0200 -Subject: [PATCH] src/lftp_ssl.c: fix build with libressl >= 2.7.0 - -X509_OBJECT_get0_X509_CRL is provided by libressl since version 2.7.0 -and -https://github.com/libressl-portable/openbsd/commit/9866ae34c0af718973475296bd9ef036d3aaa94e -resulting in the following build failure: - -/nvmedata/autobuild/instance-21/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblaze-buildroot-linux-musl/11.2.0/../../../../microblaze-buildroot-linux-musl/bin/ld: /nvmedata/autobuild/instance-21/output-1/host/microblaze-buildroot-linux-musl/sysroot/usr/lib/libcrypto.a(x509_lu.c.o): in function `X509_OBJECT_get0_X509_CRL': -(.text+0xc3c): multiple definition of `X509_OBJECT_get0_X509_CRL'; /nvmedata/autobuild/instance-21/output-1/build/lftp-4.9.2/src/.libs/liblftp-network.a(liblftp_network_la-lftp_ssl.o):(.text+0x894): first defined here - -Fixes: - - http://autobuild.buildroot.org/results/7fd1dfd5bc750ae5a3278ca950c838ae90704b23 - -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - src/lftp_ssl.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lftp_ssl.cc b/src/lftp_ssl.cc -index 26e91e4b..a814543d 100644 ---- a/src/lftp_ssl.cc -+++ b/src/lftp_ssl.cc -@@ -664,7 +664,7 @@ int gnutls_x509_crt_list_import(gnutls_x509_crt_t *certs, unsigned int* cert_max - #elif USE_OPENSSL - //static int lftp_ssl_passwd_callback(char *buf,int size,int rwflag,void *userdata); - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000L) - // for compatibility with older versions - X509_OBJECT *X509_OBJECT_new() - { diff --git a/net-ftp/lftp/lftp-4.9.2-r1.ebuild b/net-ftp/lftp/lftp-4.9.2-r1.ebuild deleted file mode 100644 index 59b8b1de7789..000000000000 --- a/net-ftp/lftp/lftp-4.9.2-r1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2024 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="http://lftp.yar.ru/"; -SRC_URI="http://lftp.yar.ru/ftp/${P}.tar.xz"; - -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.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 - "${FILESDIR}"/${PN}-4.9.2-ac-270.patch - "${FILESDIR}"/${PN}-4.9.2-configure-clang16.patch - "${FILESDIR}"/${PN}-4.9.2-libressl.patch #903001 - "${FILESDIR}"/${PN}-4.9.2-socks.patch #903001 -) - -# 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 -}
