commit: f6070afcdecd774076a2122dee756daec2daaf84 Author: Sven Wegener <swegener <AT> gentoo <DOT> org> AuthorDate: Sat Feb 1 20:11:41 2025 +0000 Commit: Sven Wegener <swegener <AT> gentoo <DOT> org> CommitDate: Sat Feb 1 20:20:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6070afc
net-ftp/tnftp: add patch to include socks.h The socks.h provided by net-proxy/dante contains the missing declaration of the socks support functions in addition to the alias defines. Closes: https://bugs.gentoo.org/949087 Signed-off-by: Sven Wegener <swegener <AT> gentoo.org> .../tnftp/files/tnftp-20230507-socks-include.patch | 32 ++++++++++++++++++++++ net-ftp/tnftp/tnftp-20230507.ebuild | 6 +++- 2 files changed, 37 insertions(+), 1 deletion(-) 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-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 \
