patch to fix segv on gnutls as per bug #142405.

Package-Manager: portage-2.1.1_pre4

6 files changed, 140 insertions, 21 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 05cf8739e000..f3487db030c3 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,14 +1,27 @@
 # 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.112 2006/08/02 14:17:59 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.113 2006/08/03 00:25:01 dragonheart Exp $
+
+*lftp-3.5.2-r1 (03 Aug 2006)
+
+  03 Aug 2006; Daniel Black <dragonheart@gentoo.org>  lftp-3.5.2-r1.ebuild files/digest-lftp-3.5.2-r1
+  patch to fix segv on gnutls as per bug #142405.
+
+*lftp-3.5.2-r1 (03 Aug 2006)
+
+  03 Aug 2006; Daniel Black <dragonheart@gentoo.org> +lftp-3.5.2-r1.ebuild,
+  +files/lftp-3.5.2-gnutls-segv.patch:
+  patch to fix segv on gnutls as per bug #142405. Thanks to José Valentín
+  Gutiérrez Boquete for the bug report and test server. Thanks to author 
+  Alexander Lukyanov for the patch
 
   02 Aug 2006; Daniel Black <dragonheart@gentoo.org>
   +files/lftp-3.5.2-install_data_hook.patch,
   +files/lftp-3.5.2-noautoflags.patch, +files/lftp-3.5.2-socklib.patch,
   lftp-3.5.2.ebuild:
   added patch from upstream. Moved ebuild to use modules mode. Fixed bug
-  #142435 that resulted in automatically stripped executables thanks to José
-  Valentín Gutiérrez Boquete. Fixed compile problem with USE=socks5 thanks 
+  #142435 that resulted in automatically stripped executables thanks to José
+  Valentín Gutiérrez Boquete. Fixed compile problem with USE=socks5 thanks 
   to me.
 
 *lftp-3.5.2 (31 Jul 2006)
@@ -181,7 +194,7 @@
   version bump to 3.1.0 as per bug #83682. x86 keyword for lftp-3.0.13. Bug
   thanks to Jeffrey Litvin <litvin.j@neu.edu>
 
-  22 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.12-r1.ebuild:
+  22 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.12-r1.ebuild:
   Stable on alpha, bug 78620.
 
   27 Dec 2004; Guy Martin <gmsoft@gentoo.org> lftp-3.0.12-r1.ebuild:
@@ -203,7 +216,7 @@
   19 Dec 2004; Daniel Black <dragonheart@gentoo.org> +lftp-3.0.12-r1.ebuild,
   +files/lftp-3.0.12.patch, -lftp-3.0.12.ebuild:
   Patch added to prevent segfault. Thanks to Jeffrey Litvin <litvin.j@neu.edu>
-  for the patch reference and Thomas Jäger <tjjr@tj.no> for Bug #74815
+  for the patch reference and Thomas Jäger <tjjr@tj.no> for Bug #74815
 
 *lftp-3.0.12 (07 Dec 2004)
 
@@ -212,7 +225,7 @@
   version bump as per bug #73582 by rockoo. Removed one old version. added ppc
   keyword to 3.0.9
 
-  01 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.9.ebuild:
+  01 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.9.ebuild:
   Stable on alpha.
 
   29 Oct 2004; Jason Wever <weeve@gentoo.org> lftp-3.0.9.ebuild:
@@ -268,7 +281,7 @@
   Memory leak fixed - thanks to Luke Macken in bug #61335. OSX fix thanks to
   Miguel Sousa Filipe in bug #61349
 
-  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.6.ebuild:
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.6.ebuild:
   Stable on alpha.
 
   18 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> lftp-3.0.7.ebuild:
@@ -302,7 +315,7 @@
   Version bump thanks to #gentoo.pl Team - sekretarz <sekretarz@dukato.net> in
   bug #53720
 
