Version bump.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 15 insertions, 57 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/Manifest b/net-ftp/lftp/Manifest
index 969139ebf9eb..98e7c5f234b3 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -4,19 +4,18 @@ Hash: SHA256
 AUX lftp-4.0.2.91-lafile.patch 976 SHA256 b54aac35c297657290a2d9571c38bdc4bf51548f826b4ec958a768c398c0cd0b SHA512 5da906b19e2f2eeb46292e4b406656e851072fcba431c3fc771baf3825f09e577550cab079991625cb96b1547a6ba15938b6c67c4e89ee9e11fb9ccd21509bf2 WHIRLPOOL 9348707606cc0772d76666167425196b79cb3c9509cb037c61f28bdd8f023593f78b16e0c970b8520f58aa9c0c193cb15314b715f4840f2afd3044e43729c828
 AUX lftp-4.3.5-autopoint.patch 330 SHA256 5aa4d9b739ffcc9a500988a7c80ca6a192d4ef440bea27278d87a27da50bf909 SHA512 7d7f0628bfe817fb9fb10d36f85f729f2e0b8ae3a6b6c9e719469a109b08b65a465c6d313cbe8a8115e9bc036e07347b6f5df0aa3067f905690b221d4bdf3318 WHIRLPOOL 91a8be4feed34ffd3f9d6ea2eb44968420d8cb57c494520b0ce8fb3f40cce85d136e8b2124eac7fcadbb8c9e1187b9fa6c9256f360079ac41eeb693cc5298c3a
 AUX lftp-4.3.8-gets.patch 430 SHA256 20f3f931132aae70c6dc8b03368419951bb4ec9f0d4cfcaf5966db3c6689da35 SHA512 24e61ec6784fdf95b5df75ed29680465e9fac87f9b79eaf4a9156a32c66afd4db5b905c7e29789a8a0e0d7c6b4c782b1f749e52d4c9547c96c1b79834c2a750a WHIRLPOOL 399f1a0714ada86a47a567d49a1d093b4900847fb38994e9adbc95c82d879e061d057945d66a0f26a6015c3737f586e6b83da8d1d5b30f7f103fc4d2e2ee523e
-AUX lftp-4.5.0-Torrent.patch 1637 SHA256 8b5b4f55e29a8cc0fa7e7031fa2a27b5f2903917bf4f898c2c0d3213f5271a74 SHA512 813fa4fae7b347b2195b511f9327a3c642065e3f618699670d10cc235d0222ba488b95e5d53c8beeba7d77edbafe6d0a462697ed0519cc85b6b21d80fd2b6030 WHIRLPOOL 3c47c047a64325fc9b45b6d2511cb92486a60b17779d777e6ae1cffd0cf23d120b33fda616e0a1fb77ca13162432a36069509975319fdc62586c456cd61a5957
 DIST lftp-4.4.15.tar.xz 1460568 SHA256 75f40b7ab438a7b295410eb3e1ec8460e36ad2d48785383a6fc9201905db6868 SHA512 1d828a7b2ff808a0ee78f51c265d58df677e67cec9b4744cbd3a34816aba324199202094fa4144665e8d64385df7e76a54c6dc415e9ff33e97adab2eb0edaf4e WHIRLPOOL 3bf4d220b5581d87fb34d72f6129c2d660f80e3142560543c238dfaafd8cde5834f57884247c75e583ab6a9d4c12766b28c90e2b49889e44759d663591bbc7e0
 DIST lftp-4.4.16.tar.xz 1461536 SHA256 0b0ee4e3f6ea793842058a470dad5a6511d377b5f43f3370e552b10335a662c8 SHA512 f6e5336ea32aa87666d740fe594eecd6710757d32d11e0160b30b0d56ba9c742d04939dc17df0598266d8622ebaf44cac96c2ec7b01428405150a41e2234aef6 WHIRLPOOL e2fd54e56f2399e8428208e5d693b5969fa50150299f54a881fafbbdc539cd3afaab5326b68e515851198e4a1452a224094a5fd6c1c79e7cdc3efcc63ef40485
