Version bump.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 9 insertions, 50 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 23b761c11104..635735fab874 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.472 2014/05/23 16:06:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.473 2014/06/02 13:37:25 jer Exp $
+
+*lftp-4.5.1 (02 Jun 2014)
+
+  02 Jun 2014; Jeroen Roovers <jer@gentoo.org> -lftp-4.5.0-r1.ebuild,
+  +lftp-4.5.1.ebuild, -files/lftp-4.5.0-Torrent.patch:
+  Version bump.
 
 *lftp-4.5.0-r1 (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
deleted file mode 100644
index 9c71cb29cf7c..000000000000
--- a/net-ftp/lftp/files/lftp-4.5.0-Torrent.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- 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-r1.ebuild b/net-ftp/lftp/lftp-4.5.1.ebuild
index 76e8b6dbb4e9..83ff7c9a994e 100644
--- a/net-ftp/lftp/lftp-4.5.0-r1.ebuild
+++ b/net-ftp/lftp/lftp-4.5.1.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-r1.ebuild,v 1.1 2014/05/23 16:06:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.5.1.ebuild,v 1.1 2014/06/02 13:37:25 jer Exp $
 
 EAPI=5
 inherit autotools eutils libtool
@@ -58,8 +58,7 @@ 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.5.0-Torrent.patch"
+		"${FILESDIR}/${PN}-4.3.8-gets.patch"
 
 	sed -i configure.ac -e 's|^AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
 	eautoreconf