-  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.3.ebuild:
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.3.ebuild:
   Stable on alpha.
 
 *lftp-3.0.5 (04 Jun 2004)
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 0fdf08764934..2172415daa98 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -5,6 +5,10 @@ AUX lftp-3.4.6-nossl.patch 660 RMD160 f4c56f2fe7c491a9344e1b95785231957efb2711 S
 MD5 c0465a6e318d1a1a11c6c322288df990 files/lftp-3.4.6-nossl.patch 660
 RMD160 f4c56f2fe7c491a9344e1b95785231957efb2711 files/lftp-3.4.6-nossl.patch 660
 SHA256 61f79d13b5c2f0cdb7abd300486396a39458192cd71b1a61c799afda1508d1fe files/lftp-3.4.6-nossl.patch 660
+AUX lftp-3.5.2-gnutls-segv.patch 577 RMD160 a98bd76b4d64dd38457ba1d042df944c87b5427d SHA1 4fc468acff83f22ddc0da47e6cd905e537698695 SHA256 25091cca16459a024106ed6595f8ccc8cd59b4662ccbe192cfaa1f818e363989
+MD5 e83a97ab3d4b61f583750a80822e1771 files/lftp-3.5.2-gnutls-segv.patch 577
+RMD160 a98bd76b4d64dd38457ba1d042df944c87b5427d files/lftp-3.5.2-gnutls-segv.patch 577
+SHA256 25091cca16459a024106ed6595f8ccc8cd59b4662ccbe192cfaa1f818e363989 files/lftp-3.5.2-gnutls-segv.patch 577
 AUX lftp-3.5.2-install_data_hook.patch 1077 RMD160 aba88f76ea129ef5213cce285917a69a6dc3747e SHA1 7c4ad13d621e1e4d48aa4efdff2a81576b298954 SHA256 276310a8bb3fdfc6b4e2db9c59a15324708b974a0f21628b0da839d69cb46ec4
 MD5 72d3bec832f8c950b144cba970004896 files/lftp-3.5.2-install_data_hook.patch 1077
 RMD160 aba88f76ea129ef5213cce285917a69a6dc3747e files/lftp-3.5.2-install_data_hook.patch 1077
@@ -38,14 +42,18 @@ EBUILD lftp-3.5.1.ebuild 1726 RMD160 1d1ca7f5d03f470b40fe61537d2969f5c49d6fee SH
 MD5 1c1f5569d42f8ee94fb4001c54c662e8 lftp-3.5.1.ebuild 1726
 RMD160 1d1ca7f5d03f470b40fe61537d2969f5c49d6fee lftp-3.5.1.ebuild 1726
 SHA256 b07ad83b67621b70ea5cf1d6679c23cd8bbf847854cb692f71a41ad788a0f1b7 lftp-3.5.1.ebuild 1726
