Add patches from upstream to fix #203570, #203729

Package-Manager: portage-2.1.4

6 files changed, 175 insertions, 16 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 7df9e3522e53..06a97f24aacc 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/lftp
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.145 2007/12/07 16:59:41 dertobi123 Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.146 2008/01/21 20:18:50 armin76 Exp $
+
+*lftp-3.6.1-r1 (21 Jan 2008)
+
+  21 Jan 2008; Raúl Porcel <armin76@gentoo.org>
+  +files/3.6.1-segfault.patch, +files/3.6.1-specialchars.patch,
+  +lftp-3.6.1-r1.ebuild:
+  Add patches from upstream to fix #203570, #203729
 
   07 Dec 2007; Tobias Scherbaum <dertobi123@gentoo.org> lftp-3.5.14.ebuild:
   ppc stable, bug #198843
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index a0b0a6e31f57..a2f409d110b0 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,6 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 3.6.1-segfault.patch 373 RMD160 a6c00619dc2a957c8dcff2dcb7fe5945b24f66b4 SHA1 38a2102aa6e9d3bb7fe20c0ab61ba7fbb2e32e96 SHA256 cbf8bfba580efce323f2172bd3fe8c988b9123e6f1b2ffd0e3b38501cae2be45
+MD5 1a1795cd5ad04885ea3ba60e90ba9922 files/3.6.1-segfault.patch 373
+RMD160 a6c00619dc2a957c8dcff2dcb7fe5945b24f66b4 files/3.6.1-segfault.patch 373
+SHA256 cbf8bfba580efce323f2172bd3fe8c988b9123e6f1b2ffd0e3b38501cae2be45 files/3.6.1-segfault.patch 373
+AUX 3.6.1-specialchars.patch 2545 RMD160 e66fc3ff5b1b36b4244d39c233a536ff96a695be SHA1 658600b060047c67d73e6acaaf376cfcb7818a12 SHA256 423ca730060329e3934aa183f776d71bd87fb73f60e9d3826efb1f213aeb2ea6
+MD5 29ccbf97f8615c106f7687e0f7833761 files/3.6.1-specialchars.patch 2545
+RMD160 e66fc3ff5b1b36b4244d39c233a536ff96a695be files/3.6.1-specialchars.patch 2545
+SHA256 423ca730060329e3934aa183f776d71bd87fb73f60e9d3826efb1f213aeb2ea6 files/3.6.1-specialchars.patch 2545
 AUX lftp-3.5.10-time-mdtm.patch 12072 RMD160 e40d458309602d09a7ae797c38a9d7c3c1f944cc SHA1 779618483e4583414679e19921b4ca8ae5bb0f70 SHA256 be18b8cb918e0f7ce6656abf92caee013f80dbf6855e084b5bb99888fb640602
 MD5 62e34f35776b76863d11687eeaa74c5f files/lftp-3.5.10-time-mdtm.patch 12072
 RMD160 e40d458309602d09a7ae797c38a9d7c3c1f944cc files/lftp-3.5.10-time-mdtm.patch 12072
@@ -16,14 +21,18 @@ EBUILD lftp-3.5.14.ebuild 1494 RMD160 af3a624401352e03ee28126cf8c4a444db3b6ec0 S
 MD5 42a4084c4c93f8c794d693908ff2614f lftp-3.5.14.ebuild 1494
 RMD160 af3a624401352e03ee28126cf8c4a444db3b6ec0 lftp-3.5.14.ebuild 1494
 SHA256 06091cd031ac5e8af2e5e8b65e2f8c7542d083ba8d5292bf037a77d404f2d605 lftp-3.5.14.ebuild 1494
+EBUILD lftp-3.6.1-r1.ebuild 1656 RMD160 84891d9572aafa56820d113f6c5605a778800dca SHA1 33314316af689b608de0149dd5255b4d0e34787f SHA256 6ce6d84841bf94300d1150724ba8ce6fa585053b3ca9b98772e4ebc7e618f444
+MD5 c7a902213fcb5750be38c3da3e8d6b13 lftp-3.6.1-r1.ebuild 1656
+RMD160 84891d9572aafa56820d113f6c5605a778800dca lftp-3.6.1-r1.ebuild 1656
+SHA256 6ce6d84841bf94300d1150724ba8ce6fa585053b3ca9b98772e4ebc7e618f444 lftp-3.6.1-r1.ebuild 1656
 EBUILD lftp-3.6.1.ebuild 1508 RMD160 e7e73be6cd1f21ffef75f6a7515ee1e9f2532ef5 SHA1 df71476eb4577a7a94f45b8040d43a0c84a519a9 SHA256 bd6d015c64c76e91766ded18a8569e110f2d115fae3a0b7b59c6dd8da7a16c83
 MD5 8e5db7a49254fb9a4afd29d7c7efb048 lftp-3.6.1.ebuild 1508
 RMD160 e7e73be6cd1f21ffef75f6a7515ee1e9f2532ef5 lftp-3.6.1.ebuild 1508
 SHA256 bd6d015c64c76e91766ded18a8569e110f2d115fae3a0b7b59c6dd8da7a16c83 lftp-3.6.1.ebuild 1508
