Update "libtorrent" package to version 0.11.1 and "rtorrent" package to

version 0.7.1. Major changes since 0.10.4/0.6.4:
- support for the CANCEL piece request message
- support for tunneling through HTTP 1.0 proxies
- Azureus-style encryption

6 files changed, 43 insertions, 42 deletions

diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile
index 267e29a9578..afa4ce4f898 100644
--- a/net/libtorrent/Makefile
+++ b/net/libtorrent/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2006/11/08 09:19:40 tron Exp $
+# $NetBSD: Makefile,v 1.19 2007/01/26 18:48:52 tron Exp $
 
-DISTNAME=	libtorrent-0.10.4
+DISTNAME=	libtorrent-0.11.1
 CATEGORIES=	net
 MASTER_SITES=	http://libtorrent.rakshasa.no/downloads/
 
diff --git a/net/libtorrent/PLIST b/net/libtorrent/PLIST
index f3081755d3a..c55fd9a2310 100644
--- a/net/libtorrent/PLIST
+++ b/net/libtorrent/PLIST
@@ -1,24 +1,31 @@
-@comment $NetBSD: PLIST,v 1.5 2006/09/27 20:36:45 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/01/26 18:48:52 tron Exp $
 include/torrent/bitfield.h
-include/torrent/block.h
-include/torrent/block_list.h
-include/torrent/block_transfer.h
 include/torrent/chunk_manager.h
 include/torrent/common.h
 include/torrent/connection_manager.h
+include/torrent/data/block.h
+include/torrent/data/block_list.h
+include/torrent/data/block_transfer.h
+include/torrent/data/file.h
+include/torrent/data/file_list.h
+include/torrent/data/file_list_iterator.h
+include/torrent/data/file_utils.h
+include/torrent/data/piece.h
+include/torrent/data/transfer_list.h
 include/torrent/download.h
+include/torrent/error.h
 include/torrent/event.h
 include/torrent/exceptions.h
-include/torrent/file.h
-include/torrent/file_list.h
+include/torrent/hash_string.h
 include/torrent/http.h
 include/torrent/object.h
 include/torrent/object_stream.h
 include/torrent/path.h
-include/torrent/peer.h
-include/torrent/piece.h
-include/torrent/peer_info.h
-include/torrent/peer_list.h
+include/torrent/peer/client_info.h
+include/torrent/peer/client_list.h
+include/torrent/peer/peer.h
+include/torrent/peer/peer_info.h
+include/torrent/peer/peer_list.h
 include/torrent/poll.h
 include/torrent/poll_epoll.h
 include/torrent/poll_kqueue.h
@@ -28,7 +35,8 @@ include/torrent/resume.h
 include/torrent/torrent.h
 include/torrent/tracker.h
 include/torrent/tracker_list.h
-include/torrent/transfer_list.h
 lib/libtorrent.la
 lib/pkgconfig/libtorrent.pc
+@dirrm include/torrent/peer
+@dirrm include/torrent/data
 @dirrm include/torrent
diff --git a/net/libtorrent/distinfo b/net/libtorrent/distinfo
index 9dbd71915b7..7858a7063c9 100644
--- a/net/libtorrent/distinfo
+++ b/net/libtorrent/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2007/01/04 12:45:41 tron Exp $
+$NetBSD: distinfo,v 1.15 2007/01/26 18:48:52 tron Exp $
 
-SHA1 (libtorrent-0.10.4.tar.gz) = f809a013469be9a933c1032f8e4ebe08d4150e5a
-RMD160 (libtorrent-0.10.4.tar.gz) = 43fdfe827e6f56c7caed2406f5c0c6df28dcf007
-Size (libtorrent-0.10.4.tar.gz) = 485174 bytes
+SHA1 (libtorrent-0.11.1.tar.gz) = 870f63f9a7eda597dbdb4be791ad0d29ea4902e2
+RMD160 (libtorrent-0.11.1.tar.gz) = f28327d0ebb2a608e3fa3f6f3414db150cc2d000
+Size (libtorrent-0.11.1.tar.gz) = 477557 bytes
 SHA1 (patch-aa) = b1b0246f757e382e3c9110a3462d9f3bd69f1fc8
-SHA1 (patch-ab) = 46a29703e33c1920b43708ba2e6b51a4a3a48412
+SHA1 (patch-ab) = 2faa87c46c9cdded0892b110bc704dbc833c231e
 SHA1 (patch-ac) = c7ee6cbac8959e611f11d0855e9bdd711423382e
 SHA1 (patch-ad) = 6bc04779e06ec55a9cd7540955ccf27546e2d87a
