Memory leak fixed - thanks to Luke Macken in bug #61335. OSX fix thanks to Miguel Sousa Filipe in bug #61349"

5 files changed, 180 insertions, 6 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 8ae63d7c9f09..6f9cca548fdf 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.53 2004/08/22 21:26:06 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.54 2004/08/26 21:15:09 dragonheart Exp $
+
+*lftp-3.0.7-r1 (27 Aug 2004)
+
+  27 Aug 2004; <dan@gentoo.org> +files/lftp-3.0.7-memleak.patch,
+  +lftp-3.0.7-r1.ebuild:
+  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:
   Stable on alpha.
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 9d436cb63e18..51643ba28e71 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,14 +1,17 @@
-MD5 62c0e6cceacfea18a633fdcb972e3bdc lftp-3.0.3.ebuild 1360
+MD5 dcbe619561d000504e9aabec9535d957 ChangeLog 7934
 MD5 12b9a2c28624e5232b2e8016de89ef77 lftp-2.6.10.ebuild 1356
-MD5 cb6332f049aa4315def19df02f538af0 lftp-3.0.7.ebuild 1767
-MD5 b8efc5c19381f538632f196250ef98a0 lftp-3.0.2.ebuild 1360
 MD5 08697d1f660f48d0b1d4e9737dc05c9f lftp-2.6.11.ebuild 1361
-MD5 8133d162c96fcedc2c4416378fdd0956 lftp-3.0.6.ebuild 1630
-MD5 40191cdae495ce955aba27de4e6f9263 ChangeLog 7695
 MD5 bd30469259dd912781df916084edcacd metadata.xml 430
+MD5 b8efc5c19381f538632f196250ef98a0 lftp-3.0.2.ebuild 1360
+MD5 62c0e6cceacfea18a633fdcb972e3bdc lftp-3.0.3.ebuild 1360
+MD5 8133d162c96fcedc2c4416378fdd0956 lftp-3.0.6.ebuild 1630
+MD5 cb6332f049aa4315def19df02f538af0 lftp-3.0.7.ebuild 1767
+MD5 084647c41f99b314955b38d3e284cb91 lftp-3.0.7-r1.ebuild 1944
 MD5 0000187694fd92f30e8669216ab2d7a4 files/digest-lftp-2.6.10 65
 MD5 d640fa2520c5748b7ebfba9feeae8f91 files/digest-lftp-2.6.11 65
 MD5 ba66deeb3a908e8a736d776bd858bfc2 files/digest-lftp-3.0.2 64
 MD5 295df847317ee8c852dc8b6f4f200812 files/digest-lftp-3.0.3 64
 MD5 eceb1084634c247eeee6cc05ce894f4e files/digest-lftp-3.0.6 64
 MD5 7b66f57f1380f19e455c42358b43ed54 files/digest-lftp-3.0.7 64
