Update to libtorrent 0.12.4/rtorrent 0.8.4.

- Adds support for DHT. - Many ill-documented scripting changes. - The session file format has changed.
2008-11-25 16:21:28 +00:00 · 2008-11-25 16:21:28 +00:00 · e1510c6668
commit e1510c6668
parent 2b686363da
9 changed files with 118 additions and 24 deletions
--- a/net/libtorrent/Makefile
+++ b/net/libtorrent/Makefile
@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.16 2007/11/30 18:18:13 naddy Exp $
+# $OpenBSD: Makefile,v 1.17 2008/11/25 16:21:28 naddy Exp $

 COMMENT=		BitTorrent library written in C++

-DISTNAME=		libtorrent-0.11.9
-SHARED_LIBS +=  	torrent              14.0     # .10.8
+DISTNAME=		libtorrent-0.12.4
+SHARED_LIBS +=  	torrent              15.0     # .11.4
 CATEGORIES=		net devel

 HOMEPAGE=		http://libtorrent.rakshasa.no/
 MAINTAINER=		Christian Weisgerber <naddy@openbsd.org>

-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@ -22,11 +22,12 @@ LIB_DEPENDS=		sigc-2.0:libsigc++-2.*:devel/libsigc++-2

 USE_LIBTOOL=		Yes

-CONFIGURE_STYLE=	gnu
+AUTOCONF_VERSION=	2.62
+CONFIGURE_STYLE=	autoconf
 CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
+			--enable-static \
 			--with-openssl \
 			--with-kqueue \
-			--with-statfs \
 			--disable-debug
 CONFIGURE_ENV=		OPENSSL_CFLAGS=-I/usr/include \
 			OPENSSL_LIBS=-lcrypto
