Add a fix from Jari Petter Sundell which prevents stalled connections

when a "libtorrent" based BitTorrent client is uploading to another
BitTorrent client which uses pipelined Request messages (e.g. BitComet).

5 files changed, 52 insertions, 5 deletions

diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile
index df135e998e1..24eeb40e6e9 100644
--- a/net/libtorrent/Makefile
+++ b/net/libtorrent/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2006/02/25 17:24:21 tron Exp $
+# $NetBSD: Makefile,v 1.11 2006/03/03 15:30:52 tron Exp $
 
 DISTNAME=	libtorrent-0.8.5
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://libtorrent.rakshasa.no/downloads/
 
diff --git a/net/libtorrent/buildlink3.mk b/net/libtorrent/buildlink3.mk
index 3af010ede6e..36e7b3fb9ed 100644
--- a/net/libtorrent/buildlink3.mk
+++ b/net/libtorrent/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/03/03 15:30:53 tron Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBTORRENT_BUILDLINK3_MK:=	${LIBTORRENT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtorrent}
 BUILDLINK_PACKAGES+=	libtorrent
 
 .if !empty(LIBTORRENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtorrent+=	libtorrent>=0.8.0
-BUILDLINK_RECOMMENDED.libtorrent?=	libtorrent>=0.8.3nb1
+BUILDLINK_DEPENDS.libtorrent+=		libtorrent>=0.8.0
+BUILDLINK_RECOMMENDED.libtorrent+=	libtorrent>=0.8.5nb1
 BUILDLINK_PKGSRCDIR.libtorrent?=	../../net/libtorrent
 .endif	# LIBTORRENT_BUILDLINK3_MK
 
diff --git a/net/libtorrent/distinfo b/net/libtorrent/distinfo
index cf580531f05..c2b2dbf8ba0 100644
--- a/net/libtorrent/distinfo
+++ b/net/libtorrent/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.7 2006/02/25 17:24:21 tron Exp $
+$NetBSD: distinfo,v 1.8 2006/03/03 15:30:53 tron Exp $
 
 SHA1 (libtorrent-0.8.5.tar.gz) = 2c58bb7cbded9024468d660e5ee204d51c999dec
 RMD160 (libtorrent-0.8.5.tar.gz) = 0a45e6442ea0d4d1e6204e0fbc090f7906be6348
 Size (libtorrent-0.8.5.tar.gz) = 448000 bytes
+SHA1 (patch-aa) = c4357114764205be1c1b12f2563522cdb658abcf
+SHA1 (patch-ab) = 9d4e39cf8f0244efb07ab2569fd9d45f69828d77
diff --git a/net/libtorrent/patches/patch-aa b/net/libtorrent/patches/patch-aa
new file mode 100644
index 00000000000..9ef25b1575f
--- /dev/null
+++ b/net/libtorrent/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.3 2006/03/03 15:30:53 tron Exp $
+
+--- src/protocol/peer_connection_leech.cc.orig	2006-02-09 16:05:05.000000000 +0000
++++ src/protocol/peer_connection_leech.cc	2006-03-03 15:11:38.000000000 +0000
+@@ -204,7 +204,7 @@
+     }
+ 
+   case ProtocolBase::REQUEST:
+-    if (buf->remaining() < 13)
++    if (buf->remaining() < 12)
+       break;
+ 
+     if (!m_up->choked()) {
+@@ -260,7 +260,7 @@
+     }
+ 
+   case ProtocolBase::CANCEL:
+-    if (buf->remaining() < 13)
++    if (buf->remaining() < 12)
+       break;
+ 
+     read_cancel_piece(m_down->read_request());
diff --git a/net/libtorrent/patches/patch-ab b/net/libtorrent/patches/patch-ab
new file mode 100644
index 00000000000..a5158a1f2c0
--- /dev/null
+++ b/net/libtorrent/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.4 2006/03/03 15:30:53 tron Exp $
+
+--- src/protocol/peer_connection_seed.cc.orig	2006-02-09 16:05:05.000000000 +0000
++++ src/protocol/peer_connection_seed.cc	2006-03-03 15:11:38.000000000 +0000
+@@ -168,7 +168,7 @@
+     }
+ 
+   case ProtocolBase::REQUEST:
+-    if (buf->remaining() < 13)
++    if (buf->remaining() < 12)
+       break;
+ 
+     if (!m_up->choked()) {
+@@ -185,7 +185,7 @@
+     throw network_error("Received a piece but the connection is strictly for seeding.");
+ 
+   case ProtocolBase::CANCEL:
+-    if (buf->remaining() < 13)
++    if (buf->remaining() < 12)
+       break;
+ 
+     read_cancel_piece(m_down->read_request());