Patch added to prevent segfault. Bug #74815

5 files changed, 29 insertions, 14 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index c0bebddc98af..0159332ebb7d 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.68 2004/12/07 09:37:00 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.69 2004/12/18 22:04:41 dragonheart Exp $
+
+*lftp-3.0.12-r1 (19 Dec 2004)
+
+  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
 
 *lftp-3.0.12 (07 Dec 2004)
 
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 98a345ebfccf..364f69900898 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6fafa0045fa9715a4d0ca32399add27a ChangeLog 9819
 MD5 12b9a2c28624e5232b2e8016de89ef77 lftp-2.6.10.ebuild 1356
 MD5 879149bb8c1d64eade21068a95064604 lftp-3.0.10.ebuild 1805
 MD5 bd30469259dd912781df916084edcacd metadata.xml 430
-MD5 8efbfe5afacfea767fc33a0a900760bd lftp-3.0.12.ebuild 1810
+MD5 1eb46210a274393cf91452ec1bc91c9c lftp-3.0.12-r1.ebuild 1907
 MD5 21c731f3e67e1e9392417b30747519da lftp-3.0.9.ebuild 1801
 MD5 e10db0d02d25e0c016ae9c0f4172d3ac lftp-3.0.6.ebuild 1630
 MD5 0000187694fd92f30e8669216ab2d7a4 files/digest-lftp-2.6.10 65
 MD5 1e1717d8ddb6c25d6363be122b91645d files/digest-lftp-3.0.10 65
-MD5 47641d36387cc209419ceea76c35e6e6 files/digest-lftp-3.0.12 65
+MD5 d1af8a5cd6bafa180270376cbe244639 files/lftp-3.0.12.patch 290
 MD5 1bd10abe800fc5aac7bd57f88e2696c8 files/digest-lftp-3.0.9 64
 MD5 eceb1084634c247eeee6cc05ce894f4e files/digest-lftp-3.0.6 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBtXnDmdTrptrqvGERAq1yAKCMdLiTHenaZyHTUd9qBFNwQxFy9wCeMipP
-I6hYxLMDuahx+q6CdOp9KzY=
-=KsY/
------END PGP SIGNATURE-----
+MD5 47641d36387cc209419ceea76c35e6e6 files/digest-lftp-3.0.12-r1 65
diff --git a/net-ftp/lftp/files/digest-lftp-3.0.12 b/net-ftp/lftp/files/digest-lftp-3.0.12-r1
index 6d64ca14f7a1..6d64ca14f7a1 100644
--- a/net-ftp/lftp/files/digest-lftp-3.0.12
+++ b/net-ftp/lftp/files/digest-lftp-3.0.12-r1
diff --git a/net-ftp/lftp/files/lftp-3.0.12.patch b/net-ftp/lftp/files/lftp-3.0.12.patch
new file mode 100644
index 000000000000..06e1fad7eafe
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-3.0.12.patch
@@ -0,0 +1,11 @@
+--- ftpclass.cc 1 Dec 2004 12:17:44 -0000       1.343
++++ ftpclass.cc 6 Dec 2004 11:53:17 -0000
+@@ -1091,7 +1091,8 @@ bool Ftp::GetBetterConnection(int level,
+
+ void  Ftp::HandleTimeout()
+ {
+-   conn->quit_sent=true;
++   if(conn)
++      conn->quit_sent=true;
+    super::HandleTimeout();
+ }
diff --git a/net-ftp/lftp/lftp-3.0.12.ebuild b/net-ftp/lftp/lftp-3.0.12-r1.ebuild
index be6c953e8e05..2d9779410fb0 100644
--- a/net-ftp/lftp/lftp-3.0.12.ebuild
+++ b/net-ftp/lftp/lftp-3.0.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.0.12.ebuild,v 1.1 2004/12/07 09:37:00 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.0.12-r1.ebuild,v 1.1 2004/12/18 22:04:41 dragonheart Exp $
 
 inherit eutils
 
@@ -37,6 +37,12 @@ RDEPEND="nls? ( sys-devel/gettext )
 	socks5? ( sys-libs/pam )
 	socks5? ( >=net-misc/dante-1.1.12 )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src
+	epatch ${FILESDIR}/${P}.patch || die 'patch failed'
+}
+
 src_compile() {
 	local myconf="`use_enable nls`"