From 1535d72dc7b9c85ee15ac38a9b94c84934c33ab8 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Thu, 26 Nov 2009 23:39:26 +0000 Subject: [PATCH] [package] update rtorrent to r1104 (#6176) SVN-Revision: 18553 --- net/rtorrent/Makefile | 4 +-- .../patches/010-fix_exec_capture_leak.patch | 14 --------- .../patches/011-fix-bitfield-crash.patch | 13 -------- .../patches/100-fix_cross_compile.patch | 12 +++++++ .../patches/901-upstream_rt_triple.patch | 24 -------------- .../patches/902-gcc_3.4.6_wstring_fix.patch | 15 --------- .../patches/903-upstream_issue_1888.patch | 31 ------------------- 7 files changed, 14 insertions(+), 99 deletions(-) delete mode 100644 net/rtorrent/patches/010-fix_exec_capture_leak.patch delete mode 100644 net/rtorrent/patches/011-fix-bitfield-crash.patch create mode 100644 net/rtorrent/patches/100-fix_cross_compile.patch delete mode 100644 net/rtorrent/patches/901-upstream_rt_triple.patch delete mode 100644 net/rtorrent/patches/902-gcc_3.4.6_wstring_fix.patch delete mode 100644 net/rtorrent/patches/903-upstream_issue_1888.patch diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile index c371f399b3..d99e706231 100644 --- a/net/rtorrent/Makefile +++ b/net/rtorrent/Makefile @@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rtorrent -PKG_REV:=1100 +PKG_REV:=1104 PKG_VERSION:=0.8.5_r$(PKG_REV) -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=svn://rakshasa.no/libtorrent/trunk/rtorrent PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) diff --git a/net/rtorrent/patches/010-fix_exec_capture_leak.patch b/net/rtorrent/patches/010-fix_exec_capture_leak.patch deleted file mode 100644 index 042b73ef55..0000000000 --- a/net/rtorrent/patches/010-fix_exec_capture_leak.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Fixes a file handle leak in the execute_capture functions. -Index: rtorrent/src/rpc/exec_file.cc -=================================================================== ---- rtorrent/src/rpc/exec_file.cc (revision 1093) -+++ rtorrent/src/rpc/exec_file.cc (working copy) -@@ -123,6 +123,8 @@ - m_capture += std::string(buffer, length); - } while (length > 0); - -+ ::close(pipeFd[0]); -+ - if (m_logFd != -1) { - write(m_logFd, "Captured output:\n", sizeof("Captured output:\n")); - write(m_logFd, m_capture.data(), m_capture.length()); diff --git a/net/rtorrent/patches/011-fix-bitfield-crash.patch b/net/rtorrent/patches/011-fix-bitfield-crash.patch deleted file mode 100644 index 312094dde4..0000000000 --- a/net/rtorrent/patches/011-fix-bitfield-crash.patch +++ /dev/null @@ -1,13 +0,0 @@ -# Fix crash when trying to call d.get_bitfield on a closed download. Ticket #1825 from libtorrent.rakshasa.no. ---- a/src/command_download.cc -+++ b/src/command_download.cc -@@ -296,6 +296,9 @@ - - torrent::Object - retrieve_d_bitfield(core::Download* download) { -+ if (!download->download()->file_list()->is_open()) -+ throw torrent::input_error("Cannot retrieve bitfield of closed download."); -+ - const torrent::Bitfield* bitField = download->download()->file_list()->bitfield(); - - return torrent::Object(rak::transform_hex(bitField->begin(), bitField->end())); diff --git a/net/rtorrent/patches/100-fix_cross_compile.patch b/net/rtorrent/patches/100-fix_cross_compile.patch new file mode 100644 index 0000000000..fe4bf7f60a --- /dev/null +++ b/net/rtorrent/patches/100-fix_cross_compile.patch @@ -0,0 +1,12 @@ +diff -durN a/scripts/common.m4 b/scripts/common.m4 +--- a/scripts/common.m4 2009-11-13 10:44:23.000000000 +0300 ++++ b/scripts/common.m4 2009-11-05 11:20:35.000000000 +0300 +@@ -184,7 +183,7 @@ + AC_DEFUN([TORRENT_CHECK_EXECINFO], [ + AC_MSG_CHECKING(for execinfo.h) + +- AC_RUN_IFELSE( ++ AC_LINK_IFELSE( + [[#include + int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} + ]], diff --git a/net/rtorrent/patches/901-upstream_rt_triple.patch b/net/rtorrent/patches/901-upstream_rt_triple.patch deleted file mode 100644 index cf9bfd0779..0000000000 --- a/net/rtorrent/patches/901-upstream_rt_triple.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream patch from: http://libtorrent.rakshasa.no/ticket/1271 - -Fix the following gcc-3.4.6 ICE: - -In file included from ./../rpc/command_map.h:45, - from ./../rpc/parse_commands.h:43, - from dht_manager.cc:46: -./../rpc/command.h: In function `rpc::target_type rpc::get_target_left(const rpc::target_type&)': -./../rpc/command.h:153: internal compiler error: Segmentation fault - ---- a/src/rpc/command.h -+++ b/src/rpc/command.h -@@ -87,10 +87,8 @@ - rt_triple(const T1& a, const T2& b, const T3& c) : - base_type(a, b), third(c) {} - -- template -- rt_triple(const std::pair& b) : base_type(b), third() {} -+ rt_triple(const base_type& b) : base_type(b), third() {} - -- template - rt_triple(const rt_triple& src) : - base_type(src.first, src.second), third(src.third) {} - }; diff --git a/net/rtorrent/patches/902-gcc_3.4.6_wstring_fix.patch b/net/rtorrent/patches/902-gcc_3.4.6_wstring_fix.patch deleted file mode 100644 index c8096e7475..0000000000 --- a/net/rtorrent/patches/902-gcc_3.4.6_wstring_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- rtorrent-0.8.4_r1094/src/display/window_file_list.h 2009-06-18 02:53:53.000000000 -0700 -+++ rtorrent-0.8.4_r1094/src/display/window_file_list.h 2009-06-19 00:52:30.000000000 -0700 -@@ -39,6 +39,12 @@ - - #include "window.h" - -+ -+// two-bit hack for gcc 3.4.6 -+namespace std { -+ typedef basic_string wstring; -+} -+ - namespace ui { - class ElementFileList; - } diff --git a/net/rtorrent/patches/903-upstream_issue_1888.patch b/net/rtorrent/patches/903-upstream_issue_1888.patch deleted file mode 100644 index 9040dd2ae1..0000000000 --- a/net/rtorrent/patches/903-upstream_issue_1888.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/src/command_download.cc -+++ b/src/command_download.cc -@@ -310,7 +310,7 @@ - download->download()->signal_network_log(sigc::mem_fun(control->core(), &core::Manager::push_log_complete)); - download->download()->signal_storage_error(sigc::mem_fun(control->core(), &core::Manager::push_log_complete)); - -- if (!rpc::call_command_string("get_tracker_dump").empty()) -+ if (!rpc::call_command_string("get_log.tracker").empty()) - download->download()->signal_tracker_dump(sigc::ptr_fun(&core::receive_tracker_dump)); - - return torrent::Object(); ---- a/src/core/manager.cc -+++ b/src/core/manager.cc -@@ -77,7 +77,7 @@ - - void - receive_tracker_dump(const std::string& url, const char* data, size_t size) { -- const std::string& filename = rpc::call_command_string("get_tracker_dump"); -+ const std::string& filename = rpc::call_command_string("get_log.tracker"); - - if (filename.empty()) - return; -@@ -94,7 +94,7 @@ - - void - Manager::handshake_log(const sockaddr* sa, int msg, int err, const torrent::HashString* hash) { -- if (!rpc::call_command_value("get_handshake_log")) -+ if (!rpc::call_command_value("get_log.handshake")) - return; - - std::string peer; -- 2.30.2