summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/libtorrent/Makefile4
-rw-r--r--net/libtorrent/PLIST11
-rw-r--r--net/libtorrent/buildlink3.mk6
-rw-r--r--net/libtorrent/distinfo9
-rw-r--r--net/libtorrent/patches/patch-aa15
-rw-r--r--net/rtorrent/MESSAGE.BSD12
-rw-r--r--net/rtorrent/Makefile9
-rw-r--r--net/rtorrent/distinfo16
-rw-r--r--net/rtorrent/patches/patch-aa17
-rw-r--r--net/rtorrent/patches/patch-ac22
-rw-r--r--net/rtorrent/patches/patch-ad32
-rw-r--r--net/rtorrent/patches/patch-ae15
-rw-r--r--net/rtorrent/patches/patch-ag15
13 files changed, 49 insertions, 134 deletions
diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile
index 89b6b7a6033..e1c4c396fe8 100644
--- a/net/libtorrent/Makefile
+++ b/net/libtorrent/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2012/01/11 22:41:46 tron Exp $
+# $NetBSD: Makefile,v 1.44 2012/05/16 17:42:37 tron Exp $
-DISTNAME= libtorrent-0.12.9
+DISTNAME= libtorrent-0.13.2
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE:=downloads/}
diff --git a/net/libtorrent/PLIST b/net/libtorrent/PLIST
index b8dadb00d70..b67ddcec71e 100644
--- a/net/libtorrent/PLIST
+++ b/net/libtorrent/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2011/07/30 17:06:33 tron Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/05/16 17:42:37 tron Exp $
include/torrent/bitfield.h
include/torrent/chunk_manager.h
include/torrent/common.h
@@ -7,6 +7,7 @@ include/torrent/data/block.h
include/torrent/data/block_list.h
include/torrent/data/block_transfer.h
include/torrent/data/chunk_utils.h
+include/torrent/data/download_data.h
include/torrent/data/file.h
include/torrent/data/file_list.h
include/torrent/data/file_list_iterator.h
@@ -19,6 +20,7 @@ include/torrent/download.h
include/torrent/download/choke_group.h
include/torrent/download/choke_queue.h
include/torrent/download/download_manager.h
+include/torrent/download/group_entry.h
include/torrent/download/resource_manager.h
include/torrent/download_info.h
include/torrent/error.h
@@ -43,14 +45,19 @@ include/torrent/poll_epoll.h
include/torrent/poll_kqueue.h
include/torrent/poll_select.h
include/torrent/rate.h
-include/torrent/thread_base.h
include/torrent/throttle.h
include/torrent/torrent.h
include/torrent/tracker.h
+include/torrent/tracker_controller.h
include/torrent/tracker_list.h
include/torrent/utils/extents.h
+include/torrent/utils/log.h
+include/torrent/utils/log_buffer.h
include/torrent/utils/log_files.h
include/torrent/utils/option_strings.h
+include/torrent/utils/ranges.h
include/torrent/utils/resume.h
+include/torrent/utils/signal_bitfield.h
+include/torrent/utils/thread_base.h
lib/libtorrent.la
lib/pkgconfig/libtorrent.pc
diff --git a/net/libtorrent/buildlink3.mk b/net/libtorrent/buildlink3.mk
index cb88cee4891..ce81c436ffe 100644
--- a/net/libtorrent/buildlink3.mk
+++ b/net/libtorrent/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.18 2011/08/01 21:42:45 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2012/05/16 17:42:37 tron Exp $
BUILDLINK_TREE+= libtorrent
.if !defined(LIBTORRENT_BUILDLINK3_MK)
LIBTORRENT_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.libtorrent+= libtorrent>=0.12.9
-BUILDLINK_ABI_DEPENDS.libtorrent+= libtorrent>=0.12.9
+BUILDLINK_API_DEPENDS.libtorrent+= libtorrent>=0.13.2
+BUILDLINK_ABI_DEPENDS.libtorrent+= libtorrent>=0.13.2
BUILDLINK_PKGSRCDIR.libtorrent?= ../../net/libtorrent
.include "../../devel/libsigc++/buildlink3.mk"
diff --git a/net/libtorrent/distinfo b/net/libtorrent/distinfo
index 5adba19766b..f9e17209643 100644
--- a/net/libtorrent/distinfo
+++ b/net/libtorrent/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.28 2011/07/30 17:06:33 tron Exp $
+$NetBSD: distinfo,v 1.29 2012/05/16 17:42:37 tron Exp $
-SHA1 (libtorrent-0.12.9.tar.gz) = 176a836c6e685e4dad71ac08c0e09caaa5b7757c
-RMD160 (libtorrent-0.12.9.tar.gz) = a898e882da94977973d62f34a5dd82577fd83cf5
-Size (libtorrent-0.12.9.tar.gz) = 667864 bytes
-SHA1 (patch-aa) = d864808b9e9524b3a7f72bcc1b465d4e6b2d4f4a
+SHA1 (libtorrent-0.13.2.tar.gz) = 4f34a744fbe10c54aaf53d34681fabc1a49d7257
+RMD160 (libtorrent-0.13.2.tar.gz) = 090e6af9b4318a6176064159f6a8f70ab708c7fe
+Size (libtorrent-0.13.2.tar.gz) = 725088 bytes
diff --git a/net/libtorrent/patches/patch-aa b/net/libtorrent/patches/patch-aa
deleted file mode 100644
index 7985bc05e38..00000000000
--- a/net/libtorrent/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2009/04/10 09:06:20 tron Exp $
-
---- src/data/memory_chunk.cc.orig 2008-05-07 13:19:13.000000000 +0100
-+++ src/data/memory_chunk.cc 2009-04-10 09:37:20.000000000 +0100
-@@ -46,6 +46,10 @@
- #include "torrent/exceptions.h"
- #include "memory_chunk.h"
-
-+#if defined(sun) || defined(__sun)
-+extern "C" int madvise(void *addr, size_t len, int behav);
-+#endif /* sun || __sun */
-+
- namespace torrent {
-
- uint32_t MemoryChunk::m_pagesize = getpagesize();
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);
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 15:59:08 +0000