Adding bugfix patches recommended by upstream.

Package-Manager: portage-2.1.5.3

10 files changed, 148 insertions, 62 deletions

diff --git a/net-libs/libtorrent/ChangeLog b/net-libs/libtorrent/ChangeLog
index 4ea6b11ab999..98a8a439b03d 100644
--- a/net-libs/libtorrent/ChangeLog
+++ b/net-libs/libtorrent/ChangeLog
@@ -1,6 +1,18 @@
 # 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.115 2008/06/04 11:52:36 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.116 2008/06/05 06:41:55 loki_val Exp $
+
+*libtorrent-0.12.2-r2 (05 Jun 2008)
+
+  05 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/libtorrent-0.12.2-dht_bounds_fix.patch,
+  +files/libtorrent-0.12.2-fix_cull.patch,
+  +files/libtorrent-0.12.2-fix_dht_target.patch,
+  +files/libtorrent-0.12.2-fix_start_stop_filter.patch,
+  +files/libtorrent-0.12.2-lt-ver.patch, metadata.xml,
+  -libtorrent-0.12.0.ebuild, -libtorrent-0.12.2-r1.ebuild,
+  +libtorrent-0.12.2-r2.ebuild:
+  Adding bugfix patches recommended by upstream.
 
 *libtorrent-0.12.2-r1 (04 Jun 2008)
 
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index 5acece102b00..07d6da3ab467 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -1,10 +1,13 @@
 AUX libtorrent-0.11.9+gcc-4.3.patch 3283 RMD160 bb48b1a0de3101fdc74989efd997a33f57765430 SHA1 44baef27e8d2ff1c76402d351305b8c95de9c432 SHA256 9468cf97b56bbaf125bfb7de2b70b8b8b87ba9d5eb1acab272a5208669007d54
+AUX libtorrent-0.12.2-dht_bounds_fix.patch 870 RMD160 05e7d690a0f808ad293f0304f5eb31936b7c5850 SHA1 89b34f3d74140ceab993573c5eb1d6ceab366a21 SHA256 e8754b864b4108e779b8cfc4f49aac0a63fa0dc6702f3e7b0348477319f1ed54
+AUX libtorrent-0.12.2-fix_cull.patch 568 RMD160 1f8b970a885df47f512721216dab6245a733e8d1 SHA1 4af00bdcece5bd4a905b8bf6cde016c5add6ffce SHA256 78cb8cdde1c5b98b4c9f2c96f8e192bd9e963f221c51583b57e61b5bde529e32
+AUX libtorrent-0.12.2-fix_dht_target.patch 1646 RMD160 7a15d31c1acba41dda0c39f938a2127f02cb8da4 SHA1 47304fca6bd005f396157c3e1cc9e60df92af45e SHA256 21727f361ead79315e971e2729f84eb71d94eec98c0f852842f6e78ce4011dea
+AUX libtorrent-0.12.2-fix_start_stop_filter.patch 701 RMD160 6b109e050cc1e66d2d9874bce0fdf599188978c9 SHA1 3289506a9c76d080edbeb3ef1a42694a64da6c4d SHA256 d422c5d9a82a0d799f3b949e4b0d2fd293d98baab1fb293642544895ece75926
+AUX libtorrent-0.12.2-lt-ver.patch 578 RMD160 03fc5d5326bd457c6386db791ceda7e187e8bae2 SHA1 2586464297a9ccc0004d99ef99647715e5cd54ff SHA256 14aedb58c898692be6963a582b55d599f93a74733539238a1f2d0f7c14542586
 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-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
