[gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/files/

[gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/files/

[Sergei Trofimovich]

commit:     2017fa03a200a935c5de47b224294aee4c4b41b5
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Nov 17 20:08:17 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Nov 17 21:47:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2017fa03

net-ftp/lftp: remove unused patches

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18305
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch | 11 -----------
 net-ftp/lftp/files/lftp-4.9.0-ipv6.patch            | 18 ------------------
 2 files changed, 29 deletions(-)

diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch
deleted file mode 100644
index 01c9371870c..00000000000
--- a/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/m4/lftp_lib_readline.m4
-+++ b/m4/lftp_lib_readline.m4
-@@ -107,7 +107,7 @@
- 	if test -f "$readline_include_dir/readline/readline.h"; then
- 	    readline_include_dir="$readline_include_dir/readline"
- 	fi
--        readline_ld_flags="-L$readline_prefix/lib"
-+        readline_ld_flags="-L$libdir"
-         readline_lib_flags="-lreadline"
-         run_readline_test="yes"
-     elif test "$readline_requested" = "yes"; then

diff --git a/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch b/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch
deleted file mode 100644
index 2c02ce5e787..00000000000
--- a/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/ftpclass.cc
-+++ b/src/ftpclass.cc
-@@ -848,6 +848,7 @@ Ftp::pasv_state_t Ftp::Handle_EPSV_CEPR()
-       conn->data_sa.in.sin_port=htons(port);
-       conn->data_sa.sa.sa_family=AF_INET;
-    }
-+#if INET6
-    // V6 / AF_INET6
-    else if (proto == 2)
-    {
-@@ -855,6 +856,7 @@ Ftp::pasv_state_t Ftp::Handle_EPSV_CEPR()
-       conn->data_sa.in6.sin6_port=htons(port);
-       conn->data_sa.sa.sa_family=AF_INET6;
-    }
-+#endif
-    else
-    {
-       Disconnect("unsupported address family");

[gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/files/

[Jeroen Roovers]

commit:     d1b0eb928ded4867cbed2d25effca4a52bc37922
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 12:13:23 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 12:13:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1b0eb92

net-ftp/lftp: Remove ZLIB_LDFLAGS from configure.ac (bug #646284 by Xuefer).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch
index 9ec7c1b0dd1..791bd2c5a3b 100644
--- a/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch
@@ -1,3 +1,13 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -305,7 +305,6 @@
+ 
+ AX_CHECK_ZLIB([
+    AC_SUBST([ZLIB],[-lz])
+-   AC_SUBST([ZLIB_LDFLAGS],["-L${ZLIB_HOME}/lib"])
+    AC_SUBST([ZLIB_CPPFLAGS],["-I${ZLIB_HOME}/include"])
+ ],[
+    AC_MSG_ERROR([cannot find -lz library, install zlib-devel package])
 --- a/m4/ax_check_zlib.m4
 +++ b/m4/ax_check_zlib.m4
 @@ -105,7 +105,6 @@

[gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/files/

[Jeroen Roovers]

commit:     f57878baafd5e00c32e982f30935989240a50013
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 10:50:24 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri May 20 10:58:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f57878ba

net-ftp/lftp: Clean up patch.

Package-Manager: portage-2.3.0_rc1

 net-ftp/lftp/files/lftp-4.7.0-gettext.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-ftp/lftp/files/lftp-4.7.0-gettext.patch b/net-ftp/lftp/files/lftp-4.7.0-gettext.patch
index c2d6b80..729410a 100644
--- a/net-ftp/lftp/files/lftp-4.7.0-gettext.patch
+++ b/net-ftp/lftp/files/lftp-4.7.0-gettext.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig	2016-03-28 18:28:34.834007550 +0200
-+++ configure.ac	2016-03-28 19:03:32.455125971 +0200
+--- 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"