-EBUILD lftp-3.5.2.ebuild 1937 RMD160 69ce7766225b9d56b6d2beafbb9347d584bc98f7 SHA1 57d192b07aa77d0d7eaee5072134507e4715200c SHA256 2ba327435c6d4eafaca134c557895fb1200b631fef9f0f52a21faf6d7762cc7d
-MD5 ed636522d233d6c08cb137e21aa04af8 lftp-3.5.2.ebuild 1937
-RMD160 69ce7766225b9d56b6d2beafbb9347d584bc98f7 lftp-3.5.2.ebuild 1937
-SHA256 2ba327435c6d4eafaca134c557895fb1200b631fef9f0f52a21faf6d7762cc7d lftp-3.5.2.ebuild 1937
-MISC ChangeLog 17216 RMD160 3385041d5911033da57c1f193b8723f7ccc9ff20 SHA1 eb5a0e7d86295ff7cb84379ba7c6c7b5605f72ac SHA256 49c31a60c5872ae309c4837ff7cc26febf3d115c38906fab2eb5d32de48c9f05
-MD5 ff702a6653ad1ea2017dacacc4040275 ChangeLog 17216
-RMD160 3385041d5911033da57c1f193b8723f7ccc9ff20 ChangeLog 17216
-SHA256 49c31a60c5872ae309c4837ff7cc26febf3d115c38906fab2eb5d32de48c9f05 ChangeLog 17216
+EBUILD lftp-3.5.2-r1.ebuild 2010 RMD160 5f1bd5aea714bd527471d151c559102aca0a3eab SHA1 a2311f8a2eaf99f763502c6011155ead9f26184f SHA256 3489c66088e35b10b886157fa2d7df76fe265235e79a62874fc6f2fbeb12a651
+MD5 c9700a8a989fc79e03bd0b07eb209ea9 lftp-3.5.2-r1.ebuild 2010
+RMD160 5f1bd5aea714bd527471d151c559102aca0a3eab lftp-3.5.2-r1.ebuild 2010
+SHA256 3489c66088e35b10b886157fa2d7df76fe265235e79a62874fc6f2fbeb12a651 lftp-3.5.2-r1.ebuild 2010
+EBUILD lftp-3.5.2.ebuild 1936 RMD160 dd349276ed6bda42aae08b93bdd2d2c948c9c4a8 SHA1 5ce7393b2943e5ecfe4b091b90a48ff03c686fac SHA256 3cc4dd64b6234eaa9f4efb128bab8de475fd927acd8c5448b6f4b30c6cdbee40
+MD5 25d42dbf6b470dd968dd18ef099bcdd1 lftp-3.5.2.ebuild 1936
+RMD160 dd349276ed6bda42aae08b93bdd2d2c948c9c4a8 lftp-3.5.2.ebuild 1936
+SHA256 3cc4dd64b6234eaa9f4efb128bab8de475fd927acd8c5448b6f4b30c6cdbee40 lftp-3.5.2.ebuild 1936
+MISC ChangeLog 17757 RMD160 9fbd6e5d9ceef34c371fa1d0b7f90a613b0de76b SHA1 30ee96fe1192852fe79d8395c2b4b4c74b2820b8 SHA256 a94160a072ec123b65d33e3348edba2a408c17322001dd5effa52b9bdc6012c0
+MD5 b206b8247cfc2b513d40a524fc5a8187 ChangeLog 17757
+RMD160 9fbd6e5d9ceef34c371fa1d0b7f90a613b0de76b ChangeLog 17757
+SHA256 a94160a072ec123b65d33e3348edba2a408c17322001dd5effa52b9bdc6012c0 ChangeLog 17757
 MISC metadata.xml 430 RMD160 e522bf2928ed5c97a1e41a3443c6c26ba64847cd SHA1 0c992ae070f385380005c35321070c3c5d318eb9 SHA256 bd840a8fc0f6882e2fc2fc80aa4b3ba5a7a1b22a296d998c368ed5628baf3b82
 MD5 bd30469259dd912781df916084edcacd metadata.xml 430
 RMD160 e522bf2928ed5c97a1e41a3443c6c26ba64847cd metadata.xml 430
@@ -65,10 +73,13 @@ SHA256 81751913179fc2a8ead0f348874aad0a8b9ac4dd288f42873d7e828d577307bb files/di
 MD5 1168538eb2216342a868fa0d3505fee2 files/digest-lftp-3.5.2 235
 RMD160 5de2ff7b40ab24ddcdd95471894b59c78edcf174 files/digest-lftp-3.5.2 235
 SHA256 2351c255384c610ca31f7e30ed6c2c0ab108297a0f79d2b2fd9f7adcf4541f04 files/digest-lftp-3.5.2 235
