Add patch from upstream for avoiding random crashes, thanks to Josu López Fernández for reporting in bug #131007.

Package-Manager: portage-2.1_pre9-r3

5 files changed, 106 insertions, 8 deletions

diff --git a/net-libs/libtorrent/ChangeLog b/net-libs/libtorrent/ChangeLog
index c1ef28c72dc0..47299fe1b704 100644
--- a/net-libs/libtorrent/ChangeLog
+++ b/net-libs/libtorrent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libtorrent
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.52 2006/04/23 09:28:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.53 2006/04/23 20:38:09 flameeyes Exp $
+
+*libtorrent-0.9.0-r1 (23 Apr 2006)
+
+  23 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libtorrent-0.9.0-crash.patch, +libtorrent-0.9.0-r1.ebuild:
+  Add patch from upstream for avoiding random crashes, thanks to Josu López
+  Fernández for reporting in bug #131007.
 
   23 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   libtorrent-0.9.0.ebuild:
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index 07fe51c018a4..1ba1a75f40aa 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libtorrent-0.9.0-crash.patch 1299 RMD160 6be63e5b60f167bca2836bbdc83a67da31570eaa SHA1 fde8bef1df468d9b6a960dee4b30eec3849aa73d SHA256 92bf38450bed6f96b65d7f657d3ebb7e4edf775ccfa7ca6798769f450619628c size 1299
+MD5 4ae083d6c45890313c896d5caf069121 files/libtorrent-0.9.0-crash.patch 1299
+RMD160 6be63e5b60f167bca2836bbdc83a67da31570eaa files/libtorrent-0.9.0-crash.patch 1299
+SHA256 92bf38450bed6f96b65d7f657d3ebb7e4edf775ccfa7ca6798769f450619628c files/libtorrent-0.9.0-crash.patch 1299
 DIST libtorrent-0.8.3.tar.gz 445167 size 445167
 DIST libtorrent-0.9.0.tar.gz 461999 RMD160 3ad37136459bd965d73003bc7f1aa35c30c3d11e SHA256 2181e7550f3837735252c51db005101eabceab6a247d1cd13f451511f4d18ef7 size 461999
 EBUILD libtorrent-0.8.3.ebuild 975 RMD160 a0e9127b3f21c13e298fd570cc8d314535bbad20 SHA1 96f74bfca43ac92861588b5cb2d7bed28f21e74a SHA256 98878600130a5ba9463998f5028836c5fccdec1dd43f546ff9d55d4e4d9abd25 size 975
 MD5 4c1a7e9a6bc02a45762d4515c2ad39c4 libtorrent-0.8.3.ebuild 975
 RMD160 a0e9127b3f21c13e298fd570cc8d314535bbad20 libtorrent-0.8.3.ebuild 975
 SHA256 98878600130a5ba9463998f5028836c5fccdec1dd43f546ff9d55d4e4d9abd25 libtorrent-0.8.3.ebuild 975
+EBUILD libtorrent-0.9.0-r1.ebuild 1077 RMD160 434091187e404a8a78db262bbb845d7cc545e5fc SHA1 1f760caabd5095d7c5cbe640808b9c012578953a SHA256 ce453fd8a62a366e46bd8e9317001c68fea42ff9b69e41759a4a44c10b542c84 size 1077
+MD5 db07dee90aaee0920633975aabfb8aa7 libtorrent-0.9.0-r1.ebuild 1077
+RMD160 434091187e404a8a78db262bbb845d7cc545e5fc libtorrent-0.9.0-r1.ebuild 1077
+SHA256 ce453fd8a62a366e46bd8e9317001c68fea42ff9b69e41759a4a44c10b542c84 libtorrent-0.9.0-r1.ebuild 1077
 EBUILD libtorrent-0.9.0.ebuild 992 RMD160 515128635dd3d20fac6f6c1b5b4310c71f52b9ef SHA1 f9c9aa04519bf733c173660f3d79849be5cec388 SHA256 abc66e331a69e1916a64ec27930fecddf2ead2cd41eef3e3b1d847505448b7d2 size 992
 MD5 13898914dc4cf98d660cb94fd127283d libtorrent-0.9.0.ebuild 992
 RMD160 515128635dd3d20fac6f6c1b5b4310c71f52b9ef libtorrent-0.9.0.ebuild 992
 SHA256 abc66e331a69e1916a64ec27930fecddf2ead2cd41eef3e3b1d847505448b7d2 libtorrent-0.9.0.ebuild 992
-MISC ChangeLog 8484 RMD160 e231eb9a6893ddd4d93186f122909b243a37d149 SHA1 46860b3c6cb5e876eb0ea8d73fcfa7519edc9c3d SHA256 35d86406ade2e358edfebf2a5a4fc80bc7165182686f9836c784b7dfe01258b3 size 8484
-MD5 46bab2184b3105fff6e838d85c6d36aa ChangeLog 8484
-RMD160 e231eb9a6893ddd4d93186f122909b243a37d149 ChangeLog 8484
-SHA256 35d86406ade2e358edfebf2a5a4fc80bc7165182686f9836c784b7dfe01258b3 ChangeLog 8484
+MISC ChangeLog 8762 RMD160 8d57e132793984b018cd23f4fa89caca9f2c0763 SHA1 089b7126ab7a24f9dffb1d04b29dae39bc77305b SHA256 971097df72e1dbf1add669b736e96a2304ab86eec4c794545ae576c46b39912a size 8762
+MD5 38cd797fbf732d3e89019e3c5eb2f390 ChangeLog 8762
+RMD160 8d57e132793984b018cd23f4fa89caca9f2c0763 ChangeLog 8762
+SHA256 971097df72e1dbf1add669b736e96a2304ab86eec4c794545ae576c46b39912a ChangeLog 8762
 MISC metadata.xml 224 RMD160 aedcea58a9a1d4c2217c92783ef458ebbcbba257 SHA1 9e3fb6cdc28fb6aa6e7429a7b2798b23f3fcb49e SHA256 03531f52debc5e006e7461e5e268c6509dd43582e0980dbe7645ea13c8d94355 size 224
 MD5 b59f615ff4e1c464f88d1667a66f6b5d metadata.xml 224
 RMD160 aedcea58a9a1d4c2217c92783ef458ebbcbba257 metadata.xml 224
@@ -27,10 +35,14 @@ MD5 b66d51e2683163dff4b493eef3b83490 files/digest-libtorrent-0.9.0 250
 RMD160 b1e24573f2b92c5f38e2431f4aa4a344588305b5 files/digest-libtorrent-0.9.0 250
 SHA256 f4ba0551c166d8b3890fda05f345fafff87766c4edc42daf81ecd5a91fc7a20c files/digest-libtorrent-0.9.0 250
 size 250 files/digest-libtorrent-0.9.0 250
+MD5 b66d51e2683163dff4b493eef3b83490 files/digest-libtorrent-0.9.0-r1 250
+RMD160 b1e24573f2b92c5f38e2431f4aa4a344588305b5 files/digest-libtorrent-0.9.0-r1 250
+SHA256 f4ba0551c166d8b3890fda05f345fafff87766c4edc42daf81ecd5a91fc7a20c files/digest-libtorrent-0.9.0-r1 250
+size 250 files/digest-libtorrent-0.9.0-r1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFES0gSAiZjviIA2XgRAtg8AJ0cqoZDNI3QLOyB/1LS/Ox9ePI9/gCgqv8T
-aaYYSJygiE0aG+wGxRkwGBU=
-=e1sM
+iD8DBQFES+W/AiZjviIA2XgRAmDtAJ0dqCXR+IkiJqZIpSeCmbud0DhXGgCfXwdY
+yGD1KkDIBk/d1cu85uZPdfw=
+=NkjX
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libtorrent/files/digest-libtorrent-0.9.0-r1 b/net-libs/libtorrent/files/digest-libtorrent-0.9.0-r1
new file mode 100644
index 000000000000..f92f3fde7550
--- /dev/null
+++ b/net-libs/libtorrent/files/digest-libtorrent-0.9.0-r1
@@ -0,0 +1,3 @@
+MD5 cabdb9aa38d06dccac3ce0dbc2910d71 libtorrent-0.9.0.tar.gz 461999
+RMD160 3ad37136459bd965d73003bc7f1aa35c30c3d11e libtorrent-0.9.0.tar.gz 461999
+SHA256 2181e7550f3837735252c51db005101eabceab6a247d1cd13f451511f4d18ef7 libtorrent-0.9.0.tar.gz 461999
diff --git a/net-libs/libtorrent/files/libtorrent-0.9.0-crash.patch b/net-libs/libtorrent/files/libtorrent-0.9.0-crash.patch
new file mode 100644
index 000000000000..903d70d06564
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-0.9.0-crash.patch
@@ -0,0 +1,32 @@
+Index: libtorrent-0.9.0/src/protocol/peer_connection_seed.cc
+===================================================================
+--- libtorrent-0.9.0/src/protocol/peer_connection_seed.cc	(revision 666)
++++ libtorrent-0.9.0/src/protocol/peer_connection_seed.cc	(working copy)
+@@ -159,6 +159,11 @@
+     return true;
+ 
+   case ProtocolBase::BITFIELD:
++    // Bad peer, sending their bitfield after other messages have been
++    // sent.
++    if (m_peerChunks.using_counter() || !m_peerChunks.bitfield()->is_all_unset())
++      throw close_connection();
++
+     if (read_bitfield_from_buffer(length - 1)) {
+       finish_bitfield();
+       return true;
+Index: libtorrent-0.9.0/src/protocol/peer_connection_leech.cc
+===================================================================
+--- libtorrent-0.9.0/src/protocol/peer_connection_leech.cc	(revision 666)
++++ libtorrent-0.9.0/src/protocol/peer_connection_leech.cc	(working copy)
+@@ -200,6 +200,11 @@
+     return true;
+ 
+   case ProtocolBase::BITFIELD:
++    // Bad peer, sending their bitfield after other messages have been
++    // sent.
++    if (m_peerChunks.using_counter() || !m_peerChunks.bitfield()->is_all_unset())
++      throw close_connection();
++
+     if (read_bitfield_from_buffer(length - 1)) {
+       finish_bitfield();
+       return true;
diff --git a/net-libs/libtorrent/libtorrent-0.9.0-r1.ebuild b/net-libs/libtorrent/libtorrent-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..4207d7b380d7
--- /dev/null
+++ b/net-libs/libtorrent/libtorrent-0.9.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/libtorrent-0.9.0-r1.ebuild,v 1.1 2006/04/23 20:38:09 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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="debug"
+
+RDEPEND=">=dev-libs/libsigc++-2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.11"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-crash.patch"
+}
+
+src_compile() {
+	[[ $(tc-arch) = "x86" ]] && filter-flags -fomit-frame-pointer
+	replace-flags -Os -O2
+
+	elibtoolize
+	econf \
+		$(use_enable debug) \
+		--disable-dependency-tracking \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}