bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] rtorrent: add patch for upstream ticket 1888, refresh patches (#6146)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@18421 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2009-11-14 21:05:24 +00:00
parent 11c27a34c4
commit 27498da2ba
4 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/rtorrent/Makefile
View File

@ -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)

8
net/rtorrent/patches/011-fix-bitfield-crash.patch
View File

@ -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) {

2
net/rtorrent/patches/901-upstream_rt_triple.patch
View File

@ -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) {}

31
net/rtorrent/patches/903-upstream_issue_1888.patch Normal file
View File

@ -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;