--- a/net/libtorrent/distinfo
+++ b/net/libtorrent/distinfo
@ -1,5 +1,5 @@
-MD5 (libtorrent-0.11.9.tar.gz) = iXTclJmzgqCfuVLKvP75oA==
-RMD160 (libtorrent-0.11.9.tar.gz) = +43mbWV5HatnwZU1apjefPZT08k=
-SHA1 (libtorrent-0.11.9.tar.gz) = 2I51TRwv9/jF+3VEMxJkvVBYcLg=
-SHA256 (libtorrent-0.11.9.tar.gz) = cfCSGKd4SyGrU8382PoSLaYDUuXKEX/afNjSdj+Qigg=
-SIZE (libtorrent-0.11.9.tar.gz) = 545210
+MD5 (libtorrent-0.12.4.tar.gz) = fktMKaachsOOPmDsEfwiVQ==
+RMD160 (libtorrent-0.12.4.tar.gz) = I/2KJC9JMXH34q+nFNx7dDWf97w=
+SHA1 (libtorrent-0.12.4.tar.gz) = beqz9q9elWbJhxMdWGdRx9w7Xbs=
+SHA256 (libtorrent-0.12.4.tar.gz) = pIwwf9zHeijuOiugtoUBpC43Cb9pPFLfSDG4fHHIw1k=
+SIZE (libtorrent-0.12.4.tar.gz) = 600778
--- a/net/libtorrent/patches/patch-scripts_checks_m4
+++ b/net/libtorrent/patches/patch-scripts_checks_m4
@ -0,0 +1,55 @@
+$OpenBSD: patch-scripts_checks_m4,v 1.1 2008/11/25 16:21:28 naddy Exp $
+--- scripts/checks.m4.orig	Tue Oct  7 14:48:07 2008
+++ scripts/checks.m4	Sun Nov 23 21:04:40 2008
+@@ -94,14 +94,27 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [
+ ])
+ 
+ AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [
+  save_LIBS=$LIBS
+  AC_CHECK_FUNCS(posix_openpt, , [
+    AC_SEARCH_LIBS(openpty, util,
+      AC_DEFINE(HAVE_OPENPTY, 1,
+        [Define to 1 if you have the `openpty' function.])
+    )
+  ])
+
+   AC_MSG_CHECKING(whether kqueue supports pipes and ptys)
+ 
+   AC_RUN_IFELSE(
+-    [[#include <fcntl.h>
+    [[#include "confdefs.h"
+      #include <fcntl.h>
+       #include <stdlib.h>
+       #include <unistd.h>
+       #include <sys/event.h>
+       #include <sys/time.h>
+      #if HAVE_OPENPTY
+      #include <termios.h>
+      #include <util.h>
+      #endif
+       int main() {
+         struct kevent ev[2], ev_out[2];
+         struct timespec ts = { 0, 0 };
+@@ -110,8 +123,14 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [
+         if (pipe(pfd) == -1) return 1;
+         if (fcntl(pfd[1], F_SETFL, O_NONBLOCK) == -1) return 2;
+         while ((n = write(pfd[1], buffer, sizeof(buffer))) == sizeof(buffer));
+        #if HAVE_POSIX_OPENPT
+         if ((pty[0]=posix_openpt(O_RDWR | O_NOCTTY)) == -1) return 3;
+         if ((pty[1]=grantpt(pty[0])) == -1) return 4;
+        #elif HAVE_OPENPTY
+        if (openpty(&pty[0], &pty[1], NULL, NULL, NULL) == -1) return 3;
+        #else
+        return 3;
+        #endif
+         EV_SET(ev+0, pfd[1], EVFILT_WRITE, EV_ADD | EV_ENABLE, 0, 0, NULL);
+         EV_SET(ev+1, pty[1], EVFILT_READ, EV_ADD | EV_ENABLE, 0, 0, NULL);
+         if ((kfd = kqueue()) == -1) return 5;
+@@ -129,6 +148,7 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [
+       AC_DEFINE(KQUEUE_SOCKET_ONLY, 1, kqueue only supports sockets.)
+       AC_MSG_RESULT(no)
+     ])
+    LIBS=$save_LIBS
+ ])
+ 
+ AC_DEFUN([TORRENT_WITH_KQUEUE], [
--- a/net/libtorrent/patches/patch-src_torrent_poll_kqueue_cc
+++ b/net/libtorrent/patches/patch-src_torrent_poll_kqueue_cc
@ -0,0 +1,11 @@
+$OpenBSD: patch-src_torrent_poll_kqueue_cc,v 1.1 2008/11/25 16:21:28 naddy Exp $
+--- src/torrent/poll_kqueue.cc.orig	Tue Oct 28 04:48:48 2008
+++ src/torrent/poll_kqueue.cc	Sun Nov 23 21:17:59 2008
+@@ -37,6 +37,7 @@
+ #include "config.h"
+ 
+ #include <cerrno>
+#include <cassert>
+ 
+ #include <algorithm>
+ #include <unistd.h>
--- a/net/libtorrent/pkg/PLIST
+++ b/net/libtorrent/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2007/03/22 20:42:05 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.8 2008/11/25 16:21:28 naddy Exp $
 %%SHARED%%
 include/torrent/
 include/torrent/bitfield.h
@ -16,6 +16,7 @@ include/torrent/data/file_manager.h
 include/torrent/data/file_utils.h
 include/torrent/data/piece.h
 include/torrent/data/transfer_list.h
+include/torrent/dht_manager.h
 include/torrent/download.h
 include/torrent/error.h
 include/torrent/event.h
@ -28,6 +29,7 @@ include/torrent/path.h
 include/torrent/peer/
 include/torrent/peer/client_info.h
 include/torrent/peer/client_list.h
+include/torrent/peer/connection_list.h
 include/torrent/peer/peer.h
 include/torrent/peer/peer_info.h
 include/torrent/peer/peer_list.h
@ -37,6 +39,7 @@ include/torrent/poll_kqueue.h
 include/torrent/poll_select.h
 include/torrent/rate.h
 include/torrent/resume.h
+include/torrent/throttle.h
 include/torrent/torrent.h
 include/torrent/tracker.h
 include/torrent/tracker_list.h
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.19 2007/11/30 18:18:13 naddy Exp $
+# $OpenBSD: Makefile,v 1.20 2008/11/25 16:21:28 naddy Exp $

 COMMENT=		ncurses BitTorrent client based on libTorrent

-DISTNAME=		rtorrent-0.7.9
+DISTNAME=		rtorrent-0.8.4
 CATEGORIES=		net

 HOMEPAGE=		http://libtorrent.rakshasa.no/
@ -19,13 +19,12 @@ WANTLIB=		c crypto iconv intl idn m ncurses sigc-2.0 ssl stdc++ z

 MASTER_SITES=		${HOMEPAGE}downloads/

-LIB_DEPENDS=		torrent.>=14::net/libtorrent \
-			curl.>=8::net/curl
+LIB_DEPENDS=		torrent.>=15::net/libtorrent \
+			curl.>=12::net/curl

 USE_LIBTOOL=		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
-			--with-statfs \
 			--disable-debug

 post-build:
--- a/net/rtorrent/distinfo
+++ b/net/rtorrent/distinfo
@ -1,5 +1,5 @@
-MD5 (rtorrent-0.7.9.tar.gz) = E2IC/dVAqSqvvO4p+EnSKA==
-RMD160 (rtorrent-0.7.9.tar.gz) = jP7hOMAUKtIoMLPVGOGY8WMGOoQ=
-SHA1 (rtorrent-0.7.9.tar.gz) = C1O9OywV+TNSYHqzaFkW/icDNFA=
-SHA256 (rtorrent-0.7.9.tar.gz) = 8G9ysf7JQXcUex2wqrFb5PYtGwNUgRpnrnTgzR5QoRk=
-SIZE (rtorrent-0.7.9.tar.gz) = 489174
+MD5 (rtorrent-0.8.4.tar.gz) = 3A832TOwtscTrWF+CUQfOw==
+RMD160 (rtorrent-0.8.4.tar.gz) = p6ZaE2Fh3InpNHnO53bMCE3OTuA=
+SHA1 (rtorrent-0.8.4.tar.gz) = g6fA2+tGuwdK4HXZ+vXQXw3xdXE=
+SHA256 (rtorrent-0.8.4.tar.gz) = JXciOAs56E5wDp8tL2YAunJHI/HtWTJ7/OR6V9KT7u4=
+SIZE (rtorrent-0.8.4.tar.gz) = 518306
--- a/net/rtorrent/patches/patch-src_display_window_file_list_cc
+++ b/net/rtorrent/patches/patch-src_display_window_file_list_cc
@ -0,0 +1,25 @@
+$OpenBSD: patch-src_display_window_file_list_cc,v 1.1 2008/11/25 16:21:28 naddy Exp $
+--- src/display/window_file_list.cc.orig	Sun Nov 16 16:55:08 2008
+++ src/display/window_file_list.cc	Mon Nov 24 23:49:50 2008
+@@ -170,8 +170,8 @@ WindowFileList::redraw() {
+       m_canvas->print(0, pos, "%*c%-*s", 16, ' ', filenameWidth, "EMPTY");
+ 
+     } else if (itr.is_entering()) {
+-      m_canvas->print(0, pos, "%*c %ls", 16 + itr.depth(), '\\',
+-                      itr.depth() < (*itr)->path()->size() ? wstring_width((*itr)->path()->at(itr.depth()), filenameWidth - itr.depth() - 1).c_str() : L"UNKNOWN");
+      m_canvas->print(0, pos, "%*c %s", 16 + itr.depth(), '\\',
+                      itr.depth() < (*itr)->path()->size() ? (*itr)->path()->at(itr.depth()).c_str() : "UNKNOWN");
+ 
+     } else if (itr.is_leaving()) {
+       m_canvas->print(0, pos, "%*c %-*s", 16 + (itr.depth() - 1), '/', filenameWidth - (itr.depth() - 1), "");
+@@ -201,8 +201,8 @@ WindowFileList::redraw() {
+       else
+         m_canvas->print(8, pos, "%5.1f T", (double)val / (int64_t(1) << 40));
+ 
+-      m_canvas->print(15, pos, "%*c %ls", 1 + itr.depth(), '|',
+-                      itr.depth() < (*itr)->path()->size() ? wstring_width((*itr)->path()->at(itr.depth()), filenameWidth - itr.depth() - 1).c_str() : L"UNKNOWN");
+      m_canvas->print(15, pos, "%*c %s", 1 + itr.depth(), '|',
+                      itr.depth() < (*itr)->path()->size() ? (*itr)->path()->at(itr.depth()).c_str() : "UNKNOWN");
+ 
+     } else {
+       m_canvas->print(0, pos, "BORK BORK");
--- a/net/rtorrent/pkg/PLIST
+++ b/net/rtorrent/pkg/PLIST
@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/12/30 04:42:36 jolan Exp $
-bin/rtorrent
+@comment $OpenBSD: PLIST,v 1.2 2008/11/25 16:21:28 naddy Exp $
+@bin bin/rtorrent
@man man/man1/rtorrent.1
 share/doc/rtorrent/
 share/doc/rtorrent/README.OpenBSD