-MISC ChangeLog 22275 RMD160 73e9bc443bde89d58117e2c2d69440c47105fcaa SHA1 ebff1e580d0a0bd40e8c18fce82c282ef5df8bcd SHA256 eedf8a344b6ea291807e825bf4e40a7cc3ddf7bb73cbe04c7effaf0a000729c4
-MD5 f6cdbd450fb6fbd99756658504539c55 ChangeLog 22275
-RMD160 73e9bc443bde89d58117e2c2d69440c47105fcaa ChangeLog 22275
-SHA256 eedf8a344b6ea291807e825bf4e40a7cc3ddf7bb73cbe04c7effaf0a000729c4 ChangeLog 22275
+MISC ChangeLog 22493 RMD160 c0cf8db708b73f8760ae239c76e910bc3462c3ea SHA1 4d6576c8cb15836a68ede688651ff1d0260159a3 SHA256 bdf021699a047377103e155ea5e2f6d2c1010dff080731c57d548266f9ef211f
+MD5 c50d395a8c03989d8276689dcf6407d5 ChangeLog 22493
+RMD160 c0cf8db708b73f8760ae239c76e910bc3462c3ea ChangeLog 22493
+SHA256 bdf021699a047377103e155ea5e2f6d2c1010dff080731c57d548266f9ef211f ChangeLog 22493
 MISC metadata.xml 430 RMD160 e522bf2928ed5c97a1e41a3443c6c26ba64847cd SHA1 0c992ae070f385380005c35321070c3c5d318eb9 SHA256 bd840a8fc0f6882e2fc2fc80aa4b3ba5a7a1b22a296d998c368ed5628baf3b82
 MD5 bd30469259dd912781df916084edcacd metadata.xml 430
 RMD160 e522bf2928ed5c97a1e41a3443c6c26ba64847cd metadata.xml 430
@@ -37,10 +46,6 @@ SHA256 0051e64a987004a2e743bbe7dffd37f38ee34a15e17fd08ae65ca1d6a7b2f770 files/di
 MD5 689cc60400553517dddfd2f7d0980122 files/digest-lftp-3.6.1 238
 RMD160 5dfb4c1d43c0c88639308642b600435d8a391ce7 files/digest-lftp-3.6.1 238
 SHA256 e2fba7191e5f5dc110cfe38a2137a7d642d0ef980e64c91feac3507da635b0dd files/digest-lftp-3.6.1 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
