From 78eaaaa889e9d127daa19437a61855cedb33d796 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 14 Nov 2009 21:05:24 +0000
Subject: [PATCH] [packages] rtorrent: add patch for upstream ticket 1888,
 refresh patches (#6146)

SVN-Revision: 18421
---
 net/rtorrent/Makefile                         |  2 +-
 .../patches/011-fix-bitfield-crash.patch      |  8 ++---
 .../patches/901-upstream_rt_triple.patch      |  2 +-
 .../patches/903-upstream_issue_1888.patch     | 31 +++++++++++++++++++
 4 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 net/rtorrent/patches/903-upstream_issue_1888.patch

diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index e672b91ce4..c371f399b3 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -12,7 +12,7 @@ PKG_NAME:=rtorrent
 
 PKG_REV:=1100
 PKG_VERSION:=0.8.5_r$(PKG_REV)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 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/011-fix-bitfield-crash.patch b/net/rtorrent/patches/011-fix-bitfield-crash.patch
index 67ef2bc3a5..312094dde4 100644
--- a/net/rtorrent/patches/011-fix-bitfield-crash.patch
+++ b/net/rtorrent/patches/011-fix-bitfield-crash.patch
@@ -1,9 +1,7 @@
 # Fix crash when trying to call d.get_bitfield on a closed download. Ticket #1825 from libtorrent.rakshasa.no.
-Index: rtorrent/src/command_download.cc
-===================================================================
---- rtorrent/src/command_download.cc	(revision 1093)
-+++ rtorrent/src/command_download.cc	(working copy)
-@@ -292,6 +292,9 @@
+--- a/src/command_download.cc
++++ b/src/command_download.cc
+@@ -296,6 +296,9 @@
  
  torrent::Object
  retrieve_d_bitfield(core::Download* download) {
diff --git a/net/rtorrent/patches/901-upstream_rt_triple.patch b/net/rtorrent/patches/901-upstream_rt_triple.patch
index d773acb4bc..cf9bfd0779 100644
--- a/net/rtorrent/patches/901-upstream_rt_triple.patch
+++ b/net/rtorrent/patches/901-upstream_rt_triple.patch
@@ -10,7 +10,7 @@ In file included from ./../rpc/command_map.h:45,
 
 --- a/src/rpc/command.h
 +++ b/src/rpc/command.h
-@@ -73,10 +73,8 @@ struct rt_triple : private std::pair<T1,
+@@ -87,10 +87,8 @@
    rt_triple(const T1& a, const T2& b, const T3& c) :
      base_type(a, b), third(c) {}
  
diff --git a/net/rtorrent/patches/903-upstream_issue_1888.patch b/net/rtorrent/patches/903-upstream_issue_1888.patch
new file mode 100644
index 0000000000..9040dd2ae1
--- /dev/null
+++ b/net/rtorrent/patches/903-upstream_issue_1888.patch
@@ -0,0 +1,31 @@
+--- 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