commit: 46f0106ecdc04ce7201bb08952c0469bba5da9bc Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Sun Dec 29 18:19:49 2024 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Dec 29 18:22:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f0106e
net-ftp/lftp: fix build with socket Closes: https://bugs.gentoo.org/946078 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> net-ftp/lftp/files/lftp-4.9.2-socks.patch | 26 ++++++++++++++++++++++++++ net-ftp/lftp/lftp-4.9.2-r1.ebuild | 1 + 2 files changed, 27 insertions(+) diff --git a/net-ftp/lftp/files/lftp-4.9.2-socks.patch b/net-ftp/lftp/files/lftp-4.9.2-socks.patch new file mode 100644 index 000000000000..7e004118a968 --- /dev/null +++ b/net-ftp/lftp/files/lftp-4.9.2-socks.patch @@ -0,0 +1,26 @@ +diff '--color=auto' -urNd a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -192,18 +192,18 @@ + + if test x$with_socks = xyes; then + AC_DEFINE(SOCKS4, 1, [define if you are building with SOCKS support]) +- AC_CHECK_LIB(socks, main, [SOCKSLIBS=-lsocks], ++ AC_CHECK_LIB(socks, Rconnect, [SOCKSLIBS=-lsocks], + [AC_MSG_ERROR([cannot find -lsocks library])]) + fi + if test x$with_socks5 = xyes; then + AC_DEFINE(SOCKS5, 1, [define if you are building with SOCKSv5 support]) +- AC_CHECK_LIB(socks5, main, [SOCKSLIBS=-lsocks5], ++ AC_CHECK_LIB(socks5, Rconnect, [SOCKSLIBS=-lsocks5], + [AC_MSG_ERROR([cannot find -lsocks5 library])]) + fi + if test x$with_socksdante = xyes; then + AC_DEFINE(SOCKS_DANTE, 1, [define if you are building with SOCKS-Dante support]) +- AC_CHECK_LIB(socks, main, [SOCKSLIBS=-lsocks], +- [AC_MSG_ERROR([cannot find -lsocks library])]) ++ AC_CHECK_LIB(socksd, Rconnect, [SOCKSLIBS=-lsocksd], ++ [AC_MSG_ERROR([cannot find -lsocksd library])]) + fi + + AC_SUBST(SOCKSLIBS) diff --git a/net-ftp/lftp/lftp-4.9.2-r1.ebuild b/net-ftp/lftp/lftp-4.9.2-r1.ebuild index 449e3df315d7..59b8b1de7789 100644 --- a/net-ftp/lftp/lftp-4.9.2-r1.ebuild +++ b/net-ftp/lftp/lftp-4.9.2-r1.ebuild @@ -59,6 +59,7 @@ PATCHES=( "${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