-
-iEUEARECAAYFAkeJz/UACgkQj9hvisErhMJ+WwCYt28lxUT9cGG6GXuYwUEia36Y
-dwCeI7FSSb/regBkyKKaDGhNUf0EMGk=
-=RP5D
------END PGP SIGNATURE-----
+MD5 689cc60400553517dddfd2f7d0980122 files/digest-lftp-3.6.1-r1 238
+RMD160 5dfb4c1d43c0c88639308642b600435d8a391ce7 files/digest-lftp-3.6.1-r1 238
+SHA256 e2fba7191e5f5dc110cfe38a2137a7d642d0ef980e64c91feac3507da635b0dd files/digest-lftp-3.6.1-r1 238
diff --git a/net-ftp/lftp/files/3.6.1-segfault.patch b/net-ftp/lftp/files/3.6.1-segfault.patch
new file mode 100644
index 000000000000..52755e351ba0
--- /dev/null
+++ b/net-ftp/lftp/files/3.6.1-segfault.patch
@@ -0,0 +1,11 @@
+--- src/buffer.cc	10 Sep 2007 11:45:27 -0000	1.66
++++ src/buffer.cc	3 Jan 2008 09:07:43 -0000
+@@ -155,7 +155,7 @@ void Buffer::vFormat(const char *f, va_l
+    {
+       va_list tmp;
+       VA_COPY(tmp,v);
+-      int res=vsnprintf(GetSpace(size), size, f, v);
++      int res=vsnprintf(GetSpace(size), size, f, tmp);
+       va_end(tmp);
+       if(res>=0 && res<size)
+       {
diff --git a/net-ftp/lftp/files/3.6.1-specialchars.patch b/net-ftp/lftp/files/3.6.1-specialchars.patch
new file mode 100644
index 000000000000..5057d2dedbf6
--- /dev/null
+++ b/net-ftp/lftp/files/3.6.1-specialchars.patch
@@ -0,0 +1,67 @@
+--- src/GetJob.cc	23 Apr 2007 07:11:45 -0000	1.28
++++ src/GetJob.cc	28 Dec 2007 11:12:35 -0000
+@@ -99,33 +99,44 @@ bool GetJob::IsRemoteNonURL(const Parsed
+    // store & put || !store & get
+    return (!url.proto && (mode==FA::STORE ^ !reverse));
+ }
++bool GetJob::IsLocalNonURL(const ParsedURL &url,FA::open_mode mode)
++{
++   // store & get || !store & put
++   return (!url.proto && (mode==FA::STORE ^ reverse));
++}
+ bool GetJob::IsLocal(const ParsedURL &url)
+ {
+    return !url.proto || !strcasecmp(url.proto,"file");
+ }
++// create copy peer from a cloned session
+ FileCopyPeer *GetJob::CreateCopyPeer(FileAccess *session,const char *path,FA::open_mode mode)
+ {
+    ParsedURL url(path,true);
+    if(IsRemoteNonURL(url,mode))
+       return new FileCopyPeerFA(session,path,mode);
+    Delete(session);	// delete cloned session.
+-   return CreateCopyPeer(url,mode);
++   return CreateCopyPeer(url,path,mode);
+ }
++// create copy peer using a session reference
+ FileCopyPeer *GetJob::CreateCopyPeer(const FileAccessRef& session,const char *path,FA::open_mode mode)
+ {
+    ParsedURL url(path,true);
+    if(IsRemoteNonURL(url,mode))
+       return new FileCopyPeerFA(session,path,mode);
+-   return CreateCopyPeer(url,mode);
++   return CreateCopyPeer(url,path,mode);
+ }
+-FileCopyPeer *GetJob::CreateCopyPeer(const ParsedURL &url,FA::open_mode mode)
++FileCopyPeer *GetJob::CreateCopyPeer(const ParsedURL &url,const char *path,FA::open_mode mode)
+ {
++   if(IsLocalNonURL(url,mode))
++      return CreateCopyPeer(path,mode);
+    if(IsLocal(url))
+-      return (mode==FA::STORE)
+-	 ? DstLocal(url.path)
+-	 : SrcLocal(url.path);
++      return CreateCopyPeer(url.path,mode);
+    return new FileCopyPeerFA(&url,mode);
+ }
++FileCopyPeer *GetJob::CreateCopyPeer(const char *path,FA::open_mode mode)
++{
++   return mode==FA::STORE ? DstLocal(path) : SrcLocal(path);
++}
+ 
+ void GetJob::NextFile()
+ {
+--- src/GetJob.h	23 Apr 2007 07:11:46 -0000	1.15
++++ src/GetJob.h	28 Dec 2007 11:10:07 -0000
+@@ -29,8 +29,10 @@ class GetJob : public CopyJobEnv
+ {
+    FileCopyPeer *SrcLocal(const char *src);
+    FileCopyPeer *DstLocal(const char *dst);
+-   FileCopyPeer *CreateCopyPeer(const ParsedURL &url,FA::open_mode mode);
++   FileCopyPeer *CreateCopyPeer(const ParsedURL &url,const char *path,FA::open_mode mode);
++   FileCopyPeer *CreateCopyPeer(const char *path,FA::open_mode mode);
+    bool IsRemoteNonURL(const ParsedURL &url,FA::open_mode mode);
++   bool IsLocalNonURL(const ParsedURL &url,FA::open_mode mode);
+    static bool IsLocal(const ParsedURL &url);
+ 
+ protected:
diff --git a/net-ftp/lftp/files/digest-lftp-3.6.1-r1 b/net-ftp/lftp/files/digest-lftp-3.6.1-r1
new file mode 100644
index 000000000000..11423e6140f5
--- /dev/null
+++ b/net-ftp/lftp/files/digest-lftp-3.6.1-r1
@@ -0,0 +1,3 @@
+MD5 29e9e44474aa381029d6ae0fb79b2f2b lftp-3.6.1.tar.bz2 1332560
+RMD160 9b92c1cf1af6b14295641e2703fe44b39f9a4aa3 lftp-3.6.1.tar.bz2 1332560
+SHA256 8e65e1602c08b44c955eda228876046f3f74519200db0cb54d1102a02a50b032 lftp-3.6.1.tar.bz2 1332560
diff --git a/net-ftp/lftp/lftp-3.6.1-r1.ebuild b/net-ftp/lftp/lftp-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..ab82d3c3255f
--- /dev/null
+++ b/net-ftp/lftp/lftp-3.6.1-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.6.1-r1.ebuild,v 1.1 2008/01/21 20:18:50 armin76 Exp $
+
+inherit eutils
+
+DESCRIPTION="A sophisticated ftp/sftp/http/https client and file transfer program"
+HOMEPAGE="http://lftp.yar.ru/"
+SRC_URI="http://ftp.yars.free.net/pub/source/lftp/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~sparc-fbsd ~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
+		>=sys-libs/readline-5.1"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PV}-segfault.patch
+	epatch "${FILESDIR}"/${PV}-specialchars.patch
+}
+
+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"
+
+	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
+}