summaryrefslogtreecommitdiff
path: root/net-ftp
diff options
context:
space:
mode:
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/Manifest.gzbin3183 -> 3180 bytes
-rw-r--r--net-ftp/lftp/Manifest9
-rw-r--r--net-ftp/lftp/files/lftp-4.5.5-am_config_header.patch11
-rw-r--r--net-ftp/lftp/files/lftp-4.7.0-gettext.patch11
-rw-r--r--net-ftp/lftp/files/lftp-4.9.2-ac-270.patch36
-rw-r--r--net-ftp/lftp/files/lftp-4.9.2-configure-clang16.patch22
-rw-r--r--net-ftp/lftp/files/lftp-4.9.2-libressl.patch38
-rw-r--r--net-ftp/lftp/lftp-4.9.2-r1.ebuild112
-rw-r--r--net-ftp/lftp/lftp-4.9.3.ebuild2
-rw-r--r--net-ftp/pure-ftpd/Manifest4
-rw-r--r--net-ftp/pure-ftpd/pure-ftpd-1.0.52.ebuild16
-rw-r--r--net-ftp/pure-ftpd/pure-ftpd-9999.ebuild16
-rw-r--r--net-ftp/tftp-hpa/Manifest2
-rw-r--r--net-ftp/tftp-hpa/tftp-hpa-5.2-r4.ebuild (renamed from net-ftp/tftp-hpa/tftp-hpa-5.2-r3.ebuild)6
-rw-r--r--net-ftp/tnftp/Manifest5
-rw-r--r--net-ftp/tnftp/files/tnftp-20230507-socks-include.patch32
-rw-r--r--net-ftp/tnftp/tnftp-20230409.ebuild31
-rw-r--r--net-ftp/tnftp/tnftp-20230507.ebuild6
18 files changed, 61 insertions, 298 deletions
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 09d6b6160440..55fe8184c31e 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
Binary files differ
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index ee1c49f8924f..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 2701 BLAKE2B 34a1a4605d481073a50b63a22f97311caee93ddbfa2708fce5dc7a3b1c8dccc11908355f3a6201cc5bc6c8bfa0219db2b93c9b27208d04f0a8d96ce0801b31d9 SHA512 558890581bc5d1b45454035bea1a92455d6db46bda41dc2350e1e66776d161c29f9bd1dc8c159de00d300d5142d96a19a88e42f9997c30813b1c5727cb20207d
+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 <dj@redhat.com>
-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 <fontaine.fabrice@gmail.com>
-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 <fontaine.fabrice@gmail.com>
----
- 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
-}
diff --git a/net-ftp/lftp/lftp-4.9.3.ebuild b/net-ftp/lftp/lftp-4.9.3.ebuild
index b7c5e998433f..a752e9b04674 100644
--- a/net-ftp/lftp/lftp-4.9.3.ebuild
+++ b/net-ftp/lftp/lftp-4.9.3.ebuild
@@ -11,7 +11,7 @@ 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"
+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"
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 0afd446770ca..536d8186bd5c 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -10,6 +10,6 @@ AUX pure-uploadscript.initd-r1 776 BLAKE2B 1e382300a92fabb5308aa2636de2f427418d8
DIST pure-ftpd-1.0.51.tar.bz2 520648 BLAKE2B 0b82fee114986140eb74d2669b7d91582a48f1b366936895acda913afb7d3bca1578295a930f7857f8674e593bd1bf8094c36f2ae8db6cf1a62cacfd4234cf13 SHA512 3615ac1ec42813855f3328dde200f60025e1f2ca7d1e17ea042967fd4164079260d058f3e2586acd778334660f387a280b35850a9e2091dd913fb84ef929bdca
DIST pure-ftpd-1.0.52.tar.bz2 527691 BLAKE2B 58b53717a932084c733fe42313b36f852281deef9131bb277ca7ede3cf563fd0f804ee739d7544138333d852ec8e5eb2fe9ed1f9709418840b355b1271e8aff8 SHA512 c7b6f76c1429d2cbf9d740c3408464564e023716ebf8361231ba5021f81804575049910c9874970c83c98f927cd496899e5c30625e4dee6538497f9179632c23
EBUILD pure-ftpd-1.0.51-r2.ebuild 4568 BLAKE2B 6d8592513deaf45e11374b0d39146df8657dc7cdf6df93e17708e3e01a987df543e2ee557af1a8867247302876d2e0fc0b13a3f2817eaf42f863cc5ef5294268 SHA512 30c16a2dc6890fb59cc69b1eddd842bce7abf9458372ead2dd8b691c1485519c95e1ae3c6b43a375d5728bad26ca8650e34b3191467c091c38cb4a972be045f4
-EBUILD pure-ftpd-1.0.52.ebuild 4459 BLAKE2B 6640c8164bc53ad87bd22fd398a7c18c2070a0bda88b0fff4fd7438ec8fe92225ddeb05ac7d4fbf751092dd240d8e61bf231b3041716380eb2f7f5032c7fd200 SHA512 0672f3a39dbcaa0917c41799767aa80f965315b43755c824cf20e819625a5c4c10f0f98a6c28639dea74cf3864b77a5e4fbd8e94ef0bc7d120f71506db5c0282
-EBUILD pure-ftpd-9999.ebuild 4468 BLAKE2B 73d0411e5d7e890a2f65721ca043bf869dbe8f9b8687d77b2c84307751d4c8eeb4d82543e8b75d76278be687d80394b99ad1b1433ba05c2e9de98c488845c8c8 SHA512 c86a861df2703b36e1d46415d2fc4920f2257ddaaf1e41e62e80b64a6ed82aea2db31281105848254d565742054a3fba6fa579779a256f66ebcc2d784e2d072f
+EBUILD pure-ftpd-1.0.52.ebuild 4404 BLAKE2B ae0b35bfde930bcbf046ee59d0f3c3739bf73861f25ffe1061e9355f70322bef028c601513a63f98f218d2f88c19c53b705e11cb3dbd383a8e7b27ac265422f2 SHA512 00b69d6d406dfe979dd4001115013cd06e0f9db8e49af2c858ea59d935108d9f97b96197fb730f760054df4eb06763a33eb5972e6ccd396099629b9c4951244f
+EBUILD pure-ftpd-9999.ebuild 4413 BLAKE2B 51e36532807740b7feaff5e57ec329e950658378d2c37782a454b55eac4f111b5791b08a662f3b3ff039f4dcf43d0230174302f8052c502abe760b37b682eb75 SHA512 f2ce69d234451e19bac7ac5e87c68dc711d220eb7ba42637e47d4a55de05487f90bdef0e31afa52b14b18ed5ab04bffae4475ad1f82e324be1f4d320228b951f
MISC metadata.xml 1289 BLAKE2B bf0e11d7e99724a817cdd10c7d38898d60725e455b4cf438a5d0e63cdaddaa6f4f3b231eb51231ff55226850f084dde65d885785aae0f5b7e3ccede8df366952 SHA512 ab0cfea202b128a04fb269f9332e9a1267d7e5194b3f34e2d34aefca07323304cacf8cbd97cf4db2e990632c1be781f97334a220aa5cb9815f7ca7eef4ad0ac1
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.52.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.52.ebuild
index f37295fff191..2721d6912f95 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.52.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.52.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit flag-o-matic
+inherit eapi9-ver flag-o-matic
DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
HOMEPAGE="https://www.pureftpd.org/project/pure-ftpd/"
@@ -154,13 +154,9 @@ pkg_postinst() {
ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
ewarn
- else
- for v in ${REPLACING_VERSIONS} ; do
- if ver_test "${v}" -le "1.0.50" ; then
- einfo "Configuration through /etc/conf.d/pure-ftpd is now deprecated!"
- einfo "Please migrate your settings to the new configuration file."
- einfo "Use /etc/pure-ftpd.conf to adjust your settings."
- fi
- done
+ elif ver_replacing -le "1.0.50" ; then
+ einfo "Configuration through /etc/conf.d/pure-ftpd is now deprecated!"
+ einfo "Please migrate your settings to the new configuration file."
+ einfo "Use /etc/pure-ftpd.conf to adjust your settings."
fi
}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild b/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
index e51853eb0ea5..bdada3101f81 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit flag-o-matic
+inherit eapi9-ver flag-o-matic
DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
HOMEPAGE="https://www.pureftpd.org/project/pure-ftpd/"
@@ -154,13 +154,9 @@ pkg_postinst() {
ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
ewarn
- else
- for v in ${REPLACING_VERSIONS} ; do
- if ver_test "${v}" -le "1.0.50" ; then
- einfo "Configuration through /etc/conf.d/pure-ftpd is now deprecated!"
- einfo "Please migrate your settings to the new configuration file."
- einfo "Use /etc/pure-ftpd.conf to adjust your settings."
- fi
- done
+ elif ver_replacing -le "1.0.50" ; then
+ einfo "Configuration through /etc/conf.d/pure-ftpd is now deprecated!"
+ einfo "Please migrate your settings to the new configuration file."
+ einfo "Use /etc/pure-ftpd.conf to adjust your settings."
fi
}
diff --git a/net-ftp/tftp-hpa/Manifest b/net-ftp/tftp-hpa/Manifest
index cbb0199da39b..4e917cf490b3 100644
--- a/net-ftp/tftp-hpa/Manifest
+++ b/net-ftp/tftp-hpa/Manifest
@@ -5,5 +5,5 @@ AUX tftp.service 119 BLAKE2B a2d50dba1103fb7c868e070331c8a2000e65364801abc85d969
AUX tftp.socket 112 BLAKE2B 11e8c6e77819ba772b709843af11449e768db16fe866dc67e4209e83e7d6d273583b2cd9104ba611e3acca0018d915f4313860039a3b0003e556f49f82917ef1 SHA512 d49cdbb7e265aa98d989f8ae96e2c80bfd5887ae0efc6bfcd726d5fa4d83ffc480f5f374e30b8564b05d9690eb2a0c0ed0077982a74946edfbce5d19066d0564
AUX tftp.xinetd 219 BLAKE2B d348f13fdfa749b10ec765d5cd90a65a46d266a132dde47dad00fbd1ef4046c250cd9246e7b1fe9590e974a2bc7fcc817535fd2e9447a10c5286f7c4148eec93 SHA512 26883a4feffe8f66fe2c21c05892beeb93fa4511ca5ce18e92273badd4b93afefb0d9cef48e07503037ca37b2ff0cdb24d35e5c24d2e32d8027a5e74c49426f5
DIST tftp-hpa-5.2.tar.xz 89564 BLAKE2B 45917ca3d710f8a4b584dbe1e9a912e06fd181e4ffcfd8fba13008f08dbbce0fe339b61fb6f97236b8012e755025d05700214e365adac81dfce42b0edd636e80 SHA512 a5198e923a6e58281f749dc77b3f3ed8579e56b6f0fd6a17482cc88bdc8d34b6702c7c709717885b9b937ecae459d9a832328a49a2e3536dc7432cdb39d2a394
-EBUILD tftp-hpa-5.2-r3.ebuild 1610 BLAKE2B 3ab990952af355df29f6967ecb8dd7ea10b2d8156b4920d543f64a3793b93922d1db8688470c743caafb96d5419f061e21ae4315f1269c03244442c624ac1563 SHA512 5210afc0616524f30478590154b7d763c73e8eb1ca250e57d47deba7d41524a16583958a0376e56c7b0d3d7d5ce37b50923a497b90da94c2b9bb4f3091959d66
+EBUILD tftp-hpa-5.2-r4.ebuild 1687 BLAKE2B bfc1082e492aac22003d430170ab1a7a0c8bd4797cf43aacc52e50e497de0ef8f62524add87049edf114d7c20dc4d2db4a3f977dd62e38a1fad9573bf4b0bac6 SHA512 75900c9a8bef1b8ed0c27c8e9e90990cc9673243bf80ab2ab4a3e8fb8a9fa5f9a7225ba589fd7709dfd0cd30440c3bdd6da6889e1b1853bbf9b82d58b4cc1cfc
MISC metadata.xml 395 BLAKE2B c333bf023404a04db911766366b8cae6b4e8390c8dbbdd5339b1a92291208ba6e8b01ce8f44d5f709fe3fd625368ad5077b8563e694ebb9e24d96047e9219150 SHA512 66038f6011f947ab9c23c8601e24a3caeb6055708e2b99b32d2dbb04ecc5bfc2e7b2446fd1010e94e83e92995ff155528f8c240eb38604d3bd11434f05bcc6b3
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r3.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2-r4.ebuild
index 0ecf65b9f793..e672befd63f7 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r3.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -22,7 +22,11 @@ DEPEND="
RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-tftp )
!net-ftp/atftp
+ client? (
+ !net-misc/inetutils[tftp(+)]
+ )
server? (
+ !net-misc/inetutils[tftpd(+)]
!net-misc/iputils[tftpd(-)]
!net-ftp/uftpd
)
diff --git a/net-ftp/tnftp/Manifest b/net-ftp/tnftp/Manifest
index ef580f7758a5..e829d93b4229 100644
--- a/net-ftp/tnftp/Manifest
+++ b/net-ftp/tnftp/Manifest
@@ -1,7 +1,6 @@
+AUX tnftp-20230507-socks-include.patch 837 BLAKE2B 60e044860fe28845cf6da310871f47d82e3f4714f410bcfa34e76a44766e1d622d1a01edbc07e5510dab7151c056c8770dd4e02cf3c4beab31c350195a93b9e1 SHA512 e8eecb71ad408ea9581715cac00d580fb7c8de3083cd763d0391787a1df6d90755949a864b4c1307519039579936ed9d94378a7e94fd1c05e99052dc1a5b1fd1
DIST tnftp-20210827.tar.gz 699171 BLAKE2B fe1d4f9f972f349c18e98dbc40305c867511339cb661936fbd255c4a76d9df61f1eae7e723479ef67a96dd05886a079daa4b7367d0c8768d33bc08faa743e5e8 SHA512 9b33f48e237ff49fe3cf502635b948cf7d5e20e2f38a6a429288e3f4374099ac9fb910a9e5b88de4420f1570f6f92ec1fc7ab16f0b93dfe8c6f32d11f0fc0e47
-DIST tnftp-20230409.tar.gz 701888 BLAKE2B 54e21382168df653fcb930981909bdf0ef4eecccc6eb6e22d87104cee0c52e56f349b4e5bbd655e64eb5553cd17dd8d031df0baaa7d68c699488e8decf2c1ceb SHA512 43e1c9e136fe4c15d25a61dff332afd5cb13f2e4f87b5281b6c0dcf3152256f6b6db24007d02ac4c27f28f07855fac8d4dce27affb2c1632ca3d8b80b87528bb
DIST tnftp-20230507.tar.gz 702357 BLAKE2B 780497f7bad44d3dcc8c22f6075d3d6ea556c641db5a740b63b0e226773a4fa4ba3b9081fbe9d57918f52d1e0d21b96181e6344c35e7ef4bae8d1178264fecb9 SHA512 c6539902b709d6b35a8754dd552ca71926fd09ad2a0244363005607089bea3947a6176e61a1dc9a232e8af415cfebed7decd9653b6f6bc38385a05ca86c85b1a
EBUILD tnftp-20210827.ebuild 774 BLAKE2B 0a5504474ddb8898cb26a8d40f688d233af44aa026b62f6b44f9b7c52be5f0690d0870c4bdfd877248d4c0d39d1c77b4e2b79ca159961d78b7da088bbf5f2716 SHA512 02ed246a3e7b27dee70d991df9b879727979c6643b15db91496f3c8f57eccf33cdf7f1764dfd970988f543c6df04e20852fb9e1d2a44c72fcdfd30041ccb0b92
-EBUILD tnftp-20230409.ebuild 777 BLAKE2B c91ac6f41226f347473f7779aa511c61fd26442b8ae8c2033b3aaf3461e192fbad4105978f2d47a747324188389fc0b2668b2e82da33a270d364c3bfd7c46200 SHA512 c88566a824cd5132258afad45462147d7c1dfde3ff2d0f47ffea6d583b9597feb890f7692bb78f44f3575aa4456dbd5a7513e1514831569d954676abd7c82481
-EBUILD tnftp-20230507.ebuild 775 BLAKE2B c03a0f8c00528caf4f920541a2d88270ce6a132b93767287c3d0e06d3d4936671d0bc6e906b245ef90825b71b7b2cabddcd34619ecc299294d3cffddd9d231ba SHA512 6b5fae5d7654287d95ed6b48efdcfca41134b5546044d1d6ab900e56f223fbf3b54a8ad67c53259c972e6504d4952c4d556d800c7d12159c16b80978e6517945
+EBUILD tnftp-20230507.ebuild 828 BLAKE2B 83eca8be685c6355a2ec165c233560f52ded100dccd66eff52e437908244d3586ec4214c5f5e65cd9c70fd76db21e4eb80a4ac6eba073e5f06af2643edcdc6c8 SHA512 081d13f6fc314e0a5a59e5a682b55d7f0f8148d0f333cfe705518b8ca530be7fc1b923cf2c23666f393d3670a1e77c3ea564bd941196eb3b69eb49da75b536c9
MISC metadata.xml 245 BLAKE2B 6458c0b0aca10d6fe15ed3c72599e6144d86236c49c69d8fa210ea09790b43658adadd645b98f3444fd2a097894c8b7da37de1728fbe0f1cb49f311e6a3968cb SHA512 abec8962af24666c9c0c3d373d94d951504906d03e83bfc474bd4906b7c45b731d4c711588ff4156bb526e6303715abbbe1afebb5537a76ce9b05393800a524b
diff --git a/net-ftp/tnftp/files/tnftp-20230507-socks-include.patch b/net-ftp/tnftp/files/tnftp-20230507-socks-include.patch
new file mode 100644
index 000000000000..93d54a60e430
--- /dev/null
+++ b/net-ftp/tnftp/files/tnftp-20230507-socks-include.patch
@@ -0,0 +1,32 @@
+--- tnftp-20230507/tnftp.h
++++ tnftp-20230507/tnftp.h
+@@ -487,28 +487,7 @@
+ #define TM_YEAR_BASE 1900
+
+ #if defined(USE_SOCKS) /* (Dante) SOCKS5 */
+-#define connect Rconnect
+-#define bind Rbind
+-#define getsockname Rgetsockname
+-#define getpeername Rgetpeername
+-#define accept Raccept
+-#define rresvport Rrresvport
+-#define bindresvport Rbindresvport
+-#define gethostbyname Rgethostbyname
+-#define gethostbyname2 Rgethostbyname2
+-#define sendto Rsendto
+-#define recvfrom Rrecvfrom
+-#define recvfrom Rrecvfrom
+-#define write Rwrite
+-#define writev Rwritev
+-#define send Rsend
+-#define sendmsg Rsendmsg
+-#define read Rread
+-#define readv Rreadv
+-#define recv Rrecv
+-#define recvmsg Rrecvmsg
+-#define getaddrinfo Rgetaddrinfo
+-#define getipnodebyname Rgetipnodebyname
++#include <socks.h>
+ #endif /* defined(USE_SOCKS) */
+
+
diff --git a/net-ftp/tnftp/tnftp-20230409.ebuild b/net-ftp/tnftp/tnftp-20230409.ebuild
deleted file mode 100644
index 596d018dbd6d..000000000000
--- a/net-ftp/tnftp/tnftp-20230409.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DESCRIPTION="NetBSD FTP client with several advanced features"
-SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/${P}.tar.gz"
-HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
-
-SLOT="0"
-LICENSE="BSD-4 BSD ISC"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6 socks5 ssl"
-REQUIRED_USE="socks5? ( !ipv6 )"
-
-DEPEND=">=sys-libs/ncurses-5.1
- dev-libs/libedit
- socks5? ( net-proxy/dante )
- ssl? ( dev-libs/openssl:= )"
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog README THANKS )
-
-src_configure() {
- econf \
- --enable-editcomplete \
- --without-local-libedit \
- $(use_enable ipv6) \
- $(use_enable ssl) \
- $(use_with socks5 socks)
-}
diff --git a/net-ftp/tnftp/tnftp-20230507.ebuild b/net-ftp/tnftp/tnftp-20230507.ebuild
index ee2beb015b82..90a022cfe768 100644
--- a/net-ftp/tnftp/tnftp-20230507.ebuild
+++ b/net-ftp/tnftp/tnftp-20230507.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
@@ -21,6 +21,10 @@ RDEPEND="${DEPEND}"
DOCS=( ChangeLog README THANKS )
+PATCHES=(
+ "${FILESDIR}"/${P}-socks-include.patch
+)
+
src_configure() {
econf \
--enable-editcomplete \