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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/files/, net-ftp/lftp/
@ 2017-02-13  8:05 Jeroen Roovers
  0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2017-02-13  8:05 UTC (permalink / raw
  To: gentoo-commits

commit:     647d602b6dc09be92e973b17dccedaf67d2d5bd2
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 08:04:57 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 08:05:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=647d602b

net-ftp/lftp: Old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-ftp/lftp/Manifest                          |  1 -
 net-ftp/lftp/files/lftp-4.6.3a-autopoint.patch | 10 ---
 net-ftp/lftp/lftp-4.6.5.ebuild                 | 91 --------------------------
 net-ftp/lftp/metadata.xml                      |  1 -
 4 files changed, 103 deletions(-)

diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 82806d2796..7ae1da42aa 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,4 +1,3 @@
-DIST lftp-4.6.5.tar.xz 1514644 SHA256 1fd0920a1791ce0e9e39ffce77ae6619e5dc665f16e9380bafbfc69411eeb71e SHA512 a22faa3a6901160460f1103c19c5276f603c154908ec2e34804a6eb48452b59ba495993e6824f57d114285ddc80a64dccd0069465cc0593f34f435ac181250c0 WHIRLPOOL 088598ed9395cd8f9ed79be26e0833593e733cf87bbd51e5d008ce4de2b9924e62add20789c098a866d82dc3f168a373c4874de264d669950524a9a255e1e028
 DIST lftp-4.7.3.tar.xz 1545012 SHA256 3b22259cdc4c1a6ae349057d16bda4b4816929e04d223242ab8927bc31a48e7c SHA512 1123e322a4c4f85ced4ef57c0af80b9b20d223c2770293ada3d8ca870fe159b62c6ee8d01a8c6be50e7ec00f3e6729a46c09db3aa776471825a6998792f1250d WHIRLPOOL 8ad61759c0ef56b23a13c4f3291bd672f398485ddc1a04c6e6b7c8f4e6a8ae36779d88e96c2db7697884e3089aef0f04a36952490a2b450a20ccb360b2a0df54
 DIST lftp-4.7.4.tar.xz 1564016 SHA256 bf67c4d128b6f769a4082947376a9679c5ee3463a24ab761a0757f75d70bd92c SHA512 f978379b6ac0dfb46c06dee7205b0b751a75642868c4b1bf37ac681108b04a475232915bb7280ec9731af008e00e855bd9e2e8745307b6507d341f27e4025159 WHIRLPOOL edfd7ac72e4b6e185222e350328acf771d83d5aeae4fac0860737feced5e3ade724891dd21448a366d87b4b59e24442dbfbf894f42813f71af4063f011450af3
 DIST lftp-4.7.5.tar.xz 1567232 SHA256 53b5c5eba2e38b418bcf451776f2df596050dff4db90ab4ea73d872f8b1fd0d8 SHA512 e7d478367a3b79f61686a538827efe8afb807a587d2967189ae351927e3acb0d5b097d8707e0cb3997aa650f8f0787aa44038bb1d081e393bc7202b348249960 WHIRLPOOL 12d53a4c51ee52b67e57dc2e1c2c90443a65964073ee05ce123211096ea82813efbc51345ea488c24aa00600818ce6c0cd96beef27de619ff5d938bef3cabd06

diff --git a/net-ftp/lftp/files/lftp-4.6.3a-autopoint.patch b/net-ftp/lftp/files/lftp-4.6.3a-autopoint.patch
deleted file mode 100644
index ad1cf3ede1..0000000000
--- a/net-ftp/lftp/files/lftp-4.6.3a-autopoint.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -137,6 +137,7 @@
- AM_ICONV
- 
- ALL_LINGUAS="de es fr it ja ko pl pt_BR ru uk zh_CN zh_TW zh_HK cs"
-+AM_GNU_GETTEXT_VERSION([0.19])
- AM_GNU_GETTEXT([external])
- test "$MSGFMT"  = "no" && MSGFMT  ="$missing_dir/missing msgfmt"
- test "$GMSGFMT" = "no" && GMSGFMT ="$missing_dir/missing msgfmt"

diff --git a/net-ftp/lftp/lftp-4.6.5.ebuild b/net-ftp/lftp/lftp-4.6.5.ebuild
deleted file mode 100644
index a094c3b50b..0000000000
--- a/net-ftp/lftp/lftp-4.6.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils libtool
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="http://lftp.yar.ru/"
-SRC_URI="${HOMEPAGE}ftp/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="convert-mozilla-cookies +gnutls idn ipv6 nls openssl socks5 +ssl verify-file"
-LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
-IUSE+=" ${LFTP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
-	ssl? ( ^^ ( openssl gnutls ) )
-"
-
-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/libidn )
-	socks5? (
-		>=net-proxy/dante-1.1.12
-		virtual/pam
-	)
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.3 )
-		openssl? ( dev-libs/openssl:0 )
-	)
-	verify-file? (
-		dev-perl/String-CRC32
-		virtual/perl-Digest-MD5
-	)
-"
-
-DEPEND="
-	${RDEPEND}
-	=sys-devel/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
-)
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch \
-		"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch \
-		"${FILESDIR}"/${PN}-4.6.3a-autopoint.patch
-
-	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 gnutls) \
-		$(use_with idn libidn) \
-		$(use_enable ipv6) \
-		$(use_with openssl openssl "${EPREFIX}"/usr) \
-		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
-		--enable-packager-mode \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-modules \
-		--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
-}

