gentoo auto-resync : 01:02:2025 - 22:43:06

4 files changed, 39 insertions, 35 deletions

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 \