From d4653056cc74d97f24bef0d56b4ebe11c53c8b76 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Feb 2025 19:24:56 +0000 Subject: gentoo auto-resync : 24:02:2025 - 19:24:56 --- net-ftp/lftp/Manifest | 7 -- .../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, 237 deletions(-) delete mode 100644 net-ftp/lftp/files/lftp-4.5.5-am_config_header.patch delete mode 100644 net-ftp/lftp/files/lftp-4.7.0-gettext.patch delete mode 100644 net-ftp/lftp/files/lftp-4.9.2-ac-270.patch delete mode 100644 net-ftp/lftp/files/lftp-4.9.2-configure-clang16.patch delete mode 100644 net-ftp/lftp/files/lftp-4.9.2-libressl.patch delete mode 100644 net-ftp/lftp/lftp-4.9.2-r1.ebuild (limited to 'net-ftp/lftp') diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest index a6b5fb196b27..f454c1e74fe7 100644 --- a/net-ftp/lftp/Manifest +++ b/net-ftp/lftp/Manifest @@ -1,6 +1,4 @@ AUX lftp-4.0.2.91-lafile.patch 976 BLAKE2B 65845bdc84325cd38ec2c40a0ec884510c24800928195e9a8091a1363366197e6ebc0e2b619c0129a20ae6de86a4354dad01f5af776da24d3cb2b55f02819482 SHA512 5da906b19e2f2eeb46292e4b406656e851072fcba431c3fc771baf3825f09e577550cab079991625cb96b1547a6ba15938b6c67c4e89ee9e11fb9ccd21509bf2 -AUX lftp-4.5.5-am_config_header.patch 306 BLAKE2B 6e4fc3b3940dbfa6745dae2e6abf8206494de82046205fea02a866dbeb7536926cc83996b818250b5f0f70c0c6f02af95b5a0ffea9c5e83237dab8819b62ca74 SHA512 613c0942ec5c4b9de38b6020eddcfcbe91ad6febd176b2953503ee47c82a11a9ed661b442127b25383d1f6593df0ce6837229939ec48da5c36079b145ab488b9 -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.8.2-libdir-configure.patch 530 BLAKE2B b376a53130563d37329e701d77b5a9c0a98d37deba6cae4d1446d8cc38deec45e80e49407507b7556aaf165c6d8c74f9f4fb31d1c1057f3156b261bb3292f37a SHA512 dc97d62360079b525b1735faf1c5238e5f03661fca81445a3e3ad21826d6559cefa3cefa987eeb01bc76df65ff92243b9cecbf4585820fd51fddc55fbc3b322d @@ -8,14 +6,9 @@ AUX lftp-4.8.2-libdir-libidn2.patch 315 BLAKE2B 0ebb68e3d4175b2c4900cb540049dabd 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.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-configure-clang16.patch 617 BLAKE2B c8e2f3476011b6fa154de4021644bfed1c9fb420940c26cdc57a4ac9939c84bf5c123745cb8d5749a776a29a0afee65dd11c4faa97c3d2ef53f5545b86bf4d54 SHA512 078c309e20a49e28a65ec5d6c732ea0a57c0cdbc8b9e54f4fc5ddc917bc3fe439c1e4592243b57117f0d32ba7ae17067124e8a17e57513326a4fda7abdf5b6ac -AUX lftp-4.9.2-libressl.patch 1964 BLAKE2B 045b1436b970530741b4109b8408151b5d0714310667b8a4eec9817e14e96395e47141112b22acf0a5e28dac0eb157029e2bef8a5cd677eba8b1d8471e02d814 SHA512 081dc57c78645bb528d745406789e9edf7d6b54f16c4df825b69829df2e0d8f383d11f8fe15530c406f15debb0cad17e5fa0b1415529068228c380503c974d55 AUX lftp-4.9.2-socks.patch 1041 BLAKE2B 2590e96690ae08c5fa4bc1d0041fd7fa1ab642878b3dcbda5a4f121fc42ef0e39bdd9d1d4fe668bdd1987e6a510c313109d292701267cc2d22a25da72ba79b28 SHA512 ce4229c3c58f0df4ffda9d342a0e709fc5256c94bac4b52607486cfb72cd208bf3465deca2bab4f3b67d1ba1cdd09aeb7d82d1cf887641543081863ad38afe47 AUX lftp-4.9.3-gnulib.patch 1356 BLAKE2B a3f6c8ed0052c77b6513b2064c98464d2e0264136e1a4c265d512473afe2cd40a5818abaaf264551ecbecf9a18746befef1d05748dfa2da98040d7599af0d9aa SHA512 46d048c0e74e180fbb3ce2b4b90cdde90449703acf1a2088a7accd57adc06c9f63bf5d25dae734fbecda711048805871ae26caab8e70634f1d575def6ae01aa2 -DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad DIST lftp-4.9.3.tar.gz 3385456 BLAKE2B 10d96a8d10d95ab205b63adb1fa31ffa71ee88aeea6ba1740e4f9e24fbc7499387507cb9a9d6b7025cd8ff05c4d4ac0acc9ddbc5e6d04561ad1a4fc644faf86a SHA512 3168077f065ab71d1c49fda9c6e22ecc67bc0a16c27206c413f2103ba343e0c1364f63a1ee10a4c0f06203cbb9a2a81f94f736f7ef8a3dd667445e17ea75206f -EBUILD lftp-4.9.2-r1.ebuild 2857 BLAKE2B 299d796259dfe7e0a7fc87fde9af7627eee729ac0fd66bf7acbda64c352750c1198a163b3bb534d937c5d0dfdd2e7334109a835ce51ae70acc12c59b28ce8af8 SHA512 972c17f25afc2a816a1df12f2c58b3f602e5efd592bd64ff57e5f34b6507e46f5b674073b4a91e9c5210e213557bba05a4a713190838e613dcb80450fa4b7c6e EBUILD lftp-4.9.3.ebuild 2695 BLAKE2B 8b384e07d538e60653374ab9541059b32a4bea5c001b8a4095472fbf5c600f325a5ffd1de0f2f8057445f598afc0519dcdad93356c38254cde32f2ab0b6931fe SHA512 1af1185a407a0a1fc866d6cd094a963724da7988a159e763efc1f80429700e41541021218347efa8998fe64d930f352ac2bb78dff13c0383de668c521a8aee01 EBUILD lftp-9999.ebuild 2528 BLAKE2B 0da869938940b9ee0151ff4840e6a36aba05a681d73a1b88604e2d9e69fdeabe7d65a0aca8d1bdafddd548709a81a5061aabafbc6c68012fe14312cad3b0166d SHA512 8fb509fde5f15d951c5d67915088c35a60219fb730eac535d1585c8a3d4fd4cd18032a5f70322f1e573e26bfab94819f8438892e3a5803f982d42ec51050d5ab MISC metadata.xml 556 BLAKE2B d7469c2b0a5fd85a1a102b587d9cb992bee74a41df956bb91c6b944d6ab5f3bdbf003c8e2a4e89f8326e1c0290dde88efdc2689d212e284b7394383f2e4ded99 SHA512 84c61561f72df1c9daaa60b493877be495e35f306d65aeff607c356484492cecd40e1e4a1f6a5143e3cf5b2fed665489a50af8f5ed5afe38c614674692de0ca8 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 -Date: Wed, 8 Feb 2023 23:37:37 -0500 -Subject: [PATCH] Fix C99 compatibility issue - -Related to: - - - ---- 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 - 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 -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 ---- - 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 -} -- cgit v1.2.3