diff --git a/net-ftp/lftp/metadata.xml b/net-ftp/lftp/metadata.xml
index d28bbe8b07..1c23e9e44b 100644
--- a/net-ftp/lftp/metadata.xml
+++ b/net-ftp/lftp/metadata.xml
@@ -7,7 +7,6 @@
 </maintainer>
 <use>
 <flag name="convert-mozilla-cookies">Install the convert-mozilla-cookies script and its run-time dependencies</flag>
-<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for SSL connections</flag>
 <flag name="verify-file">Install the verify-file script and its run-time dependencies</flag>
 </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/files/, net-ftp/lftp/
@ 2018-02-05 15:01 Jeroen Roovers
  0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2018-02-05 15:01 UTC (permalink / raw
  To: gentoo-commits

commit:     cee0bfb56f78270a1a4deaf8de03c8afb428d6a9
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  5 14:59:59 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Feb  5 15:01:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee0bfb5

net-ftp/lftp: Remove all LDFLAGS=.*-L.*\/lib (bug #646284).

 .../lftp/files/lftp-4.7.5-libdir-additional.patch    | 12 ++++++++++++
 net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch | 10 ++++++++++
 net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch     | 11 +++++++++++
 net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch    | 10 ++++++++++
 net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch   | 18 ++++++++++++++++++
 net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch  | 11 +++++++++++
 net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch      | 18 ++++++++++++++++++
 net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch | 18 ++++++++++++++++++
 net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch   | 10 ++++++++++
 net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch   | 18 ++++++++++++++++++
 net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch      | 20 ++++++++++++++++++++
 net-ftp/lftp/lftp-4.7.5.ebuild                       | 10 ++++++++--
 net-ftp/lftp/lftp-4.8.2.ebuild                       | 10 ++++++++--
 net-ftp/lftp/lftp-4.8.3.ebuild                       | 10 ++++++++--
 net-ftp/lftp/lftp-9999.ebuild                        | 13 +++++++++----
 15 files changed, 189 insertions(+), 10 deletions(-)

diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-additional.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-additional.patch
new file mode 100644
index 00000000000..bf7f0a96d9f
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-additional.patch
@@ -0,0 +1,12 @@
+--- a/m4/lib-prefix.m4
++++ b/m4/lib-prefix.m4
+@@ -108,7 +108,8 @@
+         if test -z "$haveit"; then
+           if test -d "$additional_libdir"; then
+             dnl Really add $additional_libdir to $LDFLAGS.
+-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
++            dnl No, let's not do that.
++            :
+           fi
+         fi
+       fi

diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch
new file mode 100644
index 00000000000..e855ac19432
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -186,7 +186,6 @@
+ esac
+ 
+ if test x$socks_loc != x; then
+-   LDFLAGS="$LDFLAGS -L$socks_loc/lib"
+    CPPFLAGS="$CPPFLAGS -I$socks_loc/include"
+ fi
+ 

diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch
new file mode 100644
index 00000000000..f82afc78256
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch
@@ -0,0 +1,11 @@
+--- a/m4/ax_lib_expat.m4
++++ b/m4/ax_lib_expat.m4
+@@ -109,7 +109,7 @@
+ 
+     if test -n "$expat_prefix"; then
+         expat_include_dir="$expat_prefix/include"
+-        expat_ld_flags="-L$expat_prefix/lib"
++        expat_ld_flags="-L$libdir"
+         expat_lib_flags="-lexpat"
+         run_expat_test="yes"
+     elif test "$expat_requested" = "yes"; then

diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch
new file mode 100644
index 00000000000..890138013da
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch
@@ -0,0 +1,10 @@
+--- a/m4/lftp.m4
++++ b/m4/lftp.m4
+@@ -319,7 +319,6 @@
+        libidn=$withval, libidn=yes)
+      if test "$libidn" != "no"; then
+        if test "$libidn" != "yes"; then
+-         LDFLAGS="${LDFLAGS} -L$libidn/lib"
+          CPPFLAGS="${CPPFLAGS} -I$libidn/include"
+        fi
+        AC_CHECK_HEADER(idna.h,

diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch
new file mode 100644
index 00000000000..44c5239ae03
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch
@@ -0,0 +1,18 @@
+--- a/m4/ssl.m4
++++ b/m4/ssl.m4
+@@ -10,7 +10,6 @@
+ 		old_CPPFLAGS="$CPPFLAGS"
+ 		LIBS="$LIBS -lssl -lcrypto"
+ 		if test $loc != default; then
+-			LDFLAGS="$LDFLAGS -L$loc/lib"
+ 			CPPFLAGS="$CPPFLAGS -I$loc/include"
+ 		fi
+ 		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>
+@@ -21,7 +20,6 @@
+ 		if test $found_loc != "none"; then
+ 			lftp_cv_openssl="OPENSSL_LIBS=\"-lssl -lcrypto\""
+ 			if test $found_loc != default; then
+-				lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-L$found_loc/lib -R$found_loc/lib\""
+ 				lftp_cv_openssl="$lftp_cv_openssl OPENSSL_CPPFLAGS=-I$found_loc/include"
+ 			fi
+ 			break;

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
new file mode 100644
index 00000000000..01c9371870c
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch
@@ -0,0 +1,11 @@
+--- 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.7.5-libdir-zlib.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch
new file mode 100644
index 00000000000..9ec7c1b0dd1
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch
@@ -0,0 +1,18 @@
+--- a/m4/ax_check_zlib.m4
++++ b/m4/ax_check_zlib.m4
+@@ -105,7 +105,6 @@
+   ZLIB_OLD_LDFLAGS=$LDFLAGS
+   ZLIB_OLD_CPPFLAGS=$CPPFLAGS
+   if test -n "${ZLIB_HOME}"; then
+-        LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+         CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+   fi
+   AC_LANG_SAVE
+@@ -120,7 +119,6 @@
+     #
+     m4_ifblank([$1],[
+                 CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+-                LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+                 LIBS="-lz $LIBS"
+                 AC_DEFINE([HAVE_LIBZ], [1],
+                           [Define to 1 if you have `z' library (-lz)])

diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch
new file mode 100644
index 00000000000..d8d620b8ee5
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch
@@ -0,0 +1,18 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -186,7 +186,6 @@
+ esac
+ 
+ if test x$socks_loc != x; then
+-   LDFLAGS="$LDFLAGS -L$socks_loc/lib"
+    CPPFLAGS="$CPPFLAGS -I$socks_loc/include"
+ fi
+ 
+@@ -307,7 +306,6 @@
+ AX_CHECK_ZLIB([
+    AC_SUBST([ZLIB],[-lz])
+    r=""; test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr && r=" -R${ZLIB_HOME}/lib"
+-   AC_SUBST([ZLIB_LDFLAGS],["-L${ZLIB_HOME}/lib$r"])
+    AC_SUBST([ZLIB_CPPFLAGS],["-I${ZLIB_HOME}/include"])
+ ],[
+    AC_MSG_ERROR([cannot find -lz library, install zlib-devel package])

diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch
new file mode 100644
index 00000000000..cae07b9bafe
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch
@@ -0,0 +1,10 @@
+--- a/m4/lftp.m4
++++ b/m4/lftp.m4
+@@ -319,7 +319,6 @@
+        libidn2=$withval, libidn2=yes)
+      if test "$libidn2" != "no"; then
+        if test "$libidn2" != "yes"; then
+-         LDFLAGS="${LDFLAGS} -L$libidn2/lib"
+          CPPFLAGS="${CPPFLAGS} -I$libidn2/include"
+        fi
+        AC_CHECK_HEADER(idn2.h,

diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch
new file mode 100644
index 00000000000..f8bf45b1d59
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch
@@ -0,0 +1,18 @@
+--- a/m4/ssl.m4
++++ b/m4/ssl.m4
+@@ -10,7 +10,6 @@
+ 		old_CPPFLAGS="$CPPFLAGS"
+ 		LIBS="$LIBS -lssl -lcrypto"
+ 		if test $loc != default; then
+-			LDFLAGS="$LDFLAGS -L$loc/lib"
+ 			CPPFLAGS="$CPPFLAGS -I$loc/include"
+ 		fi
+ 		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>
+@@ -22,7 +21,6 @@
+ 			lftp_cv_openssl="OPENSSL_LIBS=\"-lssl -lcrypto\""
+ 			if test $found_loc != default; then
+ 				r=""; test "$enable_rpath" = yes -a "$found_loc" != /usr && r=" -R$found_loc/lib"
+-				lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-L$found_loc/lib$r\""
+ 				lftp_cv_openssl="$lftp_cv_openssl OPENSSL_CPPFLAGS=-I$found_loc/include"
+ 			fi
+ 			break;

diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch
new file mode 100644
index 00000000000..7ff003fe6eb
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch
@@ -0,0 +1,20 @@
+--- a/m4/ax_check_zlib.m4
++++ b/m4/ax_check_zlib.m4
+@@ -105,7 +105,6 @@
+   ZLIB_OLD_LDFLAGS="$LDFLAGS"
+   ZLIB_OLD_CPPFLAGS="$CPPFLAGS"
+   if test -n "${ZLIB_HOME}"; then
+-        LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+         CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+   fi
+   AC_LANG_SAVE
+@@ -118,8 +118,7 @@
+     # If both library and header were found, action-if-found
+     #
+     m4_ifblank([$1],[
+-		test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr && \
+-		    LDFLAGS="$LDFLAGS -R${ZLIB_HOME}/lib"
++		test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr
+                 LIBS="-lz $LIBS"
+                 AC_DEFINE([HAVE_LIBZ], [1],
+                           [Define to 1 if you have `z' library (-lz)])

diff --git a/net-ftp/lftp/lftp-4.7.5.ebuild b/net-ftp/lftp/lftp-4.7.5.ebuild
index 138bce2efde..ed6f78f723f 100644
--- a/net-ftp/lftp/lftp-4.7.5.ebuild
+++ b/net-ftp/lftp/lftp-4.7.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils libtool multilib
+inherit autotools eutils libtool
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
 HOMEPAGE="https://lftp.tech/"
@@ -55,6 +55,13 @@ 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-configure.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-libidn.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-openssl.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-zlib.patch
 )
 
 src_prepare() {
@@ -76,7 +83,6 @@ src_configure() {
 		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
 		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
 		--enable-packager-mode \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--sysconfdir="${EPREFIX}"/etc/${PN} \
 		--with-modules \
 		--with-readline="${EPREFIX}"/usr \

diff --git a/net-ftp/lftp/lftp-4.8.2.ebuild b/net-ftp/lftp/lftp-4.8.2.ebuild
index a6577ffe126..3ea35f33f1d 100644
--- a/net-ftp/lftp/lftp-4.8.2.ebuild
+++ b/net-ftp/lftp/lftp-4.8.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils libtool multilib
+inherit autotools eutils libtool
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
 HOMEPAGE="https://lftp.tech/"
@@ -57,6 +57,13 @@ 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.7.5-libdir-readline.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
 )
 
 src_prepare() {
@@ -79,7 +86,6 @@ src_configure() {
 		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
 		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
 		--enable-packager-mode \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--sysconfdir="${EPREFIX}"/etc/${PN} \
 		--with-modules \
 		--with-readline="${EPREFIX}"/usr \

diff --git a/net-ftp/lftp/lftp-4.8.3.ebuild b/net-ftp/lftp/lftp-4.8.3.ebuild
index a6577ffe126..3ea35f33f1d 100644
--- a/net-ftp/lftp/lftp-4.8.3.ebuild
+++ b/net-ftp/lftp/lftp-4.8.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils libtool multilib
+inherit autotools eutils libtool
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
 HOMEPAGE="https://lftp.tech/"
@@ -57,6 +57,13 @@ 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.7.5-libdir-readline.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
 )
 
 src_prepare() {
@@ -79,7 +86,6 @@ src_configure() {
 		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
 		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
 		--enable-packager-mode \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--sysconfdir="${EPREFIX}"/etc/${PN} \
 		--with-modules \
 		--with-readline="${EPREFIX}"/usr \

diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index 75206b99240..d8dca66a3ca 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils git-r3 libtool multilib
+inherit autotools eutils git-r3 libtool
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
 HOMEPAGE="https://lftp.tech/"
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-libs/expat
 	sys-libs/zlib
 	convert-mozilla-cookies? ( dev-perl/DBI )
-	idn? ( net-dns/libidn )
+	idn? ( net-dns/libidn2 )
 	socks5? (
 		>=net-proxy/dante-1.1.12
 		virtual/pam
@@ -52,6 +52,12 @@ DOCS=(
 )
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-readline.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
 )
 
 src_prepare() {
@@ -69,12 +75,11 @@ src_configure() {
 	econf \
 		$(use_enable ipv6) \
 		$(use_enable nls) \
-		$(use_with idn libidn) \
+		$(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-packager-mode \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--sysconfdir="${EPREFIX}"/etc/${PN} \
 		--with-modules \
 		--with-readline="${EPREFIX}"/usr \


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/files/, net-ftp/lftp/
@ 2020-01-15 23:37 Jeroen Roovers
  0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2020-01-15 23:37 UTC (permalink / raw
  To: gentoo-commits

commit:     4cf2aa76869f2fcb3ccf667042068d937dbafada
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 15 23:34:37 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jan 15 23:37:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cf2aa76

net-ftp/lftp: Version 4.9.1

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-ftp/lftp/Manifest                              |   1 +
 .../lftp/files/lftp-4.9.1-libdir-readline.patch    |  11 +++
 net-ftp/lftp/lftp-4.9.1.ebuild                     | 105 +++++++++++++++++++++
 3 files changed, 117 insertions(+)

diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 37283c7c30b..7ee58454d13 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,2 +1,3 @@
 DIST lftp-4.8.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1
 DIST lftp-4.9.0.tar.xz 1642596 BLAKE2B 111e559c98e0572e1ca79f935a1db8c45c99275c8aa7b584be06d1738296b32808e97d696a02751575c5d1ea24a30a52f5d9f177a193f70addf1168e3208aa13 SHA512 8d83ea76390d38cb1f84f02eb7bf45780758afb9fe61f5b7278a48c9a5d216d03bc8b699c0f449a0036bdb441b4225af074da1b5e92a77ddb61aca704758211e
+DIST lftp-4.9.1.tar.xz 1648564 BLAKE2B 2f36dec3de01dd3f9e7316567912a04196732a1e71a4d1c3a5124471d2941673d7b58bc3182d73d3cf154def905f57d37667d33fedec6ea9434f74850aa64f4d SHA512 303e2354bd61a850403a02ac5b71e54719c12b026c7e36194a6382e9044f1fee93ea581ba0a55fea19981e07b896216e92c7d961c719350762eb0cfb51a2c506

diff --git a/net-ftp/lftp/files/lftp-4.9.1-libdir-readline.patch b/net-ftp/lftp/files/lftp-4.9.1-libdir-readline.patch
new file mode 100644
index 00000000000..fde1017f4bd
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.1-libdir-readline.patch
@@ -0,0 +1,11 @@
+--- 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"
+         if test -z "$readline_lib_flags"; then
+             readline_lib_flags="-lreadline"
+         fi

diff --git a/net-ftp/lftp/lftp-4.9.1.ebuild b/net-ftp/lftp/lftp-4.9.1.ebuild
new file mode 100644
index 00000000000..33630583e6b
--- /dev/null
+++ b/net-ftp/lftp/lftp-4.9.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 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="https://lftp.tech/"
+SRC_URI="https://lftp.tech/ftp/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl 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? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	verify-file? (
+		dev-perl/String-CRC32
+		virtual/perl-Digest-MD5
+	)
+"
+DEPEND="
+	${RDEPEND}
+	=sys-devel/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
+)
+
+src_prepare() {
+	default
+
+	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 ipv6) \
+		$(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-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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/files/, net-ftp/lftp/
@ 2020-11-07  8:49 Sergei Trofimovich
  0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2020-11-07  8:49 UTC (permalink / raw
  To: gentoo-commits

commit:     af1aae043aef21259837a5f8c7cc352bdd35ca1b
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  7 08:36:14 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Nov  7 08:49:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af1aae04

net-ftp/lftp: use a patch for release against live ebuild

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/lftp/files/lftp-9999-libdir-readline.patch | 11 -----------
 net-ftp/lftp/lftp-9999.ebuild                      |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/net-ftp/lftp/files/lftp-9999-libdir-readline.patch b/net-ftp/lftp/files/lftp-9999-libdir-readline.patch
deleted file mode 100644
index fde1017f4bd..00000000000
--- a/net-ftp/lftp/files/lftp-9999-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"
-         if test -z "$readline_lib_flags"; then
-             readline_lib_flags="-lreadline"
-         fi

diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index b38775a32ae..0f1f759f337 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -57,7 +57,7 @@ PATCHES=(
 	"${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}-9999-libdir-readline.patch
+	"${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/files/, net-ftp/lftp/
@ 2020-11-15 18:57 Sergei Trofimovich
  0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2020-11-15 18:57 UTC (permalink / raw
  To: gentoo-commits

commit:     42f481bed6d26d48b34ca9c90ea2fdd176ac91e3
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 18:56:56 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 18:57:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42f481be

net-ftp/lftp: backport libressl support

Backported upstream patch.

Reported-by: m1027
Closes: https://bugs.gentoo.org/754225
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/lftp/files/lftp-4.9.2-libressl.patch | 40 ++++++++++++++++++++++++++++
 net-ftp/lftp/lftp-4.9.2.ebuild               |  1 +
 2 files changed, 41 insertions(+)

diff --git a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
new file mode 100644
index 00000000000..51de51f780d
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
@@ -0,0 +1,40 @@
+https://github.com/lavv17/lftp/commit/0276d5c239c41b3a63f738a5dc47fd56ac389cf0.patch
+
+From 0276d5c239c41b3a63f738a5dc47fd56ac389cf0 Mon Sep 17 00:00:00 2001
+From: Ganael Laplanche <ganael.laplanche@martymac.org>
+Date: Thu, 20 Aug 2020 12:29:05 +0200
+Subject: [PATCH] Fix build with LibreSSL (following commit 537f37898)
+
+---
+ src/lftp_ssl.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/src/lftp_ssl.cc
++++ b/src/lftp_ssl.cc
+@@ -34,7 +34,7 @@
+ #include "misc.h"
+ #include "network.h"
+ #include "buffer.h"
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
+ #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
+ #endif
+ extern "C" {
+@@ -840,7 +840,7 @@ lftp_ssl_openssl_instance::lftp_ssl_openssl_instance()
+    ssl_ctx=SSL_CTX_new();
+    X509_set_default_verify_paths(ssl_ctx->cert);
+ #else
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
+    SSLeay_add_ssl_algorithms();
+ #endif
+    ssl_ctx=SSL_CTX_new(SSLv23_client_method());
+@@ -1080,7 +1080,7 @@ void lftp_ssl_openssl::copy_sid(const lftp_ssl_openssl *o)
+ 
+ const char *lftp_ssl_openssl::strerror()
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
+    SSL_load_error_strings();
+ #endif
+    int error=ERR_get_error();

diff --git a/net-ftp/lftp/lftp-4.9.2.ebuild b/net-ftp/lftp/lftp-4.9.2.ebuild
index 94f6e46a85e..121ccc94638 100644
--- a/net-ftp/lftp/lftp-4.9.2.ebuild
+++ b/net-ftp/lftp/lftp-4.9.2.ebuild
@@ -59,6 +59,7 @@ PATCHES=(
 	"${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-libressl.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/files/, net-ftp/lftp/
@ 2025-01-04 23:25 Conrad Kostecki
  0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2025-01-04 23:25 UTC (permalink / raw
  To: gentoo-commits

commit:     69b63c93ffe75a7c376db0dafc89ee65e2deb16f
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  4 23:19:20 2025 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jan  4 23:25:29 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69b63c93

net-ftp/lftp: add 4.9.3

Bug: https://bugs.gentoo.org/923095
Bug: https://bugs.gentoo.org/862816
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-ftp/lftp/Manifest                      |   1 +
 net-ftp/lftp/files/lftp-4.9.3-gnulib.patch |  45 ++++++++++++
 net-ftp/lftp/lftp-4.9.3.ebuild             | 112 +++++++++++++++++++++++++++++
 3 files changed, 158 insertions(+)

diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 2ccaa2a45a9c..fd973c80c40f 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1 +1,2 @@
 DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad
+DIST lftp-4.9.3.tar.gz 3385456 BLAKE2B 10d96a8d10d95ab205b63adb1fa31ffa71ee88aeea6ba1740e4f9e24fbc7499387507cb9a9d6b7025cd8ff05c4d4ac0acc9ddbc5e6d04561ad1a4fc644faf86a SHA512 3168077f065ab71d1c49fda9c6e22ecc67bc0a16c27206c413f2103ba343e0c1364f63a1ee10a4c0f06203cbb9a2a81f94f736f7ef8a3dd667445e17ea75206f

diff --git a/net-ftp/lftp/files/lftp-4.9.3-gnulib.patch b/net-ftp/lftp/files/lftp-4.9.3-gnulib.patch
new file mode 100644
index 000000000000..2d821907f2d7
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.3-gnulib.patch
@@ -0,0 +1,45 @@
+From: Jan Palus <jpalus@fastmail.com>
+Date: Sun, 17 Nov 2024 17:58:42 +0000 (+0100)
+Subject: md5-stream, sha*-stream, sm3-stream: Avoid duplicate symbols.
+X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff_plain;h=353a3236d9328349c18ce2e4e984755cb4a76ea7
+
+md5-stream, sha*-stream, sm3-stream: Avoid duplicate symbols.
+
+* lib/md5-stream.c (GL_OPENSSL_INLINE): Remove definition, that caused
+the symbols defined in md5.o to be defined in md5-stream.o as well.
+* lib/sha1-stream.c (GL_OPENSSL_INLINE): Likewise.
+* lib/sha256-stream.c (GL_OPENSSL_INLINE): Likewise.
+* lib/sha512-stream.c (GL_OPENSSL_INLINE): Likewise.
+* lib/sm3-stream.c (GL_OPENSSL_INLINE): Likewise.
+
+Copyright-paperwork-exempt: Yes
+---
+
+diff --git a/lib/md5-stream.c b/lib/md5-stream.c
+index fdd2bd8b4b..2cbdda6b0f 100644
+--- a/lib/md5-stream.c
++++ b/lib/md5-stream.c
+@@ -22,9 +22,6 @@
+ #include <config.h>
+ 
+ /* Specification.  */
+-#if HAVE_OPENSSL_MD5
+-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
+-#endif
+ #include "md5.h"
+ 
+ #include <stdlib.h>
+diff --git a/lib/sha1-stream.c b/lib/sha1-stream.c
+index cbdf95ab76..b713e678a6 100644
+--- a/lib/sha1-stream.c
++++ b/lib/sha1-stream.c
+@@ -24,9 +24,6 @@
+ #include <config.h>
+ 
+ /* Specification.  */
+-#if HAVE_OPENSSL_SHA1
+-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
+-#endif
+ #include "sha1.h"
+ 
+ #include <stdlib.h>

diff --git a/net-ftp/lftp/lftp-4.9.3.ebuild b/net-ftp/lftp/lftp-4.9.3.ebuild
new file mode 100644
index 000000000000..b7c5e998433f
--- /dev/null
+++ b/net-ftp/lftp/lftp-4.9.3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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="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"
+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.21 )
+	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.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-socks.patch
+	"${FILESDIR}"/${PN}-4.9.3-gnulib.patch
+)
+
+# 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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2025-01-04 23:25 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-15 23:37 [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/files/, net-ftp/lftp/ Jeroen Roovers
  -- strict thread matches above, loose matches on Subject: below --
2025-01-04 23:25 Conrad Kostecki
2020-11-15 18:57 Sergei Trofimovich
2020-11-07  8:49 Sergei Trofimovich
2018-02-05 15:01 Jeroen Roovers
2017-02-13  8:05 Jeroen Roovers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox