head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.4 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.2 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q1:1.7.0.26 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.24 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.22 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.20 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.18 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.16 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.14 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.12 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.10 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.8 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.6 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.4 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.2 pkgsrc-2008Q4:1.6.0.16 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.14 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.12 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.10 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.8 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.6 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.4 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.2 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.5.0.2 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.4.0.8 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.6 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.4 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.2 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.2.0.2 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.1.0.2 pkgsrc-2005Q3-base:1.1; locks; strict; comment @# @; 1.8 date 2012.05.16.17.42.37; author tron; state dead; branches; next 1.7; 1.7 date 2009.04.10.09.06.21; author tron; state Exp; branches 1.7.2.1; next 1.6; 1.6 date 2007.04.20.13.37.59; author tron; state dead; branches; next 1.5; 1.5 date 2007.01.04.12.46.38; author tron; state Exp; branches; next 1.4; 1.4 date 2006.02.25.17.24.21; author tron; state dead; branches; next 1.3; 1.3 date 2006.01.30.00.52.28; author tron; state Exp; branches; next 1.2; 1.2 date 2005.10.24.08.41.59; author adam; state dead; branches; next 1.1; 1.1 date 2005.09.26.07.49.06; author joerg; state Exp; branches; next ; 1.7.2.1 date 2009.04.10.09.06.21; author spz; state dead; branches; next 1.7.2.2; 1.7.2.2 date 2009.05.03.12.29.53; author spz; state Exp; branches; next ; desc @@ 1.8 log @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. @ text @$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(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()) @ 1.7 log @Add two patches taken from "xnet.fi" to fix the build under SunOS 5.11 (and eventually older versions). Problem reported by Tom Hensel in private e-mail. @ text @d1 1 a1 1 $NetBSD$ @ 1.7.2.1 log @file patch-aa was added on branch pkgsrc-2009Q1 on 2009-05-03 12:29:53 +0000 @ text @d1 17 @ 1.7.2.2 log @Pullup ticket 2754 - requested by tron Build fix for Solaris Revisions pulled up: - pkgsrc/net/libtorrent/Makefile 1.30 - pkgsrc/net/libtorrent/distinfo 1.22 - pkgsrc/net/libtorrent/patches/patch-aa 1.8 - pkgsrc/net/rtorrent/Makefile 1.30 - pkgsrc/net/rtorrent/distinfo 1.21 - pkgsrc/net/rtorrent/patches/patch-aa 1.7 Module Name: pkgsrc Committed By: tron Date: Fri Apr 10 09:06:21 UTC 2009 Modified Files: pkgsrc/net/libtorrent: Makefile distinfo pkgsrc/net/rtorrent: Makefile distinfo Added Files: pkgsrc/net/libtorrent/patches: patch-aa pkgsrc/net/rtorrent/patches: patch-aa Log Message: Add two patches taken from "xnet.fi" to fix the build under SunOS 5.11 (and eventually older versions). Problem reported by Tom Hensel in private e-mail. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/libtorrent/Makefile cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/libtorrent/distinfo cvs rdiff -u -r0 -r1.8 pkgsrc/net/libtorrent/patches/patch-aa cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/rtorrent/Makefile cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/rtorrent/distinfo cvs rdiff -u -r0 -r1.7 pkgsrc/net/rtorrent/patches/patch-aa @ text @a0 17 $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(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()) @ 1.6 log @Update "libtorrent" package to version 0.11.4 and "rtorrent" package to version 0.7.4. Changes since versions 0.11.1 and 0.7.1 respectively: - Added "max_open_http" option that limits the max number of simultaneous http connections. By default set to 32. - Directory structured view of the file list. The '/' key collapses directories, while the right arrow or ^F enters the selected directory. Changing the priority for a directory changes all contained files. - Added "create_link" and "delete_link" options which apply to a download. These must be used with the new "on_*" options, so as to allow you to create symbolic links when starting, stopping, finishing, etc, a torrent. - The "tos" option was parsing the hex value with unit == 0, which caused it to always zero it. - Forgot to check if there were any torrents hashing before starting new non-fast-resume checks, which would cause multiple torrents to be hashed at once. - File progress is now updated when hash_check is called, and no longer cleared on close. This fixes a bug with >100% file progress being reported and optimizes file progress updating for completed torrents. - Disabled IPv6 http requests so the trackers won't think we support it, and enabled curl's support for gzip encodings. - Added 'seeding' view on key 8. - Added "max_{up,down}loads_{div,global}" options. See the man page for more information. - Added support for dvorak keyboard layout. Patch by matled at gmx.net. - The STOPPED request was being canceled when a download was closed with f.ex ^K, moved it so it only happens when the download is removed. - Allow properly quoted and escaped arguments to options. F.ex "schedule = wd,10,10,load_start=~/Foo\ Bar/*.torrent" and "schedule = wd,10,10,load_start="~/Foo Bar/*.torrent"" now works. - Added unlimited setting for max unchoked in ChokeManager and made it the default. Set with 0 as a temporary hack. - Don't resize empty files used for creating directories. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2007/01/04 12:46:38 tron Exp $ d3 5 a7 3 --- rak/socket_address.h.orig 2007-01-04 01:55:46.851086425 +0100 +++ rak/socket_address.h @@@@ -62,7 +62,11 @@@@ class socket_address_inet6; d9 2 a10 4 class socket_address { public: +#if defined(__sun) && defined(__SVR4) + static const sa_family_t af_local = AF_UNIX; d12 1 a12 1 static const sa_family_t af_local = AF_LOCAL; d14 4 a17 3 static const sa_family_t af_unix = AF_UNIX; // static const sa_family_t af_file = AF_FILE; static const sa_family_t af_inet = AF_INET; @ 1.5 log @Fix build under Solaris. Patched provided by Peter Schuller in PR pkg/35357. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update "libtorrent" package to version 0.8.5 and "rtorrent" package to version 0.4.5. Changes since 0.8.3 respectively 0.4.3: - Bind udp and http tracker requests to the address given with the "bind" option. - Change the priority of a torrent with the '+' and '-' keys. - The schedule option allows clock time for the start and interval sections. - Made it safe to remove torrents being viewed/selected, making "remove_untied" usable. - Added the ^O key to change a closed torrent's destination directory. A bit of a hack, and only works if the torrents hasn't been activated. - Allow new settings to be applied with the ^P key. This can be tested with "print = foobar", which prints the string to the log. - Added the "working_directory" option that calls 'chdir' for the process. - Fixed a bug that caused crashes with small screen sizes. - Enabled a session lock file by default. Made it remove stale locks if the hostname matches and the process id is not running. - Added proper abstraction for creating timers from seconds, this fixes some overflow bugs when scheduling tasks like tracker timeouts. - For every time all the trackers in the list has been unsuccessfully tried, increase the timeout by 20 seconds. - Expand ~ in paths in the client. This should cover all uses of file paths, but I might have missed some. - Added "import" and "try_import" options that loads an option file. The latter silently fails on non-existent files. - Added "-O" flag that takes a single option, allowing ',' to be used. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2006/01/30 00:52:28 tron Exp $ d3 14 a16 65 --- src/utils/variable_map.cc.orig 2006-01-17 16:26:38.000000000 +0000 +++ src/utils/variable_map.cc 2006-01-30 00:02:39.000000000 +0000 @@@@ -37,6 +37,7 @@@@ #include "config.h" #include +#include #include #include #include @@@@ -93,6 +94,11 @@@@ return first; } +static bool +I_hate_C_Plus_Plus(char c) { + return std::isspace(c); +} + std::string::const_iterator parse_unknown(std::string::const_iterator first, std::string::const_iterator last, torrent::Bencode* dest) { if (*first == '"') { @@@@ -108,7 +114,7 @@@@ } else { // Add rak::or and check for ','. - std::string::const_iterator next = std::find_if(first, last, std::ptr_fun(&std::isspace)); + std::string::const_iterator next = std::find_if(first, last, std::ptr_fun(&I_hate_C_Plus_Plus)); *dest = std::string(first, next); return next; @@@@ -117,13 +123,13 @@@@ std::string::const_iterator parse_args(std::string::const_iterator first, std::string::const_iterator last, torrent::Bencode::List* dest) { - first = std::find_if(first, last, std::not1(std::ptr_fun(&std::isspace))); + first = std::find_if(first, last, std::not1(std::ptr_fun(&I_hate_C_Plus_Plus))); while (first != last) { dest->push_back(torrent::Bencode()); first = parse_unknown(first, last, &dest->back()); - first = std::find_if(first, last, std::not1(std::ptr_fun(&std::isspace))); + first = std::find_if(first, last, std::not1(std::ptr_fun(&I_hate_C_Plus_Plus))); if (first != last && *first != ',') throw torrent::input_error("A string with blanks must be quoted."); @@@@ -135,7 +141,7 @@@@ void VariableMap::process_command(const std::string& command) { std::string::const_iterator pos = command.begin(); - pos = std::find_if(pos, command.end(), std::not1(std::ptr_fun(&std::isspace))); + pos = std::find_if(pos, command.end(), std::not1(std::ptr_fun(&I_hate_C_Plus_Plus))); if (pos == command.end() || *pos == '#') return; @@@@ -143,7 +149,7 @@@@ // Replace with parse_unknown? std::string key; pos = parse_name(pos, command.end(), &key); - pos = std::find_if(pos, command.end(), std::not1(std::ptr_fun(&std::isspace))); + pos = std::find_if(pos, command.end(), std::not1(std::ptr_fun(&I_hate_C_Plus_Plus))); if (pos == command.end() || *pos != '=') throw torrent::input_error("Could not find '='."); @ 1.3 log @Update "libtorrent" package to version 0.8.3 and "rtorrent" package to version 0.4.3. Changes since 0.7.6/0.3.6: - New throttle implementation - Improved config file parser - Settings for using a http proxy and changing the process's umask. - Many more bug fixes and improvements @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Changes 0.3.5: * Improvements @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2005/09/26 07:49:06 joerg Exp $ d3 12 a14 11 --- src/ui/element_string_list.cc.orig 2005-09-25 19:07:46.000000000 +0200 +++ src/ui/element_string_list.cc @@@@ -43,7 +43,8 @@@@ namespace ui { -ElementStringList::ElementStringList() { +ElementStringList::ElementStringList(): + m_window(NULL) { m_list.push_back("Test string 1"); m_list.push_back("Test string 2"); d16 52 @ 1.1 log @Fix a bug in the tab-completion. When the prefix is not unique, rtorrent would have hit an internal assertion later. The patch is a merge from the unstable tree as suggested by the author. Bump revision to 1. @ text @d1 1 a1 1 $NetBSD$ @