diff options
author | tron <tron@pkgsrc.org> | 2012-05-16 17:42:37 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2012-05-16 17:42:37 +0000 |
commit | a642f42c49dc39767f0e1c3e4b1d1ad489b9f1fa (patch) | |
tree | 3dfb94cd830c430d3914b238ccaf5e784b2b5835 /net/rtorrent | |
parent | 945930ee489074f4a229e403d5308393d08232d3 (diff) | |
download | pkgsrc-a642f42c49dc39767f0e1c3e4b1d1ad489b9f1fa.tar.gz |
Update "libtorrent" package to version 0.13.2 and "rtorrent" package
to version 0.9.2.
A list of changes is not available unfortunately. But it seems that most
of the Solaris related build fixes have been integrated.
Diffstat (limited to 'net/rtorrent')
-rw-r--r-- | net/rtorrent/MESSAGE.BSD | 12 | ||||
-rw-r--r-- | net/rtorrent/Makefile | 9 | ||||
-rw-r--r-- | net/rtorrent/distinfo | 16 | ||||
-rw-r--r-- | net/rtorrent/patches/patch-aa | 17 | ||||
-rw-r--r-- | net/rtorrent/patches/patch-ac | 22 | ||||
-rw-r--r-- | net/rtorrent/patches/patch-ad | 32 | ||||
-rw-r--r-- | net/rtorrent/patches/patch-ae | 15 | ||||
-rw-r--r-- | net/rtorrent/patches/patch-ag | 15 |
8 files changed, 31 insertions, 107 deletions
diff --git a/net/rtorrent/MESSAGE.BSD b/net/rtorrent/MESSAGE.BSD deleted file mode 100644 index 7167c8e72f7..00000000000 --- a/net/rtorrent/MESSAGE.BSD +++ /dev/null @@ -1,12 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.BSD,v 1.1 2006/01/30 00:52:28 tron Exp $ - -Please consider adding the following options to your ".rtorrent.rc": - -hash_max_tries = 5 -hash_interval = 10 -hash_read_ahead = 8 - -This will significantly improve the performance of hashing files. - -=========================================================================== diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile index 527b3e4eae0..16dda6aff6a 100644 --- a/net/rtorrent/Makefile +++ b/net/rtorrent/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.49 2012/03/07 00:19:08 elric Exp $ +# $NetBSD: Makefile,v 1.50 2012/05/16 17:42:37 tron Exp $ -DISTNAME= rtorrent-0.8.9 -PKGREVISION= 2 +DISTNAME= rtorrent-0.9.2 CATEGORIES= net MASTER_SITES= ${HOMEPAGE:=downloads/} @@ -33,10 +32,6 @@ LDFLAGS+= ${PTHREAD_LDFLAGS} .include "options.mk" -.if !empty(OPSYS:M*BSD) || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" -MESSAGE_SRC= ${PKGDIR}/MESSAGE.BSD -.endif - # See http://libtorrent.rakshasa.no/ticket/77 .include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc-4.0.*) diff --git a/net/rtorrent/distinfo b/net/rtorrent/distinfo index ec047bdfbcb..f352bd9de37 100644 --- a/net/rtorrent/distinfo +++ b/net/rtorrent/distinfo @@ -1,12 +1,10 @@ -$NetBSD: distinfo,v 1.28 2011/08/01 13:12:38 wiz Exp $ +$NetBSD: distinfo,v 1.29 2012/05/16 17:42:37 tron Exp $ -SHA1 (rtorrent-0.8.9.tar.gz) = 0ac51c185e98b5a386e5f1a07bca9a9963e2d6ce -RMD160 (rtorrent-0.8.9.tar.gz) = d79eacf6d63d13514c07c1c35a662fea5f35aef1 -Size (rtorrent-0.8.9.tar.gz) = 570904 bytes -SHA1 (patch-aa) = ef8edceb33f28e022e3d48706c30733ac3a730a3 +SHA1 (rtorrent-0.9.2.tar.gz) = 2a642d722745091265037ed8929a23c237a3b99f +RMD160 (rtorrent-0.9.2.tar.gz) = 130a4c7f3bd018f7247d4561170d6878ab7a120f +Size (rtorrent-0.9.2.tar.gz) = 591837 bytes SHA1 (patch-ab) = 87873bb32166d00398ab0ef6421a6fe85a55c914 -SHA1 (patch-ac) = b62de9ce834aa0422ec173e694d07e88aa1e2f47 -SHA1 (patch-ad) = 04fafec083c7cb27eb2f5ef7fbc5f6ab2e4e4a55 -SHA1 (patch-ae) = 49cb5e84f3759febfc93df874a10c90cafc249d8 +SHA1 (patch-ad) = ffc72a4020614f5879a050c0399c10d6f85cbdf0 +SHA1 (patch-ae) = a370881bfdd8534eb25fcbcff8d258b19797941f SHA1 (patch-af) = 842a01cbc75e61092b4d33fe9155a728e7c502e6 -SHA1 (patch-ag) = 381b100d2ae711114b24c4de2a4bf612efe31766 +SHA1 (patch-ag) = b7e5fe242b19f994f013acc9ec54a65fed729c29 diff --git a/net/rtorrent/patches/patch-aa b/net/rtorrent/patches/patch-aa deleted file mode 100644 index b89b05a0568..00000000000 --- a/net/rtorrent/patches/patch-aa +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-aa,v 1.7 2009/04/10 09:06:21 tron Exp $ - ---- src/rpc/scgi.cc.orig 2008-05-07 13:19:10.000000000 +0100 -+++ src/rpc/scgi.cc 2009-04-10 09:45:10.000000000 +0100 -@@ -88,7 +88,12 @@ - char buffer[sizeof(sockaddr_un) + filename.size()]; - sockaddr_un* sa = reinterpret_cast<sockaddr_un*>(buffer); - -+#if defined(sun) || defined(__sun) -+ sa->sun_family = AF_UNIX; -+#else - sa->sun_family = AF_LOCAL; -+#endif -+ - std::memcpy(sa->sun_path, filename.c_str(), filename.size() + 1); - - if (!get_fd().open_local()) diff --git a/net/rtorrent/patches/patch-ac b/net/rtorrent/patches/patch-ac deleted file mode 100644 index c0e6418a6fe..00000000000 --- a/net/rtorrent/patches/patch-ac +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2008/12/05 16:31:52 tron Exp $ - ---- src/input/path_input.cc.orig 2008-12-05 13:19:28 +0100 -+++ src/input/path_input.cc 2008-12-05 13:25:19 +0100 -@@ -42,7 +42,7 @@ - #include <rak/path.h> - - #include <sys/types.h> --#include <sys/dir.h> -+#include <sys/stat.h> - - #include "path_input.h" - -@@ -72,7 +72,7 @@ - - struct _transform_filename { - void operator () (utils::directory_entry& entry) { -- if (entry.d_type == DT_DIR) -+ if (S_ISDIR(entry.d_type)) - entry.d_name += '/'; - } - }; diff --git a/net/rtorrent/patches/patch-ad b/net/rtorrent/patches/patch-ad index cbdeff46cc7..5335c1a7786 100644 --- a/net/rtorrent/patches/patch-ad +++ b/net/rtorrent/patches/patch-ad @@ -1,7 +1,9 @@ -$NetBSD: patch-ad,v 1.2 2008/12/16 16:49:52 tron Exp $ +$NetBSD: patch-ad,v 1.3 2012/05/16 17:42:37 tron Exp $ ---- src/utils/directory.cc.orig 2008-05-07 13:19:11.000000000 +0100 -+++ src/utils/directory.cc 2008-12-16 16:45:58.000000000 +0000 +Fix build under Solaris and DragonFly. + +--- src/utils/directory.cc.orig 2012-03-29 14:06:11.000000000 +0100 ++++ src/utils/directory.cc 2012-05-14 23:44:08.000000000 +0100 @@ -38,6 +38,7 @@ #include <algorithm> @@ -10,7 +12,7 @@ $NetBSD: patch-ad,v 1.2 2008/12/16 16:49:52 tron Exp $ #include <dirent.h> #include <rak/path.h> #include <torrent/exceptions.h> -@@ -63,7 +64,9 @@ +@@ -67,7 +68,9 @@ if (m_path.empty()) throw torrent::input_error("Directory::update() tried to open an empty path."); @@ -21,25 +23,3 @@ $NetBSD: patch-ad,v 1.2 2008/12/16 16:49:52 tron Exp $ if (d == NULL) return false; -@@ -73,12 +76,18 @@ - while ((entry = readdir(d)) != NULL) { - if ((flags & update_hide_dot) && entry->d_name[0] == '.') - continue; -+ -+ std::string full_path = path + '/'; -+ full_path += entry->d_name; -+ -+ struct stat sb; -+ if (stat(full_path.c_str(), &sb)) -+ continue; - - iterator itr = base_type::insert(end(), value_type()); - -- itr->d_fileno = entry->d_fileno; -- itr->d_reclen = entry->d_reclen; -- itr->d_type = entry->d_type; -+ itr->d_fileno = sb.st_ino; -+ itr->d_type = sb.st_mode; - - #ifdef DIRENT_NAMLEN_EXISTS_FOOBAR - itr->d_name = std::string(entry->d_name, entry->d_name + entry->d_namlen); diff --git a/net/rtorrent/patches/patch-ae b/net/rtorrent/patches/patch-ae index ee035ebb1e7..f85a9f851b2 100644 --- a/net/rtorrent/patches/patch-ae +++ b/net/rtorrent/patches/patch-ae @@ -1,14 +1,15 @@ -$NetBSD: patch-ae,v 1.2 2008/12/16 16:49:52 tron Exp $ +$NetBSD: patch-ae,v 1.3 2012/05/16 17:42:37 tron Exp $ ---- src/utils/directory.h.orig 2008-05-07 13:19:11.000000000 +0100 -+++ src/utils/directory.h 2008-12-16 16:45:58.000000000 +0000 -@@ -49,8 +49,7 @@ - +Fix build under Solaris and DragonFly. + +--- src/utils/directory.h.orig 2012-03-29 14:06:11.000000000 +0100 ++++ src/utils/directory.h 2012-05-14 23:40:30.000000000 +0100 +@@ -50,7 +50,7 @@ // The name and types should match POSIX. uint32_t d_fileno; -- uint32_t d_reclen; + uint32_t d_reclen; //Not used. Messes with Solaris. - uint8_t d_type; -+ uint32_t d_type; ++ uint32_t d_type; std::string d_name; }; diff --git a/net/rtorrent/patches/patch-ag b/net/rtorrent/patches/patch-ag index ba336770399..d7403833844 100644 --- a/net/rtorrent/patches/patch-ag +++ b/net/rtorrent/patches/patch-ag @@ -1,21 +1,22 @@ -$NetBSD: patch-ag,v 1.1 2011/07/30 17:06:33 tron Exp $ +$NetBSD: patch-ag,v 1.2 2012/05/16 17:42:37 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 @@ +--- src/main.cc.orig 2012-03-20 15:09:58.000000000 +0000 ++++ src/main.cc 2012-05-14 23:44:41.000000000 +0100 +@@ -843,14 +843,14 @@ } #endif - int firstArg = parse_options(control, argc, argv); - - if (OptionParser::has_flag('n', argc, argv)) - control->core()->push_log("Ignoring ~/.rtorrent.rc."); - else + if (OptionParser::has_flag('n', argc, argv)) { + lt_log_print(torrent::LOG_WARN, "Ignoring ~/.rtorrent.rc."); + } else { rpc::parse_command_single(rpc::make_target(), "try_import = ~/.rtorrent.rc"); + } + int firstArg = parse_options(control, argc, argv); + |