Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net-ftp/lftp/ChangeLog9
-rw-r--r--net-ftp/lftp/Manifest13
-rw-r--r--net-ftp/lftp/files/digest-lftp-3.4.0-r11
-rw-r--r--net-ftp/lftp/files/lftp-3.4.0-remote-completion-false.patch29
-rw-r--r--net-ftp/lftp/lftp-3.0.13.ebuild6
-rw-r--r--net-ftp/lftp/lftp-3.4.0-r1.ebuild74
6 files changed, 118 insertions, 14 deletions
diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 868806547471..004aaf873a31 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-ftp/lftp
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.92 2006/01/05 10:25:53 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.93 2006/01/11 09:22:14 dragonheart Exp $
+
+*lftp-3.4.0-r1 (11 Jan 2006)
+
+ 11 Jan 2006; Daniel Black <dragonheart@gentoo.org>
+ +files/lftp-3.4.0-remote-completion-false.patch, +lftp-3.4.0-r1.ebuild:
+ added remote-completion-false.patch from upstream. Changed back to using
+ system readline-5.1 as 5.0 breaks - bug #74815 - thanks Peter Kerwien
*lftp-3.4.0 (05 Jan 2006)
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 96ec34f37cd3..a000c2c913e1 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 8a29e4eae4cae12bfa83d83e1445fabc ChangeLog 13880
MD5 8e29dd236e9977e83aee442106844d7e files/digest-lftp-3.0.13 65
MD5 16ab74adb63da682a17a18f1d7885b91 files/digest-lftp-3.3.4-r1 63
MD5 0875626252a85b8c7d94dd225754542b files/digest-lftp-3.4.0 63
+MD5 0875626252a85b8c7d94dd225754542b files/digest-lftp-3.4.0-r1 63
MD5 298e04149e627c6721f2723c16306fa9 files/lftp-3.3.4-blocking-ssl-transfer.patch 683
+MD5 23f0721bdfd44bdbb7afb954d2cc7895 files/lftp-3.4.0-remote-completion-false.patch 860
MD5 929ba0e30bdea8ef09f54152b9aa0c8f lftp-3.0.13.ebuild 1804
MD5 80fe5afdc5fdb8eb57e8f32106421fc3 lftp-3.3.4-r1.ebuild 1892
+MD5 47d5b9cfa8ec2d42948bc10011f9d8f3 lftp-3.4.0-r1.ebuild 1951
MD5 3062c15b4187f69cf79fa780bcaf7b0a lftp-3.4.0.ebuild 1826
MD5 bd30469259dd912781df916084edcacd metadata.xml 430
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDvPk8mdTrptrqvGERAsmVAJ4kYLhWFgvjP3B5rwOByq3tHDdhJACfYG8H
-VhIkI3O0yaVJAHZnPS1ufvs=
-=sYWl
------END PGP SIGNATURE-----
diff --git a/net-ftp/lftp/files/digest-lftp-3.4.0-r1 b/net-ftp/lftp/files/digest-lftp-3.4.0-r1
new file mode 100644
index 000000000000..812167c0a4ff
--- /dev/null
+++ b/net-ftp/lftp/files/digest-lftp-3.4.0-r1
@@ -0,0 +1 @@
+MD5 6b09694b97b5eb4a939f093e221b5b8c lftp-3.4.0.tar.gz 1737033
diff --git a/net-ftp/lftp/files/lftp-3.4.0-remote-completion-false.patch b/net-ftp/lftp/files/lftp-3.4.0-remote-completion-false.patch
new file mode 100644
index 000000000000..ab6db9039ff2
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-3.4.0-remote-completion-false.patch
@@ -0,0 +1,29 @@
+Index: complete.cc
+===================================================================
+RCS file: /home/lav/cvsroot/lftp/src/complete.cc,v
+retrieving revision 1.70
+diff -u -p -r1.70 complete.cc
+--- complete.cc 3 Nov 2004 08:37:44 -0000 1.70
++++ complete.cc 9 Jan 2006 16:07:53 -0000
+@@ -660,7 +660,7 @@ static char **lftp_completion (const cha
+ type=REMOTE_DIR;
+ goto really_remote;
+ }
+-
++ really_local:
+ ArgV arg("", ResMgr::Query("cmd:cls-completion-default", 0));
+ fso.parse_argv(&arg);
+
+@@ -729,7 +729,11 @@ static char **lftp_completion (const cha
+ case REMOTE_FILE:
+ case REMOTE_DIR: {
+ if(!remote_completion && !force_remote)
+- break; // local
++ {
++ if(type==REMOTE_DIR)
++ type=LOCAL_DIR;
++ goto really_local;
++ }
+ really_remote:
+ if(!strncmp(text,"bm:",3) && !strchr(text,'/'))
+ {
diff --git a/net-ftp/lftp/lftp-3.0.13.ebuild b/net-ftp/lftp/lftp-3.0.13.ebuild
index 13d9b2108f43..f0a360a20c67 100644
--- a/net-ftp/lftp/lftp-3.0.13.ebuild
+++ b/net-ftp/lftp/lftp-3.0.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.0.13.ebuild,v 1.12 2005/06/21 12:10:03 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.0.13.ebuild,v 1.13 2006/01/11 09:22:14 dragonheart Exp $
inherit eutils
@@ -26,7 +26,7 @@ DEPEND=">=sys-libs/ncurses-5.1
alpha? ( dev-lang/perl )
alpha? ( >=sys-apps/sed-4 )
virtual/libc
- sys-libs/readline
+ !ppc-macos? ( sys-libs/readline )
sys-apps/gawk
sys-devel/bison
sys-devel/libtool"
diff --git a/net-ftp/lftp/lftp-3.4.0-r1.ebuild b/net-ftp/lftp/lftp-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..a861fb7b35a3
--- /dev/null
+++ b/net-ftp/lftp/lftp-3.4.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.4.0-r1.ebuild,v 1.1 2006/01/11 09:22:14 dragonheart Exp $
+
+inherit eutils
+
+DESCRIPTION="A sophisticated ftp/http client, file transfer program"
+HOMEPAGE="http://ftp.yars.free.net/projects/lftp/"
+
+#SRC_URI="http://the.wiretapped.net/mirrors/lftp/${P}.tar.bz2"
+# Was a bit too slow and unreliable last time I tried (dragonheart)
+SRC_URI="ftp://lftp.yar.ru/lftp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ssl gnutls socks5 nls"
+
+RDEPEND=">=sys-libs/ncurses-5.1
+ nls? ( sys-devel/gettext )
+ socks5? ( >=net-proxy/dante-1.1.12 )
+ socks5? ( virtual/pam )
+ ssl? (
+ gnutls? ( >=net-libs/gnutls-1.2.3 )
+ !gnutls? ( >=dev-libs/openssl-0.9.6 )
+ )
+ virtual/libc
+ ppc-macos? ( >=sys-libs/readline-5.1 )"
+
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ >=sys-apps/sed-4
+ sys-apps/gawk
+ sys-devel/bison
+ sys-devel/libtool"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}/src
+ epatch ${FILESDIR}/${P}-remote-completion-false.patch
+}
+
+src_compile() {
+ local myconf="$(use_enable nls)"
+
+ if use ssl && use gnutls ; then
+ myconf="${myconf} --without-openssl"
+ elif use ssl && ! use gnutls ; then
+ myconf="${myconf} --without-gnutls --with-openssl=/usr"
+ else
+ myconf="${myconf} --without-gnutls --without-openssl"
+ fi
+
+ use socks5 && myconf="${myconf} --with-socksdante=/usr" \
+ || myconf="${myconf} --without-socksdante"
+
+ use ppc-macos && myconf="${myconf} --with-included-readline"
+ econf \
+ --sysconfdir=/etc/lftp \
+ --without-modules \
+ ${myconf} || die "econf failed"
+
+ emake || die "compile problem"
+}
+
+src_install() {
+ emake install DESTDIR=${D} || die
+
+ # hrmph, empty..
+ rm -rf ${D}/usr/lib
+
+ dodoc BUGS ChangeLog FAQ FEATURES MIRRORS \
+ NEWS README* THANKS TODO
+}