+MD5 1168538eb2216342a868fa0d3505fee2 files/digest-lftp-3.5.2-r1 235
+RMD160 5de2ff7b40ab24ddcdd95471894b59c78edcf174 files/digest-lftp-3.5.2-r1 235
+SHA256 2351c255384c610ca31f7e30ed6c2c0ab108297a0f79d2b2fd9f7adcf4541f04 files/digest-lftp-3.5.2-r1 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFE0LdbmdTrptrqvGERAhY/AJ0QdwO7NOC0EqZEFAuvDN3VCX894ACfSNMD
-QAQj6YAA6NoPLMggeY6RMWA=
-=eeYg
+iD8DBQFE0UYlmdTrptrqvGERArOLAKCVsCjHShz8sy4OJ5j667V3tay96ACfW/vg
+ndY5/c19uddyzHrTj+ur+I0=
+=fajb
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/lftp/files/digest-lftp-3.5.2-r1 b/net-ftp/lftp/files/digest-lftp-3.5.2-r1
new file mode 100644
index 000000000000..9498af098730
--- /dev/null
+++ b/net-ftp/lftp/files/digest-lftp-3.5.2-r1
@@ -0,0 +1,3 @@
+MD5 60327450c824b47fe6f3217e83f604a5 lftp-3.5.2.tar.gz 1789513
+RMD160 c9339a8fb4709b2c2be1f5a71ff08882425b9b22 lftp-3.5.2.tar.gz 1789513
+SHA256 2e8329a642b0132ee8e593f5e7b3f69dbbdc14264bd6a67f2aaaa146f99b871f lftp-3.5.2.tar.gz 1789513
diff --git a/net-ftp/lftp/files/lftp-3.5.2-gnutls-segv.patch b/net-ftp/lftp/files/lftp-3.5.2-gnutls-segv.patch
new file mode 100644
index 000000000000..45d082ca7c7e
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-3.5.2-gnutls-segv.patch
@@ -0,0 +1,17 @@
+Index: lftp_ssl.cc
+===================================================================
+RCS file: /home/lav/cvsroot/lftp/src/lftp_ssl.cc,v
+retrieving revision 1.30
+diff -u -p -r1.30 lftp_ssl.cc
+--- lftp_ssl.cc	6 Jul 2006 13:52:02 -0000	1.30
++++ lftp_ssl.cc	2 Aug 2006 14:23:08 -0000
+@@ -311,7 +311,8 @@ lftp_ssl_gnutls::~lftp_ssl_gnutls()
+    if(handshake_done)
+       gnutls_bye(session,GNUTLS_SHUT_RDWR);  // FIXME - E_AGAIN
+ #endif
+-   gnutls_certificate_free_credentials(cred);
++   if(cred)
++      gnutls_certificate_free_credentials(cred);
+    gnutls_deinit(session);
+ }
+ 
diff --git a/net-ftp/lftp/lftp-3.5.2-r1.ebuild b/net-ftp/lftp/lftp-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..fcb385c1dd2b
--- /dev/null
+++ b/net-ftp/lftp/lftp-3.5.2-r1.ebuild
@@ -0,0 +1,75 @@
+# 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.5.2-r1.ebuild,v 1.1 2006/08/03 00:25:02 dragonheart Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="A sophisticated ftp/http client, file transfer program"
+HOMEPAGE="http://lftp.yar.ru/"
+
+#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 ~x86-fbsd"
+IUSE="ssl gnutls socks5 nls"
+
+RDEPEND=">=sys-libs/ncurses-5.1
+		socks5? (
+			>=net-proxy/dante-1.1.12
+			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}
+	nls? ( sys-devel/gettext )
+	dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-install_data_hook.patch
+	epatch "${FILESDIR}"/${P}-socklib.patch
+	epatch "${FILESDIR}"/${P}-noautoflags.patch
+	EPATCH_OPTS="-d ${S}/src" epatch "${FILESDIR}"/${P}-gnutls-segv.patch
+	AT_M4DIR="m4" eaclocal
+	eautoconf
+	eautomake
+}
+
+
+src_compile() {
+	local myconf="$(use_enable nls) --enable-packager-mode"
+
+	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 \
+		--with-modules \
+		${myconf} || die "econf failed"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	dodoc BUGS ChangeLog FAQ FEATURES MIRRORS \
+			NEWS README* THANKS TODO
+}
diff --git a/net-ftp/lftp/lftp-3.5.2.ebuild b/net-ftp/lftp/lftp-3.5.2.ebuild
index ad6a62341b7d..1c690eb796c6 100644
--- a/net-ftp/lftp/lftp-3.5.2.ebuild
+++ b/net-ftp/lftp/lftp-3.5.2.ebuild
@@ -1,6 +1,6 @@
 # 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.5.2.ebuild,v 1.2 2006/08/02 14:17:59 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.5.2.ebuild,v 1.3 2006/08/03 00:25:02 dragonheart Exp $
 
 inherit eutils autotools
 
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~spa
 IUSE="ssl gnutls socks5 nls"
 
 RDEPEND=">=sys-libs/ncurses-5.1
-		socks5? ( 
+		socks5? (
 			>=net-proxy/dante-1.1.12
 			virtual/pam )
 		ssl? (