diff --git a/net/libtorrent/patches/patch-ab b/net/libtorrent/patches/patch-ab
index d67f0a12e87..483bb2b3dbc 100644
--- a/net/libtorrent/patches/patch-ab
+++ b/net/libtorrent/patches/patch-ab
@@ -1,28 +1,19 @@
-$NetBSD: patch-ab,v 1.6 2007/01/04 12:45:41 tron Exp $
+$NetBSD: patch-ab,v 1.7 2007/01/26 18:48:52 tron Exp $
 
---- configure.orig	2006-10-27 15:52:04.000000000 +0200
-+++ configure
-@@ -22826,6 +22826,9 @@ echo $ECHO_N "checking signedness of min
+--- configure.orig	2006-12-24 12:54:00.000000000 +0000
++++ configure	2007-01-26 15:15:13.000000000 +0000
+@@ -15823,6 +15823,10 @@
    cat >conftest.$ac_ext <<_ACEOF
  #include <sys/types.h>
        #include <sys/mman.h>
 +#if defined(__sun) && defined(__SVR4)
 +      #include <unistd.h>
 +#endif
++
        void f() { mincore((char*)0, 0, (unsigned char*)0); }
  
  _ACEOF
-@@ -22873,6 +22876,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
-       cat >conftest.$ac_ext <<_ACEOF
- #include <sys/types.h>
-           #include <sys/mman.h>
-+#if defined(__sun) && defined(__SVR4)
-+          #include <unistd.h>
-+#endif
-           void f() { mincore((char*)0, 0, (char*)0); }
- 
- _ACEOF
-@@ -22956,6 +22962,9 @@ echo $ECHO_N "checking signedness of min
+@@ -15953,6 +15957,9 @@
    cat >conftest.$ac_ext <<_ACEOF
  #include <sys/types.h>
        #include <sys/mman.h>
@@ -32,17 +23,20 @@ $NetBSD: patch-ab,v 1.6 2007/01/04 12:45:41 tron Exp $
        void f() { mincore((char*)0, 0, (unsigned char*)0); }
  
  _ACEOF
-@@ -23003,6 +23012,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -16000,6 +16007,12 @@
        cat >conftest.$ac_ext <<_ACEOF
  #include <sys/types.h>
            #include <sys/mman.h>
 +#if defined(__sun) && defined(__SVR4)
 +          #include <unistd.h>
 +#endif
++#if defined(__sun) && defined(__SVR4)
++          #include <unistd.h>
++#endif
            void f() { mincore((char*)0, 0, (char*)0); }
  
  _ACEOF
-@@ -23704,6 +23716,10 @@ do
+@@ -16701,6 +16714,10 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<\_ACEOF
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index fbf0df16d2b..3ec07ca1076 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2006/11/19 11:50:25 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/01/26 18:48:53 tron Exp $
 
-DISTNAME=	rtorrent-0.6.4
-PKGREVISION=	1
+DISTNAME=	rtorrent-0.7.1
 CATEGORIES=	net
 MASTER_SITES=	http://libtorrent.rakshasa.no/downloads/
 
diff --git a/net/rtorrent/distinfo b/net/rtorrent/distinfo
index 994d2d691bf..32bbe890b12 100644
--- a/net/rtorrent/distinfo
+++ b/net/rtorrent/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2007/01/04 12:46:38 tron Exp $
+$NetBSD: distinfo,v 1.12 2007/01/26 18:48:53 tron Exp $
 
-SHA1 (rtorrent-0.6.4.tar.gz) = df3e39a78334284262fe71e9db63b3e47ca5ab29
-RMD160 (rtorrent-0.6.4.tar.gz) = fa9fb6e8693a9d16926b022f97db6145847bb4c6
-Size (rtorrent-0.6.4.tar.gz) = 438407 bytes
+SHA1 (rtorrent-0.7.1.tar.gz) = cb41c013f82f12dec4962f68a7677eb0b00785cd
+RMD160 (rtorrent-0.7.1.tar.gz) = 01b42bc520abe7a6cae0b31e9b72dd65d4ae6a90
+Size (rtorrent-0.7.1.tar.gz) = 414447 bytes
 SHA1 (patch-aa) = b64756f960036fcb50e4648aecd31fe004e3ad04
 SHA1 (patch-ab) = 87d7741906f6d7c8572b80d2a3f42910175e182f