diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-05-23 16:06:37 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-05-23 16:06:37 +0000 |
| commit | 2a01766d021454a74d774139ca7822ca364a9d89 (patch) | |
| tree | 747b79b0b0c5bfbb6ea1b69259c746f7fe50988d /net-ftp | |
| parent | Version bump to 3.5.1, removed old, added systemd unit support. Fixed securit... (diff) | |
| download | gentoo-2-2a01766d021454a74d774139ca7822ca364a9d89.tar.gz gentoo-2-2a01766d021454a74d774139ca7822ca364a9d89.tar.bz2 gentoo-2-2a01766d021454a74d774139ca7822ca364a9d89.zip | |
Add upstream patch.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-ftp')
| -rw-r--r-- | net-ftp/lftp/ChangeLog | 8 | ||||
| -rw-r--r-- | net-ftp/lftp/files/lftp-4.5.0-Torrent.patch | 46 | ||||
| -rw-r--r-- | net-ftp/lftp/lftp-4.5.0-r1.ebuild (renamed from net-ftp/lftp/lftp-4.5.0.ebuild) | 6 |
3 files changed, 57 insertions, 3 deletions
diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog index ce20b3ae38df..23b761c11104 100644 --- a/net-ftp/lftp/ChangeLog +++ b/net-ftp/lftp/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-ftp/lftp # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.471 2014/05/23 13:17:17 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.472 2014/05/23 16:06:37 jer Exp $ + +*lftp-4.5.0-r1 (23 May 2014) + + 23 May 2014; Jeroen Roovers <jer@gentoo.org> -lftp-4.5.0.ebuild, + +lftp-4.5.0-r1.ebuild, +files/lftp-4.5.0-Torrent.patch: + Add upstream patch. *lftp-4.5.0 (23 May 2014) diff --git a/net-ftp/lftp/files/lftp-4.5.0-Torrent.patch b/net-ftp/lftp/files/lftp-4.5.0-Torrent.patch new file mode 100644 index 000000000000..9c71cb29cf7c --- /dev/null +++ b/net-ftp/lftp/files/lftp-4.5.0-Torrent.patch @@ -0,0 +1,46 @@ +--- a/src/Torrent.cc ++++ b/src/Torrent.cc +@@ -2861,14 +2861,17 @@ int TorrentPeer::Do() + if(s==UNPACK_NO_DATA_YET) + return m; + if(s!=UNPACK_SUCCESS) { +- const char *dc=0; + if(s==UNPACK_PREMATURE_EOF) { +- if(recv_buf->Size()>0) +- LogError(2,dc=_("peer unexpectedly closed connection after %s"),recv_buf->Dump()); +- else +- LogError(4,dc=_("peer closed connection (before handshake)")); ++ if(recv_buf->Size()>0) { ++ LogError(2,_("peer unexpectedly closed connection after %s"),recv_buf->Dump()); ++ Disconnect(_("peer unexpectedly closed connection")); ++ } else { ++ LogError(4,_("peer closed connection (before handshake)")); ++ Disconnect(_("peer closed connection (before handshake)")); ++ } ++ } else { ++ Disconnect(_("invalid peer response format")); + } +- Disconnect(dc); + return MOVED; + } + if(!parent->HasMetadata() && !LTEPExtensionEnabled()) { +@@ -2976,12 +2979,13 @@ int TorrentPeer::Do() + return m; + if(st!=UNPACK_SUCCESS) + { +- const char *dc=0; +- if(st==UNPACK_PREMATURE_EOF) +- LogError(2,dc=_("peer unexpectedly closed connection after %s"),recv_buf->Dump()); +- else +- LogError(2,dc=_("invalid peer response format")); +- Disconnect(dc); ++ if(st==UNPACK_PREMATURE_EOF) { ++ LogError(2,_("peer unexpectedly closed connection after %s"),recv_buf->Dump()); ++ Disconnect(_("peer unexpectedly closed connection")); ++ } else { ++ LogError(2,_("invalid peer response format")); ++ Disconnect(_("invalid peer response format")); ++ } + return MOVED; + } + reply->DropData(recv_buf); diff --git a/net-ftp/lftp/lftp-4.5.0.ebuild b/net-ftp/lftp/lftp-4.5.0-r1.ebuild index 91691c53e284..76e8b6dbb4e9 100644 --- a/net-ftp/lftp/lftp-4.5.0.ebuild +++ b/net-ftp/lftp/lftp-4.5.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.5.0.ebuild,v 1.1 2014/05/23 13:17:17 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.5.0-r1.ebuild,v 1.1 2014/05/23 16:06:37 jer Exp $ EAPI=5 inherit autotools eutils libtool @@ -58,7 +58,9 @@ src_prepare() { epatch \ "${FILESDIR}/${PN}-4.0.2.91-lafile.patch" \ "${FILESDIR}/${PN}-4.3.5-autopoint.patch" \ - "${FILESDIR}/${PN}-4.3.8-gets.patch" + "${FILESDIR}/${PN}-4.3.8-gets.patch" \ + "${FILESDIR}/${PN}-4.5.0-Torrent.patch" + sed -i configure.ac -e 's|^AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die eautoreconf elibtoolize # for Darwin bundles |