Add fix for upstream bug 1272: rtorrent: priority_queue_insert(...) received a bad timer.

Package-Manager: portage-2.1.5.3

4 files changed, 31 insertions, 4 deletions

diff --git a/net-libs/libtorrent/ChangeLog b/net-libs/libtorrent/ChangeLog
index 1abd9711bffd..4ea6b11ab999 100644
--- a/net-libs/libtorrent/ChangeLog
+++ b/net-libs/libtorrent/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/libtorrent
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.114 2008/05/27 16:57:40 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.115 2008/06/04 11:52:36 loki_val Exp $
+
+*libtorrent-0.12.2-r1 (04 Jun 2008)
+
+  04 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/libtorrent-0.12.2-tracker_timer_fix.patch,
+  -libtorrent-0.12.2.ebuild, +libtorrent-0.12.2-r1.ebuild:
+  Add fix for upstream bug 1272: rtorrent: priority_queue_insert(...)
+  received a bad timer.
 
 *libtorrent-0.12.2 (27 May 2008)
 
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index 991246ca71ef..5acece102b00 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -1,9 +1,10 @@
 AUX libtorrent-0.11.9+gcc-4.3.patch 3283 RMD160 bb48b1a0de3101fdc74989efd997a33f57765430 SHA1 44baef27e8d2ff1c76402d351305b8c95de9c432 SHA256 9468cf97b56bbaf125bfb7de2b70b8b8b87ba9d5eb1acab272a5208669007d54
+AUX libtorrent-0.12.2-tracker_timer_fix.patch 952 RMD160 ccf4df0575210f95e758ecee92bc9455c6b470d1 SHA1 5f197cf78a80f31c8770d3dcf7fa5eda215bb0a8 SHA256 ac8669a130de34c5ea4a43eef7da439125ca1ff8ccf3c0ac4a77d8717b839d97
 DIST libtorrent-0.11.9.tar.gz 545210 RMD160 fb8de66d65791dab67c195356a98de7cf653d3c9 SHA1 d88e754d1c2ff7f8c5fb7544331264bd505870b8 SHA256 71f09218a7784b21ab53cdfcd8fa122da60352e5ca117fda7cd8d2763f908a08
 DIST libtorrent-0.12.0.tar.gz 583000 RMD160 22787944b19355d0d08c3bf7c0976463e8556959 SHA1 7ad7f9bd8883df112bbfb812e19bc1fad96ffaa0 SHA256 3287c9be61f9ec8ddab99f9b679bbf58610d024bce980307f88151a552ecd1e3
 DIST libtorrent-0.12.2.tar.gz 585374 RMD160 88cdc415f98afd8b87fa6d7330906737c3e434fa SHA1 a53d2c671e9f2dd971d0622d5b3672da91c46ef9 SHA256 cf9d2cd667fd6939a3e0bd27e48d0c7f35d9ab2f7affbb3214da03fd2c1360a8
 EBUILD libtorrent-0.11.9.ebuild 1092 RMD160 da7b3481dc661adc564d9fe18b1af41bf9020ec0 SHA1 9d45afa155e37477e94dc9b8ff9d97e9f16a8260 SHA256 66270b7da8e7989c851b569e58f4a342d7080db6470be02998cb4c435120aabe
 EBUILD libtorrent-0.12.0.ebuild 1220 RMD160 b73750e28a433932f1748db15b11426da1b67057 SHA1 6bbd2b886a1d17c42857b25754cad99fd554822f SHA256 9892a81076b359b900e8e19ee4f9723cc7a1d5324a5e2c80ef648fe0c25b54b6
-EBUILD libtorrent-0.12.2.ebuild 1163 RMD160 2feb9f72c9934974d0a8f6ff963c818d71b7e323 SHA1 a19d300a8c77db2f5105e85e1bd80f092d325fbb SHA256 6a0ed9c8a76e8d75691705cf3bc7eb18a26399bc04107ef2c847341680010668
-MISC ChangeLog 16799 RMD160 80b96f09dacd45c64dc354b5841c68e162f45cc2 SHA1 6b5dff701a0a267983fd6d06ad95dc49850d1f66 SHA256 0445ac5d37ca290fc37876107ff211f622e06250170174cf279a85a26cf24ee3
+EBUILD libtorrent-0.12.2-r1.ebuild 1221 RMD160 87fa6a00d7691f5a8aaaadc90e63cbc986c55b51 SHA1 5de5f603d438376c012828c2a6d2e64c1c6374dd SHA256 08a56da0dd1db1c0d5bea7e0ab39a867435203e5211379e03d63a4338a719897
+MISC ChangeLog 17099 RMD160 52104900d01dbf55889c65b895640028e165a0de SHA1 09a0ff69795bd93645cdfe1ca59186d7c957364f SHA256 c0d6142ba38eb19463cd649e8487993514dc6538c60e86b98efb7a9999350177
 MISC metadata.xml 270 RMD160 9a699cc703b75fb74e7ace60db4a79cde05963cc SHA1 bf0d12318b4d7546d73a60285f72ad565fa06e84 SHA256 77331009c22893efde4e7135bb175b4d81249af695461da6be9097bfeba816d0
diff --git a/net-libs/libtorrent/files/libtorrent-0.12.2-tracker_timer_fix.patch b/net-libs/libtorrent/files/libtorrent-0.12.2-tracker_timer_fix.patch
new file mode 100644
index 000000000000..28a7c925c5b2
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-0.12.2-tracker_timer_fix.patch
@@ -0,0 +1,17 @@
+Index: libtorrent/src/tracker/tracker_manager.cc
+===================================================================
+--- libtorrent/src/tracker/tracker_manager.cc	(revision 1060)
++++ libtorrent/src/tracker/tracker_manager.cc	(working copy)
+@@ -114,8 +114,11 @@
+   if (m_control->state() == DownloadInfo::STOPPED)
+     throw internal_error("TrackerManager::send_later() m_control->set() == DownloadInfo::STOPPED.");
+ 
++  rak::timer t(std::max(cachedTime + rak::timer::from_seconds(2),
++                        rak::timer::from_seconds(m_control->time_last_connection() + m_control->focus_min_interval())));
++
+   priority_queue_erase(&taskScheduler, &m_taskTimeout);
+-  priority_queue_insert(&taskScheduler, &m_taskTimeout, rak::timer::from_seconds(m_control->time_last_connection() + m_control->focus_min_interval()));
++  priority_queue_insert(&taskScheduler, &m_taskTimeout, t);
+ }
+ 
+ // When request_{current,next} is called, m_isRequesting is set to
diff --git a/net-libs/libtorrent/libtorrent-0.12.2.ebuild b/net-libs/libtorrent/libtorrent-0.12.2-r1.ebuild
index e16595a53232..b4c58237b70f 100644
--- a/net-libs/libtorrent/libtorrent-0.12.2.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.12.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/libtorrent-0.12.2.ebuild,v 1.1 2008/05/27 16:57:40 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/libtorrent-0.12.2-r1.ebuild,v 1.1 2008/06/04 11:52:36 loki_val Exp $
 
 inherit eutils toolchain-funcs flag-o-matic libtool
 
@@ -22,6 +22,7 @@ src_unpack() {
 	cd "${S}"
 	elibtoolize
 	epatch "${FILESDIR}"/${PN}-0.11.9+gcc-4.3.patch
+	epatch "${FILESDIR}"/${P}-tracker_timer_fix.patch
 }
 
 src_compile() {