+EBUILD libtorrent-0.12.2-r2.ebuild 1436 RMD160 8f738acbaa5a4418181e70cac930c60cd6a60dc9 SHA1 91736fb5b20f0105e345d815d64d05c09296c676 SHA256 e116b5553f65cf61a1ac83914236a04ba24c3753f4b8be139cbaea546f9dea89
+MISC ChangeLog 17582 RMD160 49ad0b67f234333a093a46c03e938d669bccc48c SHA1 1d09c8da2edf3f2ee5960a6d26c86be281713d18 SHA256 d2a1d68a264825574a8b0db36d1b4f426649116f9aa1743752d3ef8a2d0b4ceb
+MISC metadata.xml 436 RMD160 4546e998ce9c6303f4c91d7413b1f732bbb2a8aa SHA1 fb1f2cddef7e268bf64572615fbc3c326ed673fd SHA256 936fb95c2c44078d98c0c74d0b148744036d6a18d40b8b482d7656ef0e211bff
diff --git a/net-libs/libtorrent/files/libtorrent-0.12.2-dht_bounds_fix.patch b/net-libs/libtorrent/files/libtorrent-0.12.2-dht_bounds_fix.patch
new file mode 100644
index 000000000000..f1f8cf91552a
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-0.12.2-dht_bounds_fix.patch
@@ -0,0 +1,21 @@
+Index: libtorrent/src/dht/dht_router.cc
+===================================================================
+--- libtorrent/src/dht/dht_router.cc	(revision 1060)
++++ libtorrent/src/dht/dht_router.cc	(working copy)
+@@ -200,14 +200,14 @@
+ 
+ DhtRouter::DhtBucketList::iterator
+ DhtRouter::find_bucket(const HashString& id) {
+-  DhtBucketList::iterator itr = m_routingTable.upper_bound(id);
++  DhtBucketList::iterator itr = m_routingTable.lower_bound(id);
+ 
+ #ifdef USE_EXTRA_DEBUG
+   if (itr == m_routingTable.end())
+     throw internal_error("DHT Buckets not covering entire ID space.");
+ 
+   if (!itr->second->is_in_range(id))
+-    throw internal_error("DhtRouter::find_bucket, m_routingTable.upper_bound did not find correct bucket.");
++    throw internal_error("DhtRouter::find_bucket, m_routingTable.lower_bound did not find correct bucket.");
+ #endif
+ 
+   return itr;
diff --git a/net-libs/libtorrent/files/libtorrent-0.12.2-fix_cull.patch b/net-libs/libtorrent/files/libtorrent-0.12.2-fix_cull.patch
new file mode 100644
index 000000000000..7a6c8499b5ab
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-0.12.2-fix_cull.patch
@@ -0,0 +1,13 @@
+Index: libtorrent/src/download/download_wrapper.cc
+===================================================================
+--- libtorrent/src/download/download_wrapper.cc	(revision 1060)
++++ libtorrent/src/download/download_wrapper.cc	(working copy)
+@@ -263,7 +263,7 @@
+   // their memory usage.
+   if (ticks % 120 == 0)
+ //   if (ticks % 1 == 0)
+-    m_main.peer_list()->cull_peers(PeerList::cull_old || PeerList::cull_keep_interesting);
++    m_main.peer_list()->cull_peers(PeerList::cull_old | PeerList::cull_keep_interesting);
+ 
+   if (!info()->is_open())
+     return;
diff --git a/net-libs/libtorrent/files/libtorrent-0.12.2-fix_dht_target.patch b/net-libs/libtorrent/files/libtorrent-0.12.2-fix_dht_target.patch
new file mode 100644
index 000000000000..88a281bf3eab
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-0.12.2-fix_dht_target.patch
@@ -0,0 +1,44 @@
+Index: libtorrent/src/dht/dht_transaction.cc
+===================================================================
+--- libtorrent/src/dht/dht_transaction.cc	(revision 1060)
++++ libtorrent/src/dht/dht_transaction.cc	(working copy)
+@@ -46,7 +46,7 @@
+ namespace torrent {
+ 
+ DhtSearch::DhtSearch(const HashString& target, const DhtBucket& contacts)
+-  : base_type(dht_compare_closer(target)),
++  : base_type(dht_compare_closer(m_target = target)),
+     m_pending(0),
+     m_contacted(0),
+     m_replied(0),
+Index: libtorrent/src/dht/dht_transaction.h
+===================================================================
+--- libtorrent/src/dht/dht_transaction.h	(revision 1060)
++++ libtorrent/src/dht/dht_transaction.h	(working copy)
+@@ -77,7 +77,7 @@
+   const HashString&               target() const   { return m_target; }
+ 
+   private:
+-  HashString m_target;
++  const HashString&    m_target;
+ };
+ 
+ // DhtSearch contains a list of nodes sorted by closeness to the given target,
+@@ -126,7 +126,7 @@
+   bool                 start()                           { m_started = true; return m_pending; }
+   bool                 complete() const                  { return m_started && !m_pending; }
+ 
+-  const HashString&    target() const                    { return key_comp().target(); }
++  const HashString&    target() const                    { return m_target; }
+ 
+   virtual bool         is_announce() const               { return false; }
+ 
+@@ -158,6 +158,8 @@
+   DhtSearch(const DhtSearch& s);
+ 
+   bool                 node_uncontacted(const DhtNode* node) const;
++
++  HashString           m_target;
+ };
+ 
+ class DhtAnnounce : public DhtSearch {
diff --git a/net-libs/libtorrent/files/libtorrent-0.12.2-fix_start_stop_filter.patch b/net-libs/libtorrent/files/libtorrent-0.12.2-fix_start_stop_filter.patch
new file mode 100644
index 000000000000..2f9267821104
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-0.12.2-fix_start_stop_filter.patch
@@ -0,0 +1,19 @@
+Index: rtorrent/src/main.cc
+===================================================================
+--- rtorrent/src/main.cc	(revision 1060)
++++ rtorrent/src/main.cc	(working copy)
+@@ -187,12 +187,12 @@
+        "view_filter = active,false=\n"
+ 
+        "view_add = started\n"
+-       "view_filter = started,false=\n"
++       "view_filter = started,d.get_state=\n"
+        "view.event_added = started,scheduler.simple.added=\n"
+        "view.event_removed = started,scheduler.simple.removed=\n"
+ 
+        "view_add = stopped\n"
+-       "view_filter = stopped,false=\n"
++       "view_filter = stopped,not=$d.get_state=\n"
+ 
+        "view_add = complete\n"
+        "view_filter = complete,d.get_complete=\n"
diff --git a/net-libs/libtorrent/files/libtorrent-0.12.2-lt-ver.patch b/net-libs/libtorrent/files/libtorrent-0.12.2-lt-ver.patch
new file mode 100644
index 000000000000..6408095965dd
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-0.12.2-lt-ver.patch
@@ -0,0 +1,15 @@
+Index: libtorrent/configure.ac
+===================================================================
+--- libtorrent/configure.ac	(revision 1060)
++++ libtorrent/configure.ac	(working copy)
+@@ -5,8 +5,8 @@
+ AC_DEFINE(PEER_VERSION, "lt\x0C\x20", 4 byte client and version identifier for DHT)
+ 
+ LIBTORRENT_CURRENT=11
+-LIBTORRENT_REVISION=0
+-LIBTORRENT_AGE=2
++LIBTORRENT_REVISION=2
++LIBTORRENT_AGE=0
+ 
+ LIBTORRENT_INTERFACE_VERSION_INFO=$LIBTORRENT_CURRENT:$LIBTORRENT_REVISION:$LIBTORRENT_AGE
+ LIBTORRENT_INTERFACE_VERSION_NO=$LIBTORRENT_CURRENT.$LIBTORRENT_AGE.$LIBTORRENT_REVISION
diff --git a/net-libs/libtorrent/libtorrent-0.12.0.ebuild b/net-libs/libtorrent/libtorrent-0.12.0.ebuild
deleted file mode 100644
index 0bdcea74eae2..000000000000
--- a/net-libs/libtorrent/libtorrent-0.12.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.0.ebuild,v 1.2 2008/04/21 14:33:39 flameeyes Exp $
-
-inherit eutils toolchain-funcs flag-o-matic libtool
-
-DESCRIPTION="LibTorrent is a BitTorrent library written in C++ for *nix."
-HOMEPAGE="http://libtorrent.rakshasa.no/"
-SRC_URI="http://libtorrent.rakshasa.no/downloads/${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="debug ipv6"
-
-RDEPEND=">=dev-libs/libsigc++-2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.11"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Patch taken from Debian.
-	epatch "${FILESDIR}/${PN}-0.11.9+gcc-4.3.patch"
-}
-
-src_compile() {
-	replace-flags -Os -O2
-
-	if [[ $(tc-arch) = "x86" ]]; then
-		filter-flags -fomit-frame-pointer -fforce-addr
-	fi
-
-	elibtoolize
-	econf \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		--enable-static \
-		--enable-shared \
-		--disable-dependency-tracking \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/net-libs/libtorrent/libtorrent-0.12.2-r1.ebuild b/net-libs/libtorrent/libtorrent-0.12.2-r2.ebuild
index b4c58237b70f..f6193d03f5d2 100644
--- a/net-libs/libtorrent/libtorrent-0.12.2-r1.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.12.2-r2.ebuild
@@ -1,8 +1,8 @@
 # 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-r1.ebuild,v 1.1 2008/06/04 11:52:36 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/libtorrent-0.12.2-r2.ebuild,v 1.1 2008/06/05 06:41:55 loki_val Exp $
 
-inherit eutils toolchain-funcs flag-o-matic libtool
+inherit autotools eutils toolchain-funcs flag-o-matic libtool
 
 DESCRIPTION="LibTorrent is a BitTorrent library written in C++ for *nix."
 HOMEPAGE="http://libtorrent.rakshasa.no/"
@@ -20,9 +20,14 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	elibtoolize
 	epatch "${FILESDIR}"/${PN}-0.11.9+gcc-4.3.patch
+	epatch "${FILESDIR}"/${P}-dht_bounds_fix.patch
+	epatch "${FILESDIR}"/${P}-fix_cull.patch
+	epatch "${FILESDIR}"/${P}-fix_dht_target.patch
+	epatch "${FILESDIR}"/${P}-lt-ver.patch
 	epatch "${FILESDIR}"/${P}-tracker_timer_fix.patch
+	elibtoolize #Don't remove
+	eautoreconf
 }
 
 src_compile() {
diff --git a/net-libs/libtorrent/metadata.xml b/net-libs/libtorrent/metadata.xml
index a5a65c96ed84..53838cd37dcb 100644
--- a/net-libs/libtorrent/metadata.xml
+++ b/net-libs/libtorrent/metadata.xml
@@ -3,7 +3,12 @@
 <pkgmetadata>
 <herd>net-p2p</herd>
 <maintainer>
- <email>drizzt@gentoo.org</email>
- <description>Secondary Maintainer</description>
+	<email>loki_val@gentoo.org</email>
+	<name>Peter Alfredsen</name>
+	<description>I've changed too much to avoid adding myself</description>
+</maintainer>
+<maintainer>
+	<email>drizzt@gentoo.org</email>
+	<description>Secondary Maintainer</description>
 </maintainer>
 </pkgmetadata>