Update "libtorrent" package to version 0.12.9 and "rtorrent" package to version 0.8.9. Changes since version 0.12.6 respectively 0.8.6: - Added multithreading support for XMLRPC calls. Sponsored by Xirvik. - Discard dht cache if it is corrupt, instead of killing rtorrent. - Better handling of resume after crash/reboot alliviating the need to full hash checks. Sponsored by anonymous source. - Added support for Linux's fallocate and Darwin's fcntl(...,F_PREALLOCATE,...) to preallocate files by default. The 'system.file_allocate' setting will now only be used to indicate you want posix_fallocate called, which may block while it zeros out the file manually. - Added 'event.download.hash_failed' and 'event.download.hash_final_failed'. - Cleaning up command names. The deprecated commands will be redirected. - Renamed 'system.method.*' to 'method.*'. - Added 'system.files.{opened,closed,failed}_counter' commands. - Added xmlrpc calls for peer snubbed, banned and disconnect. - Added '-D' flag which turns of redirects for deprecated commands. Use this to ensure your scripts/webui's will be compatible with future releases. - Added separate '-I' and '-K' switches for command redirects, the former is for testing rtorrent code, the latter for webui's. - Added a static_map implementation based on Josef's patches. - Commited the DHT changes from dht-pex-static_map.diff with changes so it works with the modified static_map implementation. - Applied the magnet-uri patch. - Don't install the out-of-date man page. - Added 'execute.*.bg' commands for non-blocking calls. Always returns 0. - Added support for prioritizing first/last chunk of files matching specified patterns. Default: file.prioritize_toc.set=0 file.prioritize_toc.first.set = {*.avi,*.mp4,*.mkv,*.gz} file.prioritize_toc.last.set = {*.zip} - Added 'method.rlookup' and 'method.rlookup.clear' commands for looking up the event handlers holding a specified key, and set views to support rlookup. - Added 'd.timestamp.finished' that is set when a downloading torrent completes. For torrents that only seed it remains '0'. - Added 'elapsed.{less,greater}' for checking the time elapsed since a time is less/greater, and it also returns false in all cases where the time is '0'. - Moved the default value for 'system.files.max_size' to rtorrent, and set the default in libtorrent to ~0. - Increased the default values for min/max_peers and max_uploads. - Fixed a bug that would cause hash checking to block excessively in some cases. - Fixed a bug when setting the pex flags. - Fixed an issue where DHT's hashing function for TR1 unordered_map was casting unaligned size_t pointers. - Fixed default session name. - Added a missing inline that could cause linking errors.diff -r1.38 -r1.39 pkgsrc/net/libtorrent/Makefile
(tron)
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.38 2010/06/16 13:07:03 jakllsch Exp $ | 1 | # $NetBSD: Makefile,v 1.39 2011/07/30 17:06:33 tron Exp $ | |
2 | 2 | |||
3 | DISTNAME= libtorrent-0.12.6 | 3 | DISTNAME= libtorrent-0.12.9 | |
4 | PKGREVISION= 2 | |||
5 | CATEGORIES= net | 4 | CATEGORIES= net | |
6 | MASTER_SITES= ${HOMEPAGE:=downloads/} | 5 | MASTER_SITES= ${HOMEPAGE:=downloads/} | |
7 | 6 | |||
8 | OWNER= tron@NetBSD.org | 7 | OWNER= tron@NetBSD.org | |
9 | HOMEPAGE= http://libtorrent.rakshasa.no/ | 8 | HOMEPAGE= http://libtorrent.rakshasa.no/ | |
10 | COMMENT= BitTorrent library written in C++ for *nix | 9 | COMMENT= BitTorrent library written in C++ for *nix | |
11 | LICENSE= gnu-gpl-v2 | 10 | LICENSE= gnu-gpl-v2 | |
12 | 11 | |||
13 | PKG_DESTDIR_SUPPORT= user-destdir | 12 | PKG_DESTDIR_SUPPORT= user-destdir | |
14 | 13 | |||
15 | USE_LANGUAGES= c c++ | 14 | USE_LANGUAGES= c c++ | |
16 | USE_LIBTOOL= yes | 15 | USE_LIBTOOL= yes | |
17 | USE_TOOLS+= gmake pkg-config | 16 | USE_TOOLS+= gmake pkg-config |
@@ -1,43 +1,56 @@ | @@ -1,43 +1,56 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.9 2009/06/14 18:09:33 joerg Exp $ | 1 | @comment $NetBSD: PLIST,v 1.10 2011/07/30 17:06:33 tron Exp $ | |
2 | include/torrent/bitfield.h | 2 | include/torrent/bitfield.h | |
3 | include/torrent/chunk_manager.h | 3 | include/torrent/chunk_manager.h | |
4 | include/torrent/common.h | 4 | include/torrent/common.h | |
5 | include/torrent/connection_manager.h | 5 | include/torrent/connection_manager.h | |
6 | include/torrent/data/block.h | 6 | include/torrent/data/block.h | |
7 | include/torrent/data/block_list.h | 7 | include/torrent/data/block_list.h | |
8 | include/torrent/data/block_transfer.h | 8 | include/torrent/data/block_transfer.h | |
9 | include/torrent/data/chunk_utils.h | |||
9 | include/torrent/data/file.h | 10 | include/torrent/data/file.h | |
10 | include/torrent/data/file_list.h | 11 | include/torrent/data/file_list.h | |
11 | include/torrent/data/file_list_iterator.h | 12 | include/torrent/data/file_list_iterator.h | |
12 | include/torrent/data/file_manager.h | 13 | include/torrent/data/file_manager.h | |
13 | include/torrent/data/file_utils.h | 14 | include/torrent/data/file_utils.h | |
14 | include/torrent/data/piece.h | 15 | include/torrent/data/piece.h | |
15 | include/torrent/data/transfer_list.h | 16 | include/torrent/data/transfer_list.h | |
16 | include/torrent/dht_manager.h | 17 | include/torrent/dht_manager.h | |
17 | include/torrent/download.h | 18 | include/torrent/download.h | |
19 | include/torrent/download/choke_group.h | |||
20 | include/torrent/download/choke_queue.h | |||
21 | include/torrent/download/download_manager.h | |||
22 | include/torrent/download/resource_manager.h | |||
23 | include/torrent/download_info.h | |||
18 | include/torrent/error.h | 24 | include/torrent/error.h | |
19 | include/torrent/event.h | 25 | include/torrent/event.h | |
20 | include/torrent/exceptions.h | 26 | include/torrent/exceptions.h | |
21 | include/torrent/hash_string.h | 27 | include/torrent/hash_string.h | |
22 | include/torrent/http.h | 28 | include/torrent/http.h | |
23 | include/torrent/object.h | 29 | include/torrent/object.h | |
30 | include/torrent/object_raw_bencode.h | |||
31 | include/torrent/object_static_map.h | |||
24 | include/torrent/object_stream.h | 32 | include/torrent/object_stream.h | |
25 | include/torrent/path.h | 33 | include/torrent/path.h | |
34 | include/torrent/peer/choke_status.h | |||
26 | include/torrent/peer/client_info.h | 35 | include/torrent/peer/client_info.h | |
27 | include/torrent/peer/client_list.h | 36 | include/torrent/peer/client_list.h | |
28 | include/torrent/peer/connection_list.h | 37 | include/torrent/peer/connection_list.h | |
29 | include/torrent/peer/peer.h | 38 | include/torrent/peer/peer.h | |
30 | include/torrent/peer/peer_info.h | 39 | include/torrent/peer/peer_info.h | |
31 | include/torrent/peer/peer_list.h | 40 | include/torrent/peer/peer_list.h | |
32 | include/torrent/poll.h | 41 | include/torrent/poll.h | |
33 | include/torrent/poll_epoll.h | 42 | include/torrent/poll_epoll.h | |
34 | include/torrent/poll_kqueue.h | 43 | include/torrent/poll_kqueue.h | |
35 | include/torrent/poll_select.h | 44 | include/torrent/poll_select.h | |
36 | include/torrent/rate.h | 45 | include/torrent/rate.h | |
37 | include/torrent/resume.h | 46 | include/torrent/thread_base.h | |
38 | include/torrent/throttle.h | 47 | include/torrent/throttle.h | |
39 | include/torrent/torrent.h | 48 | include/torrent/torrent.h | |
40 | include/torrent/tracker.h | 49 | include/torrent/tracker.h | |
41 | include/torrent/tracker_list.h | 50 | include/torrent/tracker_list.h | |
51 | include/torrent/utils/extents.h | |||
52 | include/torrent/utils/log_files.h | |||
53 | include/torrent/utils/option_strings.h | |||
54 | include/torrent/utils/resume.h | |||
42 | lib/libtorrent.la | 55 | lib/libtorrent.la | |
43 | lib/pkgconfig/libtorrent.pc | 56 | lib/pkgconfig/libtorrent.pc |
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.27 2010/01/01 19:36:31 snj Exp $ | 1 | $NetBSD: distinfo,v 1.28 2011/07/30 17:06:33 tron Exp $ | |
2 | 2 | |||
3 | SHA1 (libtorrent-0.12.6.tar.gz) = bf7082f98bd6281493cba94a456697fb88c2c21b | 3 | SHA1 (libtorrent-0.12.9.tar.gz) = 176a836c6e685e4dad71ac08c0e09caaa5b7757c | |
4 | RMD160 (libtorrent-0.12.6.tar.gz) = 62f0c9737d4ca9621c42d673ea997f9d36875530 | 4 | RMD160 (libtorrent-0.12.9.tar.gz) = a898e882da94977973d62f34a5dd82577fd83cf5 | |
5 | Size (libtorrent-0.12.6.tar.gz) = 594113 bytes | 5 | Size (libtorrent-0.12.9.tar.gz) = 667864 bytes | |
6 | SHA1 (patch-aa) = d864808b9e9524b3a7f72bcc1b465d4e6b2d4f4a | 6 | SHA1 (patch-aa) = d864808b9e9524b3a7f72bcc1b465d4e6b2d4f4a |
@@ -1,34 +1,36 @@ | @@ -1,34 +1,36 @@ | |||
1 | # $NetBSD: Makefile,v 1.39 2011/07/28 23:14:46 tron Exp $ | 1 | # $NetBSD: Makefile,v 1.40 2011/07/30 17:06:33 tron Exp $ | |
2 | 2 | |||
3 | DISTNAME= rtorrent-0.8.6 | 3 | DISTNAME= rtorrent-0.8.9 | |
4 | PKGREVISION= 4 | |||
5 | CATEGORIES= net | 4 | CATEGORIES= net | |
6 | MASTER_SITES= ${HOMEPAGE:=downloads/} | 5 | MASTER_SITES= ${HOMEPAGE:=downloads/} | |
7 | 6 | |||
8 | OWNER= tron@NetBSD.org | 7 | OWNER= tron@NetBSD.org | |
9 | HOMEPAGE= http://libtorrent.rakshasa.no/ | 8 | HOMEPAGE= http://libtorrent.rakshasa.no/ | |
10 | COMMENT= Ncurses based torrent client with support for sessions | 9 | COMMENT= Ncurses based torrent client with support for sessions | |
11 | LICENSE= gnu-gpl-v2 | 10 | LICENSE= gnu-gpl-v2 | |
12 | 11 | |||
13 | PKG_DESTDIR_SUPPORT= user-destdir | 12 | PKG_DESTDIR_SUPPORT= user-destdir | |
14 | 13 | |||
15 | USE_LANGUAGES= c c++ | 14 | USE_LANGUAGES= c c++ | |
16 | USE_LIBTOOL= yes | 15 | USE_LIBTOOL= yes | |
17 | USE_NCURSES= chgat | 16 | USE_NCURSES= chgat | |
18 | USE_TOOLS+= gmake pkg-config | 17 | USE_TOOLS+= gmake pkg-config | |
19 | GNU_CONFIGURE= yes | 18 | GNU_CONFIGURE= yes | |
20 | GCC_REQD+= 3.3 | 19 | GCC_REQD+= 3.3 | |
21 | 20 | |||
21 | .include "../../mk/pthread.buildlink3.mk" | |||
22 | LDFLAGS+= ${PTHREAD_LDFLAGS} | |||
23 | ||||
22 | .include "options.mk" | 24 | .include "options.mk" | |
23 | 25 | |||
24 | .if !empty(OPSYS:M*BSD) || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" | 26 | .if !empty(OPSYS:M*BSD) || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" | |
25 | MESSAGE_SRC= ${PKGDIR}/MESSAGE.BSD | 27 | MESSAGE_SRC= ${PKGDIR}/MESSAGE.BSD | |
26 | .endif | 28 | .endif | |
27 | 29 | |||
28 | # See http://libtorrent.rakshasa.no/ticket/77 | 30 | # See http://libtorrent.rakshasa.no/ticket/77 | |
29 | .include "../../mk/compiler.mk" | 31 | .include "../../mk/compiler.mk" | |
30 | .if !empty(CC_VERSION:Mgcc-4.0.*) | 32 | .if !empty(CC_VERSION:Mgcc-4.0.*) | |
31 | CXXFLAGS+= -fpermissive -fno-strength-reduce -fno-thread-jumps \ | 33 | CXXFLAGS+= -fpermissive -fno-strength-reduce -fno-thread-jumps \ | |
32 | -fno-inline -fforce-addr | 34 | -fno-inline -fforce-addr | |
33 | .endif | 35 | .endif | |
34 | 36 |
@@ -1,4 +1,3 @@ | @@ -1,4 +1,3 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.2 2009/06/14 18:09:42 joerg Exp $ | 1 | @comment $NetBSD: PLIST,v 1.3 2011/07/30 17:06:33 tron Exp $ | |
2 | bin/rtorrent | 2 | bin/rtorrent | |
3 | man/man1/rtorrent.1 | |||
4 | share/examples/rtorrent/rtorrent.rc | 3 | share/examples/rtorrent/rtorrent.rc |
@@ -1,11 +1,12 @@ | @@ -1,11 +1,12 @@ | |||
1 | $NetBSD: distinfo,v 1.26 2011/03/01 07:44:52 tron Exp $ | 1 | $NetBSD: distinfo,v 1.27 2011/07/30 17:06:33 tron Exp $ | |
2 | 2 | |||
3 | SHA1 (rtorrent-0.8.6.tar.gz) = ffce3959ba91738bb444d689db3db1e2375b14ce | 3 | SHA1 (rtorrent-0.8.9.tar.gz) = 0ac51c185e98b5a386e5f1a07bca9a9963e2d6ce | |
4 | RMD160 (rtorrent-0.8.6.tar.gz) = 3d5109d4ee26c663b376e0b9f610ab6055c57ba9 | 4 | RMD160 (rtorrent-0.8.9.tar.gz) = d79eacf6d63d13514c07c1c35a662fea5f35aef1 | |
5 | Size (rtorrent-0.8.6.tar.gz) = 521045 bytes | 5 | Size (rtorrent-0.8.9.tar.gz) = 570904 bytes | |
6 | SHA1 (patch-aa) = ef8edceb33f28e022e3d48706c30733ac3a730a3 | 6 | SHA1 (patch-aa) = ef8edceb33f28e022e3d48706c30733ac3a730a3 | |
7 | SHA1 (patch-ab) = 87873bb32166d00398ab0ef6421a6fe85a55c914 | 7 | SHA1 (patch-ab) = 87873bb32166d00398ab0ef6421a6fe85a55c914 | |
8 | SHA1 (patch-ac) = b62de9ce834aa0422ec173e694d07e88aa1e2f47 | 8 | SHA1 (patch-ac) = b62de9ce834aa0422ec173e694d07e88aa1e2f47 | |
9 | SHA1 (patch-ad) = 04fafec083c7cb27eb2f5ef7fbc5f6ab2e4e4a55 | 9 | SHA1 (patch-ad) = 04fafec083c7cb27eb2f5ef7fbc5f6ab2e4e4a55 | |
10 | SHA1 (patch-ae) = 49cb5e84f3759febfc93df874a10c90cafc249d8 | 10 | SHA1 (patch-ae) = 49cb5e84f3759febfc93df874a10c90cafc249d8 | |
11 | SHA1 (patch-af) = 034b73f871aa09285b467502a1b524011f9eabdc | 11 | SHA1 (patch-af) = 21459320ef99e0d28fffec69bd0aa3407bf7401f | |
12 | SHA1 (patch-ag) = 381b100d2ae711114b24c4de2a4bf612efe31766 |
@@ -1,25 +1,25 @@ | @@ -1,25 +1,25 @@ | |||
1 | $NetBSD: patch-af,v 1.2 2011/03/01 07:44:53 tron Exp $ | 1 | $NetBSD: patch-af,v 1.3 2011/07/30 17:06:33 tron Exp $ | |
2 | 2 | |||
3 | Make this work with "ncurses" 5.8. Patch taken from here. | 3 | Make this work with "ncurses" 5.8. Patch taken from here. | |
4 | 4 | |||
5 | http://www.mail-archive.com/arch-general@archlinux.org/msg18728.html | 5 | http://www.mail-archive.com/arch-general@archlinux.org/msg18728.html | |
6 | 6 | |||
7 | --- src/display/canvas.h.orig 2009-11-12 08:03:47.000000000 +0000 | 7 | --- src/display/canvas.h.orig 2011-04-07 13:36:10.000000000 +0100 | |
8 | +++ src/display/canvas.h 2011-03-01 07:40:08.000000000 +0000 | 8 | +++ src/display/canvas.h 2011-07-30 16:40:10.000000000 +0100 | |
9 | @@ -37,6 +37,7 @@ | 9 | @@ -37,6 +37,7 @@ | |
10 | #ifndef RTORRENT_DISPLAY_CANVAS_H | 10 | #ifndef RTORRENT_DISPLAY_CANVAS_H | |
11 | #define RTORRENT_DISPLAY_CANVAS_H | 11 | #define RTORRENT_DISPLAY_CANVAS_H | |
12 | 12 | |||
13 | +#include <cstdarg> | 13 | +#include <cstdarg> | |
14 | #include <string> | 14 | #include <string> | |
15 | #include <vector> | 15 | #include <vector> | |
16 | 16 | |||
17 | @@ -48,7 +49,7 @@ | 17 | @@ -48,7 +49,7 @@ | |
18 | public: | 18 | public: | |
19 | typedef std::vector<Attributes> attributes_list; | 19 | typedef std::vector<Attributes> attributes_list; | |
20 | 20 | |||
21 | - Canvas(int x = 0, int y = 0, int width = 0, int height = 0) : | 21 | - Canvas(int x = 0, int y = 0, int width = 0, int height = 0); | |
22 | + Canvas(int x = 0, int y = 0, int width = 1, int height = 1) : | 22 | + Canvas(int x = 0, int y = 0, int width = 0, int height = 1); | |
23 | m_window(newwin(height, width, y, x)) {} | |||
24 | ~Canvas() { delwin(m_window); } | 23 | ~Canvas() { delwin(m_window); } | |
25 | 24 | |||
25 | void refresh() { wnoutrefresh(m_window); } |
$NetBSD: patch-ag,v 1.1 2011/07/30 17:06:33 tron Exp $
Fix handling of command line options. Please look here for details:
http://libtorrent.rakshasa.no/ticket/2657
--- src/main.cc.orig 2011-06-12 07:43:04.000000000 +0100
+++ src/main.cc 2011-07-30 17:21:50.000000000 +0100
@@ -822,13 +822,13 @@
}
#endif
- int firstArg = parse_options(control, argc, argv);
-
if (OptionParser::has_flag('n', argc, argv))
control->core()->push_log("Ignoring ~/.rtorrent.rc.");
else
rpc::parse_command_single(rpc::make_target(), "try_import = ~/.rtorrent.rc");
+ int firstArg = parse_options(control, argc, argv);
+
control->initialize();
// Load session torrents and perform scheduled tasks to ensure