-DIST lftp-4.5.0.tar.xz 1471280 SHA256 479471a5dbd8b782435a9557758c1fa09ae7a6dfe7b3e1661390d634356954c4 SHA512 870de07eab845c00f5261d5b022eecb7eab9dbb902814ffec91fe84325d3d2c6ce0e9ca1ad93030b99e3814afe4bb51b014eae4cf13edcb5251cab1909c7aec8 WHIRLPOOL 0e2123b4c6196ef6343b17f6863907d8b1d7f15d4581eacd4adb8700ed0124d08d328f4096d6429e2704e4c0999b72f51751109c7c73a96600210e35e3d12e25
+DIST lftp-4.5.1.tar.xz 1472104 SHA256 dd40ef64e9e07a20e60eef5d0dcedcc0453d90c27a029765b77886998a631adb SHA512 a81c1f1d2b20f56766e8129a2b3b8ae1a6ed271746d3ddb6c1c3784afa2fa618c89fc013f7b65728340761965926f45f96afa493534593b2c5c1700b9f4a7ad1 WHIRLPOOL dbac801c74fdfab5a585b0560da281848ec6fd568a0633c998b2ffab21cf9be79291e75e52880a68d0981c98c61b85f81dac21e95707372901b757a7218fa204
 EBUILD lftp-4.4.15.ebuild 2180 SHA256 86fd77a33d87445b33a18ffc617871080a4f40d6d32c39ed156327c26bb533d6 SHA512 716d5474e57dfe426d3afe98f7894ecc2900587ef2545d7fd065831130be13302444e86b42a25e7e160aa738b741ecf1dd4c4a5279138a5a4bc734b659aec059 WHIRLPOOL 6367be65c99a2825c6aa3113ce26d25535eac6ba07d1220c79660d721bc957ff08c6466334e76b5269259f6bc490d8189a014d3d7f4af68852ef0c6539dbb8da
 EBUILD lftp-4.4.16.ebuild 2188 SHA256 40173e96751d53778e10e801b4f1f2f9cc7345530cc2a752aee3d186990adf1e SHA512 b76330792817d2cfa7c41a2b88610b2a90755d613d7167c2bf1d260b67b835562c0bf1d0b1e7353d4b89176d7af1d6acdeb40ba1f66632cd87f35fd0441b8fb2 WHIRLPOOL b5619b95198cc6f3f1c144a6b980fdb78d67a704bc9a98b282920725c79f388ce043d202f911a6ff810601d4010422b5637ed2a7218d83f238591541119a8568
-EBUILD lftp-4.5.0-r1.ebuild 2235 SHA256 45744859a28c4d8ea2c48db37a324182acbd33fd8967ec8840122254b24aa76e SHA512 6dbba3f3e03d77581289db595770ccf8000ccf37a8435847b4606f8cda9f7dc736ed1d7443ea418eee6984c44d4d893f68302573353863ffcefce7dbafe0a53e WHIRLPOOL d27f7ef6f6e84390b1051b8d704f68298c72fefaea16958cf53413f43ce083951628d2f0ecb3542d84ce669aba01ecc03d8c2600832553ee7d35a6bac1389559
-MISC ChangeLog 59185 SHA256 7060445ab13680f7707b7b1c15f72ecb96cf6f8100f78842d62a5642fea477dc SHA512 947255ebf7620e7d159609dcc0fde26e03b3d7ba341a4609ae43df7497589ebab0aae23549d4614b1c23bb1a98efaaec47f1300d0c0e16c5ed03ce3d2194e612 WHIRLPOOL 7e72059e586516d2b189135f047ccc1a40fb70a609cd3f7cad3dbe85cc5743a7de3b2bf7f415de98eaf1e8b6e7aa1ee44cdad234285e1313cb63d138d3aa62bb
+EBUILD lftp-4.5.1.ebuild 2188 SHA256 34a61509f3240eba8f88063ce25e6758402c419732dff3dcc904af7ada5e7c59 SHA512 ac9eaa7ee6f1df4753da7a748edfa21c44d75766435d1fdb8b2704378163bc672fead5a99dc59d31e95e7bbcf2909627fb99e3e7fc8f90f524fe9a7e8b7fcf6d WHIRLPOOL 0cc9ea97ac3fb887900711c15abbb7a97f693d79d62df70632475e8a635013c1433d9587b590240459a25ad90e2224653ba8ddc3c87cb45e7c3116b1d9332c93
+MISC ChangeLog 59354 SHA256 bdc5ea6af25f899dcb8b75b96f9c614d3fa6cc1ec4bcc119c5492c303ff016ab SHA512 d1c684e8bea994e5d502262f003905f194d6d068ce5b77022d018d52f87bd3c910d60ad4d90c81e93dd68a3bb37865dfcd74a6fbe92572deb506a5c2a24f51d1 WHIRLPOOL 1f0184477644533e1423400aea39d7de2c7ad7855c4a79ad466f7eebcfd4913151582f3d740fb55ebf9e0e27675643e707fe9934de1a531cc675dbc6ab464bff
 MISC metadata.xml 531 SHA256 ce1a5e5ed227a35582fbc8cae768a0f6b7769ac49194197926882f47600b519f SHA512 6058e3d0fbf8032fc97c48d9742afea487ac89bbe88281e4a4fd392018a42c7ff5bab39b7f01b16c70bd24735cf3b6b9ea613f957f71075f095cf3b109516cd5 WHIRLPOOL cc07076f948d4cbd81a4bd799c8e5f4a06f5665a732034456778d51c7bdd8486c04cd55bfdbdf85f013379f231b535508e46572b191a7bd30d04f6692b0647c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlN/cg8ACgkQVWmRsqeSphPnnwCfQlKkYmhqiR/1ejVemBfm4wzg
-xrgAni6S0amEiOlKj6kWNS0grmwDbPA5
-=OrQO
+iEYEAREIAAYFAlOMfhYACgkQVWmRsqeSphPGXACfYgONtbf6OSbBmNWDw8s7Ae5z
+0Y0An0eekVWpJApABFxENojcs3z6YR9y
+=t8Z4
 -----END PGP SIGNATURE-----
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