pool/libktorrent
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 59188 from KDE:Distro:Factory

Browse Source 
Accepted submit request 59188 from user dirkmueller

OBS-URL: https://build.opensuse.org/request/show/59188
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libktorrent?expand=0&rev=11
This commit is contained in:
Ruediger Oertel 2011-02-01 17:54:41 +00:00 committed by Git OBS Bridge
parent e9da143820
commit 4b6895a799
3 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libktorrent-1.1beta1-sprseedcrash.patch Normal file
View File

@ -0,0 +1,46 @@
index fd5084d..42a2138 100644
Index: src/peer/peermanager.cpp
===================================================================
--- src/peer/peermanager.cpp.orig 2010-12-30 14:38:17.000000000 +0200
+++ src/peer/peermanager.cpp 2011-01-15 16:01:48.761678784 +0200
@@ -430,6 +430,8 @@ namespace bt
delete d->superseeder;
d->superseeder = 0;
}
+
+ closeAllConnections();
}
Peer* PeerManager::findPeer(Uint32 peer_id)
@@ -548,6 +550,7 @@ namespace bt
void PeerManager::setSuperSeeding(bool on,const BitSet & chunks)
{
+ Q_UNUSED(chunks);
if ((d->superseeder && on) || (!d->superseeder && !on))
return;
@@ -571,9 +574,8 @@ namespace bt
pp.port = addr.port();
pp.local = false;
d->potential_peers.insert(std::make_pair(pp.ip,pp));
+ p->kill();
}
-
- closeAllConnections();
}
void PeerManager::allowChunk(PeerInterface* peer, Uint32 chunk)
Index: src/torrent/torrentcontrol.cpp
===================================================================
--- src/torrent/torrentcontrol.cpp.orig 2010-12-30 14:38:17.000000000 +0200
+++ src/torrent/torrentcontrol.cpp 2011-01-15 16:03:44.113678723 +0200
@@ -496,8 +496,6 @@ namespace bt
pman->savePeerList(tordir + "peer_list");
pman->stop();
- pman->closeAllConnections();
- pman->clearDeadPeers();
cman->stop();
stats.running = false;

8
libktorrent.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Jan 15 14:09:54 UTC 2011 - davejplater@gmail.com
- Added patch libktorrent-1.1beta1-sprseedcrash.patch to fix crash
when switching from seeding to superseeding or vice versa, while
the torrent is running mostly with a private torrent. See :
kde #(261529), first reported in kde #(262560).
-------------------------------------------------------------------
Mon Jan 3 09:26:13 UTC 2011 - davejplater@gmail.com

5
libktorrent.spec
View File

@ -31,6 +31,8 @@ Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %{name}-%{srcversion}.tar.bz2
Source1: %{name}-po.tar.bz2
# Patch0 fixes superseeding crash, see : kde #(261529), first reported in kde #(262560).
Patch0: libktorrent-1.1beta1-sprseedcrash.patch
%description
Torrent is a BitTorrent program for KDE. Its main features are:
@ -79,6 +81,7 @@ Authors:
%prep
%setup -q -n %{name}-%{srcversion}
# -a 1
%patch0
echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt
echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt
echo "add_subdirectory( po ) " >> CMakeLists.txt
@ -105,10 +108,12 @@ echo "add_subdirectory( po ) " >> CMakeLists.txt
%files -n libktorrent3-lang -f build/%name.lang
%defattr(-,root,root)
%if 0%{?suse_version} < 1140
%dir /usr/share/locale/sr@ijekavian
%dir /usr/share/locale/sr@ijekavian/LC_MESSAGES
%dir /usr/share/locale/sr@ijekavianlatin
%dir /usr/share/locale/sr@ijekavianlatin/LC_MESSAGES
%endif
%files -n libktorrent3
%defattr(-,root,root)