+MD5 de08110867637b5ad75b721453671510 files/lftp-3.0.7-memleak.patch 2161
+MD5 7b66f57f1380f19e455c42358b43ed54 files/digest-lftp-3.0.7-r1 64
diff --git a/net-ftp/lftp/files/digest-lftp-3.0.7-r1 b/net-ftp/lftp/files/digest-lftp-3.0.7-r1
new file mode 100644
index 000000000000..5449f3a1081c
--- /dev/null
+++ b/net-ftp/lftp/files/digest-lftp-3.0.7-r1
@@ -0,0 +1 @@
+MD5 7a7c0b7b81719d2993280efdcec91c49 lftp-3.0.7.tar.bz2 1219131
diff --git a/net-ftp/lftp/files/lftp-3.0.7-memleak.patch b/net-ftp/lftp/files/lftp-3.0.7-memleak.patch
new file mode 100644
index 000000000000..047bbc773447
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-3.0.7-memleak.patch
@@ -0,0 +1,84 @@
+--- src/SMTask.cc	2004-08-03 07:34:37.000000000 -0400
++++ newsrc/SMTask.cc	2004-08-23 21:20:04.000000000 -0400
+@@ -221,6 +221,11 @@
+    return count;
+ }
+ 
++void SMTask::Cleanup()
++{
++  delete init_task;
++}
++
+ #include <errno.h>
+ #include "ResMgr.h"
+ ResDecl enospc_fatal ("xfer:disk-full-fatal","no",ResMgr::BoolValidate,ResMgr::NoClosure);
+--- src/SMTask.h	2004-08-02 06:47:44.000000000 -0400
++++ newsrc/SMTask.h	2004-08-23 21:19:35.000000000 -0400
+@@ -97,6 +97,8 @@
+    static int TaskCount();
+    static bool NonFatalError(int err);
+    static bool TemporaryNetworkError(int err);
++   
++   static void Cleanup();
+ };
+ 
+ class SMTaskInit : public SMTask
+--- src/SignalHook.cc	2003-10-03 10:18:46.000000000 -0400
++++ newsrc/SignalHook.cc	2004-08-23 20:53:17.000000000 -0400
+@@ -93,3 +93,10 @@
+    Ignore(SIGXFSZ);  // and EFBIG
+ #endif
+ }
++
++void SignalHook::Cleanup()
++{
++   delete [] counts;
++   delete [] old_handlers;
++   delete [] old_saved;
++}
+--- src/SignalHook.h	1999-10-04 13:45:40.000000000 -0400
++++ newsrc/SignalHook.h	2004-08-23 20:51:27.000000000 -0400
+@@ -49,6 +49,7 @@
+    static void RestoreAll();
+ 
+    static void ClassInit();
++   static void Cleanup();
+ };
+ 
+ #endif//SIGNALHOOK_H
+--- src/log.cc	2004-03-15 04:03:55.000000000 -0500
++++ newsrc/log.cc	2004-08-24 11:18:18.062682431 -0400
+@@ -125,6 +125,10 @@
+    Write(l,buf);
+ }
+ 
++void Log::Cleanup()
++{
++   delete global;
++}
+ Log::~Log()
+ {
+    CloseOutput();
+--- src/log.h	2004-02-04 16:40:06.000000000 -0500
++++ newsrc/log.h	2004-08-23 21:03:02.000000000 -0400
+@@ -84,6 +84,8 @@
+    void ShowPID(bool yes=true) { show_pid=yes; }
+    void ShowTime(bool yes=true) { show_time=yes; }
+    void ShowContext(bool yes=true) { show_context=yes; }
++
++   static void Cleanup();
+ };
+ 
+ #endif // LOG_H
+--- src/lftp.cc	2004-04-16 10:27:36.000000000 -0400
++++ newsrc/lftp.cc	2004-08-23 21:21:24.000000000 -0400
+@@ -421,6 +421,9 @@
+    ProcWait::DeleteAll();
+    DirColors::DeleteInstance();
+    IdNameCacheCleanup();
++   SignalHook::Cleanup();
++   Log::Cleanup();
++   SMTask::Cleanup();
+ 
+    // the tasks left: SMTaskInit, LsCache::ExpireHelper, Log::global.
+    int task_count=SMTask::TaskCount();
diff --git a/net-ftp/lftp/lftp-3.0.7-r1.ebuild b/net-ftp/lftp/lftp-3.0.7-r1.ebuild
new file mode 100644
index 000000000000..09f4087a6f81
--- /dev/null
+++ b/net-ftp/lftp/lftp-3.0.7-r1.ebuild
@@ -0,0 +1,79 @@
+# 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.7-r1.ebuild,v 1.1 2004/08/26 21:15:09 dragonheart Exp $
+
+IUSE="ssl socks5 nls"
+
+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="http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/${P}.tar.bz2"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~ppc sparc ~alpha ~hppa ~mips ~ia64 ~ppc64"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	socks5? ( >=net-misc/dante-1.1.12 )
+	nls? ( sys-devel/gettext )
+	alpha? ( dev-lang/perl )
+	alpha? ( >=sys-apps/sed-4 )
+	virtual/libc
+	sys-libs/readline
+	socks5? ( sys-libs/pam )
+	sys-apps/gawk
+	sys-devel/bison
+	sys-devel/libtool"
+
+RDEPEND="nls? ( sys-devel/gettext )
+	>=sys-libs/ncurses-5.1
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	virtual/libc
+	sys-libs/readline
+	socks5? ( sys-libs/pam )
+	socks5? ( >=net-misc/dante-1.1.12 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/lftp-3.0.7-memleak.patch
+}
+
+src_compile() {
+	local myconf
+
+	use nls && myconf="--enable-nls" \
+		|| myconf="--disable-nls"
+
+	use ssl && myconf="${myconf} --with-ssl=/usr" \
+		|| myconf="${myconf} --without-ssl"
+
+	use socks5 && myconf="${myconf} --with-socksdante=/usr" \
+		|| myconf="${myconf} --without-socksdante"
+
+	if [ "${ARCH}" = "macosx" ];
+	then
+		myconf="${myconf} --use-included-readline"
+	fi
+
+	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
+}