patch from author to fix ssl blocking. bug #112487

(Portage version: 2.0.53_rc7)

7 files changed, 43 insertions, 85 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 0bcb0d4be17e..cc42d5a15a8d 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.90 2005/11/19 23:39:40 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.91 2005/11/23 19:44:53 dragonheart Exp $
+
+*lftp-3.3.4-r1 (23 Nov 2005)
+
+  23 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/lftp-3.3.4-blocking-ssl-transfer.patch, -lftp-3.3.3.ebuild,
+  -lftp-3.3.4.ebuild, +lftp-3.3.4-r1.ebuild:
+  patch from author to fix ssl blocking. Thanks spider - bug #112487
 
 *lftp-3.3.4 (19 Nov 2005)
 
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 9712785669d9..c4e52f27dacf 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,20 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ef1d50acba03f1729433dd97abab9528 ChangeLog 13233
 MD5 8e29dd236e9977e83aee442106844d7e files/digest-lftp-3.0.13 65
 MD5 0401db3592b8f8ee8b750f12b84cfde3 files/digest-lftp-3.3.0 63
-MD5 500f6bc400867598be6e6ef4ee5274a5 files/digest-lftp-3.3.3 63
-MD5 16ab74adb63da682a17a18f1d7885b91 files/digest-lftp-3.3.4 63
+MD5 16ab74adb63da682a17a18f1d7885b91 files/digest-lftp-3.3.4-r1 63
+MD5 298e04149e627c6721f2723c16306fa9 files/lftp-3.3.4-blocking-ssl-transfer.patch 683
 MD5 929ba0e30bdea8ef09f54152b9aa0c8f lftp-3.0.13.ebuild 1804
 MD5 2e06b00d03a53136c81d8d8e18c6c13f lftp-3.3.0.ebuild 1777
-MD5 c77bd1b11f4e4a6a066d37118b14196f lftp-3.3.3.ebuild 1777
-MD5 ce888787f27f2cc48623293b4616c99c lftp-3.3.4.ebuild 1777
+MD5 03c674c033b63a2e70b1e18f48c3888b lftp-3.3.4-r1.ebuild 1889
 MD5 bd30469259dd912781df916084edcacd metadata.xml 430
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDf7fJmdTrptrqvGERAgdGAJ9alDOkoMaYYIJX9KJiqFvzLn/OlACcDYkm
-pOm9/qPb5GqB1aoVLrcKhPo=
-=k5Sh
------END PGP SIGNATURE-----
diff --git a/net-ftp/lftp/files/digest-lftp-3.3.3 b/net-ftp/lftp/files/digest-lftp-3.3.3
deleted file mode 100644
index 6a252535861a..000000000000
--- a/net-ftp/lftp/files/digest-lftp-3.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9986ccb2954562994847c968c12238e3 lftp-3.3.3.tar.gz 1724412
diff --git a/net-ftp/lftp/files/digest-lftp-3.3.4 b/net-ftp/lftp/files/digest-lftp-3.3.4-r1
index e75f06f930d8..e75f06f930d8 100644
--- a/net-ftp/lftp/files/digest-lftp-3.3.4
+++ b/net-ftp/lftp/files/digest-lftp-3.3.4-r1
diff --git a/net-ftp/lftp/files/lftp-3.3.4-blocking-ssl-transfer.patch b/net-ftp/lftp/files/lftp-3.3.4-blocking-ssl-transfer.patch
new file mode 100644
index 000000000000..00895b789617
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-3.3.4-blocking-ssl-transfer.patch
@@ -0,0 +1,24 @@
+Index: lftp_ssl.cc
+===================================================================
+RCS file: /home/lav/cvsroot/lftp/src/lftp_ssl.cc,v
+retrieving revision 1.24
+diff -u -p -r1.24 lftp_ssl.cc
+--- lftp_ssl.cc	8 Nov 2005 07:21:18 -0000	1.24
++++ lftp_ssl.cc	22 Nov 2005 12:07:34 -0000
+@@ -851,7 +851,7 @@ bool lftp_ssl_openssl::check_fatal(int r
+ 
+ int lftp_ssl_openssl::do_handshake()
+ {
+-   if(SSL_is_init_finished(ssl))
++   if(handshake_done)
+       return DONE;
+    if(handshake_mode==SERVER)
+    {
+@@ -873,6 +873,7 @@ int lftp_ssl_openssl::do_handshake()
+ 	 return ERROR;
+       }
+    }
++   handshake_done=true;
+    return DONE;
+ }
+ int lftp_ssl_openssl::read(char *buf,int size)
diff --git a/net-ftp/lftp/lftp-3.3.3.ebuild b/net-ftp/lftp/lftp-3.3.4-r1.ebuild
index e196e09acef4..0e161ba9cee4 100644
--- a/net-ftp/lftp/lftp-3.3.3.ebuild
+++ b/net-ftp/lftp/lftp-3.3.4-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.3.3.ebuild,v 1.1 2005/11/13 12:35:48 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.3.4-r1.ebuild,v 1.1 2005/11/23 19:44:53 dragonheart Exp $
+
+inherit eutils
 
 DESCRIPTION="A sophisticated ftp/http client, file transfer program"
 HOMEPAGE="http://ftp.yars.free.net/projects/lftp/"
@@ -32,6 +34,11 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/libtool"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src
+	epatch ${FILESDIR}/${P}-blocking-ssl-transfer.patch
+}
 
 src_compile() {
 	local myconf="$(use_enable nls)"
diff --git a/net-ftp/lftp/lftp-3.3.4.ebuild b/net-ftp/lftp/lftp-3.3.4.ebuild
deleted file mode 100644
index e86ef61c4553..000000000000
--- a/net-ftp/lftp/lftp-3.3.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.3.4.ebuild,v 1.1 2005/11/19 23:39:40 dragonheart Exp $
-
-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 )
-		)
-		sys-libs/readline
-		virtual/libc"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=sys-apps/sed-4
-	sys-apps/gawk
-	sys-devel/bison
-	sys-devel/libtool"
-
-
-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 COPYING ChangeLog FAQ FEATURES MIRRORS \
-		NEWS README* THANKS TODO
-}