rev 6114 - in kde-extras: . ktorrent ktorrent/trunk
ktorrent/trunk/debian
Modestas Vainius
modax-guest at alioth.debian.org
Thu May 10 09:30:00 UTC 2007
Author: modax-guest
Date: 2007-05-10 09:29:58 +0000 (Thu, 10 May 2007)
New Revision: 6114
Added:
kde-extras/ktorrent/
kde-extras/ktorrent/branches/
kde-extras/ktorrent/tags/
kde-extras/ktorrent/trunk/
kde-extras/ktorrent/trunk/debian/
kde-extras/ktorrent/trunk/debian/README.Debian
kde-extras/ktorrent/trunk/debian/changelog
kde-extras/ktorrent/trunk/debian/compat
kde-extras/ktorrent/trunk/debian/control
kde-extras/ktorrent/trunk/debian/copyright
kde-extras/ktorrent/trunk/debian/ktorrent.docs
kde-extras/ktorrent/trunk/debian/overrides.linda
kde-extras/ktorrent/trunk/debian/overrides.lintian
kde-extras/ktorrent/trunk/debian/rules
kde-extras/ktorrent/trunk/source-patches.diff
Log:
Importing 2.0.3+dfsg1-2.2 as it is. All source patches are in source-patches.diff for completeness
Added: kde-extras/ktorrent/trunk/debian/README.Debian
===================================================================
--- kde-extras/ktorrent/trunk/debian/README.Debian 2007-05-10 06:55:52 UTC (rev 6113)
+++ kde-extras/ktorrent/trunk/debian/README.Debian 2007-05-10 09:29:58 UTC (rev 6114)
@@ -0,0 +1,25 @@
+Due to licensing restrictions, the source and binary packages of ktorrent do
+not include a GeoIP database. The binary package *is* built to support it
+however (the API is GPL, but data used from ARIN to generate the data files
+is *not* DFSG compliant). If you wish to use the GeoIP support, there are free
+databases made available at the following URL:
+
+http://www.maxmind.com/app/geoip_country
+
+Place the uncompressed database file in /usr/share/apps/ktorrent/geoip/ and
+the country information will be displayed in the peers tab. The commercial
+version offered *should* also work, but I have no means to confirm or deny
+this.
+
+The flag images are also not distributed with this package. Although the
+original author seems to wish the grant free use, the verbage used in
+granting it restricts their use to websites. I've tried, and will continue
+to try to contact him and find a resolution.
+
+----
+
+The upstream source was modified in the following ways:
+ removed ./plugins/infowidget/geoip/
+ includes (geoip.dat *.png FLAGS_LICENSE GeoIP-LICENSE.txt Makefile.*)
+ modified ./plugins/infowidget/Makefile.{am,in} to not depend on above
+ appended "+dfsg1" to base directory name
Added: kde-extras/ktorrent/trunk/debian/changelog
===================================================================
--- kde-extras/ktorrent/trunk/debian/changelog 2007-05-10 06:55:52 UTC (rev 6113)
+++ kde-extras/ktorrent/trunk/debian/changelog 2007-05-10 09:29:58 UTC (rev 6114)
@@ -0,0 +1,85 @@
+ktorrent (2.0.3+dfsg1-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Redo the previous patch without kilt, integrating it into the buildsystem
+ directly (yuck !).
+
+ -- Pierre Habouzit <madcoder at debian.org> Thu, 22 Mar 2007 16:41:39 +0100
+
+ktorrent (2.0.3+dfsg1-2.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Fix security issue (Closes: 414832, 414830):
+ + drop patch from #414832 in debian/patches.
+ + use quilt as a patches management system to deal with it.
+ + urgency set to high due to RC bugfix.
+
+ -- Pierre Habouzit <madcoder at debian.org> Thu, 22 Mar 2007 11:11:20 +0100
+
+ktorrent (2.0.3+dfsg1-2) unstable; urgency=low
+
+ * Resolve FTBFS - remove nonportable "-z now" from LDFLAGS (Closes: 395897)
+
+ -- Joel Johnson <mrjoel at lixil.net> Wed, 01 Nov 2006 14:06:36 -0800
+
+ktorrent (2.0.3+dfsg1-1) unstable; urgency=medium
+
+ * new upstream release (Closes: 392687)
+ + speed issues fix
+ * urgency=medium in order to get this into etch in time
+
+ -- Joel Johnson <mrjoel at lixil.net> Fri, 20 Oct 2006 11:13:24 -0700
+
+ktorrent (2.0.2+dfsg1-1) unstable; urgency=medium
+
+ * New upstream release (skipping 2.0, 2.0.1) (Closes: 378947, 384131)
+ * built with GeoIP support enabled, but removed the database file
+ and country flags due to licensing restrictions (see README.Debian)
+ * urgency=medium in order to get this into etch in time
+
+ -- Joel Johnson <mrjoel at lixil.net> Fri, 06 Oct 2006 09:15:07 -0700
+
+ktorrent (1.2-1) unstable; urgency=low
+
+ * Acknowledge NMU (Closes: 349983)
+ Actually removed debian libtoolization temporarily due to
+ package inclusion of a library in upstream. Soon to be reapplied
+ with proper support for avoiding redundant dependencies.
+ * New upstream release (Closes: 348605)
+ + Doesn't freeze/lock anymore (Closes: 340766)
+ + Properly builds with G++ 4.1 (Closes: 357096)
+ * add shlib support and post{inst,rm} via debhelper for new shared library
+ * Set --enable-final as configure directive
+ * Update copyright file to reflect additional files and changed dir layout
+ * patch upstream Makefile.in to include translations directory
+ * Update upstream homepage URL in control
+
+ -- Joel Johnson <mrjoel at lixil.net> Tue, 6 Jun 2006 22:07:58 -0700
+
+ktorrent (1.1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload by sponsor due to no maintainer reaction.
+ * Relibtoolize _after_ setting AM_MAINTAINER_MODE (Closes: #349983)
+
+ -- Florian Ernst <florian at debian.org> Tue, 7 Feb 2006 13:15:30 +0100
+
+ktorrent (1.1-2) unstable; urgency=low
+
+ * Limit build dependencies to what we directly depend on
+ and set AM_MAINTAINER_MODE in configure.in.in
+ * Change section from net to kde
+ * Remove sponsor as Uploader as requested
+
+ -- Joel Johnson <mrjoel at lixil.net> Thu, 1 Dec 2005 13:11:22 -0800
+
+ktorrent (1.1-1) unstable; urgency=low
+
+ * Initial Debian Upload (Closes: #313659)
+ * Update copyright file with new FSF address
+ * Incorporate changes to a previous package version
+ - disable rpath in ./configure
+ - add lintian override (missing manpage)
+ Thanks to Jonathan Riddell <jriddell at ubuntu.com>
+ * Add linda override (missing manpage)
+
+ -- Joel Johnson <mrjoel at lixil.net> Thu, 24 Oct 2005 08:47:09 -0700
Added: kde-extras/ktorrent/trunk/debian/compat
===================================================================
--- kde-extras/ktorrent/trunk/debian/compat 2007-05-10 06:55:52 UTC (rev 6113)
+++ kde-extras/ktorrent/trunk/debian/compat 2007-05-10 09:29:58 UTC (rev 6114)
@@ -0,0 +1 @@
+5
Added: kde-extras/ktorrent/trunk/debian/control
===================================================================
--- kde-extras/ktorrent/trunk/debian/control 2007-05-10 06:55:52 UTC (rev 6113)
+++ kde-extras/ktorrent/trunk/debian/control 2007-05-10 09:29:58 UTC (rev 6114)
@@ -0,0 +1,17 @@
+Source: ktorrent
+Section: kde
+Priority: optional
+Maintainer: Joel Johnson <mrjoel at lixil.net>
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, kdelibs4-dev, libpcre3-dev, libx11-dev, libgmp3-dev
+Standards-Version: 3.7.2.0
+
+Package: ktorrent
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: BitTorrent client for KDE
+ KTorrent is a BitTorrent program for KDE. Its features include speed capping
+ (both down and up), integrated searching, UDP tracker support, UPnP support,
+ IP blocking plugin, protocol encryption, file prioritization and integration
+ into the KDE Panel enabling background downloading.
+ .
+ Homepage: http://ktorrent.org
Added: kde-extras/ktorrent/trunk/debian/copyright
===================================================================
--- kde-extras/ktorrent/trunk/debian/copyright 2007-05-10 06:55:52 UTC (rev 6113)
+++ kde-extras/ktorrent/trunk/debian/copyright 2007-05-10 09:29:58 UTC (rev 6114)
@@ -0,0 +1,129 @@
+This package was debianized by Joel Johnson <mrjoel at lixil.net> on
+Tue, 21 Jun 2005 11:19:46 -0700.
+
+The original source was downloaded from
+http://ktorrent.org/downloads/1.2/ktorrent-1.2.tar.gz
+
+All files are Copyright Joris Guisson <joris.guisson at gmail.com>
+unless otherwise indicated below:
+
+Copyright (C) by
+Joris Guisson <joris.guisson at gmail.com>
+Ivan Vasic <ivasic at gmail.com>
+ apps/ktorrent/ktorrent.cpp
+ apps/ktorrent/ktorrentcore.cpp
+ apps/ktorrent/pastedialog.h
+ apps/ktorrent/pastedialog.cpp
+ apps/ktorrent/ktorrentview.h
+ apps/ktorrent/ktorrentview.cpp
+ apps/ktorrent/trayicon.h
+ apps/ktorrent/trayicon.cpp
+ libktorrent/interfaces/ipblockinginterface.h
+ libktorrent/interfaces/ipblockinginterface.cpp
+ libktorrent/torrent/ipblocklist.h
+ libktorrent/torrent/ipblocklist.cpp
+ libktorrent/torrent/torrentfile.h
+ libktorrent/torrent/torrentfile.cpp
+ libktorrent/torrent/torrent.h
+ libktorrent/torrent/torrent.cpp
+ libktorrent/torrent/chunkmanager.cpp
+ libktorrent/torrent/torrentcontrol.h
+ libktorrent/torrent/torrentcontrol.cpp
+ libktorrent/torrent/queuemanager.h
+ libktorrent/torrent/queuemanager.cpp
+ plugins/infowidget/trackerview.h
+ plugins/ipfilter/ipblockingprefpage.h
+ plugins/ipfilter/ipblockingprefpage.cpp
+ plugins/ipfilter/ipfilterplugin.h
+ plugins/ipfilter/ipfilterplugin.cpp
+ plugins/ipfilter/antip2p.h
+ plugins/ipfilter/antip2p.cpp
+ plugins/search/searchprefpage.cpp
+ plugins/search/searchwidget.cpp
+
+Copyright (C) by
+Ivan Vasic <ivasic at gmail.com>
+ apps/ktorrent/queuedialog.h
+ apps/ktorrent/queuedialog.cpp
+ libktorrent/interfaces/trackerslist.h
+ plugins/scanfolder/scanfolder.h
+ plugins/scanfolder/scanfolder.cpp
+ plugins/scanfolder/scanfolderplugin.h
+ plugins/scanfolder/scanfolderplugin.cpp
+ plugins/scanfolder/scanfolderprefpagewidget.h
+ plugins/scanfolder/scanfolderprefpagewidget.cpp
+ plugins/scanfolder/scanfolderprefpage.h
+ plugins/scanfolder/scanfolderprefpage.cpp
+ plugins/scheduler/bwswidget.h
+ plugins/scheduler/bwswidget.cpp
+ plugins/scheduler/schedulerprefpage.h
+ plugins/scheduler/schedulerprefpage.cpp
+ plugins/scheduler/schedulerprefpagewidget.h
+ plugins/scheduler/schedulerprefpagewidget.cpp
+ plugins/scheduler/bwscheduler.h
+ plugins/scheduler/bwscheduler.cpp
+ plugins/scheduler/bwsprefpagewidget.h
+ plugins/scheduler/bwsprefpagewidget.cpp
+ plugins/scheduler/schedulerplugin.h
+ plugins/scheduler/schedulerplugin.cpp
+ plugins/logviewer/logprefpage.h
+ plugins/logviewer/logprefpage.cpp
+ plugins/logviewer/logprefwidget.h
+ plugins/logviewer/logprefwidget.cpp
+ plugins/logviewer/logflags.h
+ plugins/logviewer/logflags.cpp
+
+Copyright (C) by
+Joris Guisson <joris.guisson at gmail.com>
+Vincent Wagelaar <vincent at ricardis.tudelft.nl>
+ plugins/infowidget/chunkbar.h
+ plugins/infowidget/chunkbar.cpp
+
+Copyright (C) by
+Adam Treat <treat at kde.org>
+ apps/ktorrent/ktorrentapp.h
+ apps/ktorrent/ktorrentapp.cpp
+
+Copyright (C) by
+Joris Guisson <joris.guisson at gmail.com>
+Maggioni Marcello <marcello.maggioni at gmail.com>
+ libktorrent/datachecker/multidatachecker.cpp
+
+Copyright (C) by
+Joris Guisson <joris.guisson at gmail.com>
+Vincent Wagelaar <vincent at ricardis.tudelft.nl>
+Jonas Widarsson <jonas at widarsson.com>
+ plugins/infowidget/localefloatvalidator.h
+ plugins/infowidget/localefloatvalidator.cpp
+ plugins/infowidget/floatspinbox.h
+ plugins/infowidget/floatspinbox.cpp
+
+Copyright (C) by
+Joris Guisson <joris.guisson at gmail.com>
+Ivan Vasic <ivasic at gmail.com>
+Maggioni Marcello <marcello.maggioni at gmail.com>
+ plugins/infowidget/infowidget.h
+ plugins/infowidget/infowidget.cpp
+
+Copyright (c) 2003 MaxMind LLC.
+ plugins/infowidget/GeoIP.h
+ plugins/infowidget/GeoIP.c
+
+License (for all components):
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
Added: kde-extras/ktorrent/trunk/debian/ktorrent.docs
===================================================================
--- kde-extras/ktorrent/trunk/debian/ktorrent.docs 2007-05-10 06:55:52 UTC (rev 6113)
+++ kde-extras/ktorrent/trunk/debian/ktorrent.docs 2007-05-10 09:29:58 UTC (rev 6114)
@@ -0,0 +1 @@
+AUTHORS
Added: kde-extras/ktorrent/trunk/debian/overrides.linda
===================================================================
--- kde-extras/ktorrent/trunk/debian/overrides.linda 2007-05-10 06:55:52 UTC (rev 6113)
+++ kde-extras/ktorrent/trunk/debian/overrides.linda 2007-05-10 09:29:58 UTC (rev 6114)
@@ -0,0 +1 @@
+Tag: no-manual-for-binary
Added: kde-extras/ktorrent/trunk/debian/overrides.lintian
===================================================================
--- kde-extras/ktorrent/trunk/debian/overrides.lintian 2007-05-10 06:55:52 UTC (rev 6113)
+++ kde-extras/ktorrent/trunk/debian/overrides.lintian 2007-05-10 09:29:58 UTC (rev 6114)
@@ -0,0 +1,3 @@
+ktorrent: binary-without-manpage ktorrent
+ktorrent: binary-without-manpage ktshell
+ktorrent: package-name-doesnt-match-sonames libktorrent0
Added: kde-extras/ktorrent/trunk/debian/rules
===================================================================
--- kde-extras/ktorrent/trunk/debian/rules 2007-05-10 06:55:52 UTC (rev 6113)
+++ kde-extras/ktorrent/trunk/debian/rules 2007-05-10 09:29:58 UTC (rev 6114)
@@ -0,0 +1,85 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+config.status: configure
+ dh_testdir
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+ --prefix=/usr --mandir=\$${prefix}/share/man --disable-rpath \
+ --enable-geoip --enable-final
+
+build: build-stamp
+
+build-stamp: config.status
+ dh_testdir
+ $(MAKE)
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ [ ! -f Makefile ] || make distclean
+ [ ! -f config.sub ] || rm -f config.sub
+ [ ! -f config.guess ] || rm -f config.guess
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/ktorrent
+
+ # Install linda/lintian overrides
+ install -D -o root -g root -m 0644 debian/overrides.lintian \
+ $(CURDIR)/debian/ktorrent/usr/share/lintian/overrides/ktorrent
+ install -D -o root -g root -m 0644 debian/overrides.linda \
+ $(CURDIR)/debian/ktorrent/usr/share/linda/overrides/ktorrent
+
+ # Clean up after the upstream installer a bit
+ rm -f debian/ktorrent/usr/share/applnk/Internet/ktorrent.desktop
+ rmdir debian/ktorrent/usr/share/applnk/Internet/
+ rmdir debian/ktorrent/usr/share/applnk/
+ rm -f debian/ktorrent/usr/bin/ktcachecheck
+ rm -f debian/ktorrent/usr/bin/kttorinfo
+ rm -f debian/ktorrent/usr/bin/ktupnptest
+
+ # The API license, which is all we distribute is GPL
+ rm -f debian/ktorrent/usr/share/apps/ktorrent/geoip/GeoIP-LICENSE.txt
+
+ # Remove libs to link against when building (no -dev package)
+ rm -f debian/ktorrent/usr/lib/libktorrent.so
+ #rm -f debian/ktorrent/usr/lib/libktorrent.la
+
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-indep:
+ # nop - no common archives
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Property changes on: kde-extras/ktorrent/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+
Added: kde-extras/ktorrent/trunk/source-patches.diff
===================================================================
--- kde-extras/ktorrent/trunk/source-patches.diff 2007-05-10 06:55:52 UTC (rev 6113)
+++ kde-extras/ktorrent/trunk/source-patches.diff 2007-05-10 09:29:58 UTC (rev 6114)
@@ -0,0 +1,150 @@
+--- ktorrent-2.0.3+dfsg1.orig/libktorrent/torrent/peer.cpp
++++ ktorrent-2.0.3+dfsg1/libktorrent/torrent/peer.cpp
+@@ -182,11 +182,21 @@
+ {
+ Out() << "len err HAVE" << endl;
+ kill();
+- return;
+ }
+-
+- haveChunk(this,ReadUint32(tmp_buf,1));
+- pieces.set(ReadUint32(tmp_buf,1),true);
++ else
++ {
++ Uint32 ch = ReadUint32(tmp_buf,1);
++ if (ch < pieces.getNumBits())
++ {
++ haveChunk(this,ch);
++ pieces.set(ch,true);
++ }
++ else
++ {
++ Out(SYS_CON|LOG_NOTICE) << "Received invalid have value, kicking peer" << endl;
++ kill();
++ }
++ }
+ break;
+ case BITFIELD:
+ if (len != 1 + pieces.getNumBytes())
+--- ktorrent-2.0.3+dfsg1.orig/libktorrent/torrent/torrent.cpp
++++ ktorrent-2.0.3+dfsg1/libktorrent/torrent/torrent.cpp
+@@ -141,9 +141,13 @@
+ if (!v || v->data().getType() != Value::STRING)
+ throw Error(i18n("Corrupted torrent!"));
+
+- path += v->data().toString(encoding);
+- if (j + 1 < ln->getNumChildren())
+- path += bt::DirSeparator();
++ QString sd = v->data().toString(encoding);
++ if (sd != "..")
++ {
++ path += sd;
++ if (j + 1 < ln->getNumChildren())
++ path += bt::DirSeparator();
++ }
+ }
+
+ // we do not want empty dirs
+--- ktorrent-2.0.3+dfsg1.orig/libktorrent/torrent/chunkcounter.cpp
++++ ktorrent-2.0.3+dfsg1/libktorrent/torrent/chunkcounter.cpp
+@@ -59,12 +59,13 @@
+
+ void ChunkCounter::inc(Uint32 idx)
+ {
++ if (idx < cnt.size())
+ cnt[idx]++;
+ }
+
+ void ChunkCounter::dec(Uint32 idx)
+ {
+- if (cnt[idx] > 0)
++ if (idx < cnt.size() && cnt[idx] > 0)
+ cnt[idx]--;
+ }
+
+--- ktorrent-2.0.3+dfsg1.orig/configure
++++ ktorrent-2.0.3+dfsg1/configure
+@@ -31299,7 +31299,7 @@
+
+ #MIN_CONFIG(3.3)
+ CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS $USE_EXCEPTIONS $USE_RTTI"
+-LDFLAGS="$LDFLAGS -Wl -z now"
++LDFLAGS="$LDFLAGS -Wl"
+
+
+ # Check whether --enable-largefile or --disable-largefile was given.
+--- ktorrent-2.0.3+dfsg1.orig/libktorrent/torrent/peer.cpp
++++ ktorrent-2.0.3+dfsg1/libktorrent/torrent/peer.cpp
+@@ -182,11 +182,21 @@
+ {
+ Out() << "len err HAVE" << endl;
+ kill();
+- return;
+ }
+-
+- haveChunk(this,ReadUint32(tmp_buf,1));
+- pieces.set(ReadUint32(tmp_buf,1),true);
++ else
++ {
++ Uint32 ch = ReadUint32(tmp_buf,1);
++ if (ch < pieces.getNumBits())
++ {
++ haveChunk(this,ch);
++ pieces.set(ch,true);
++ }
++ else
++ {
++ Out(SYS_CON|LOG_NOTICE) << "Received invalid have value, kicking peer" << endl;
++ kill();
++ }
++ }
+ break;
+ case BITFIELD:
+ if (len != 1 + pieces.getNumBytes())
+--- ktorrent-2.0.3+dfsg1.orig/libktorrent/torrent/torrent.cpp
++++ ktorrent-2.0.3+dfsg1/libktorrent/torrent/torrent.cpp
+@@ -141,9 +141,13 @@
+ if (!v || v->data().getType() != Value::STRING)
+ throw Error(i18n("Corrupted torrent!"));
+
+- path += v->data().toString(encoding);
+- if (j + 1 < ln->getNumChildren())
+- path += bt::DirSeparator();
++ QString sd = v->data().toString(encoding);
++ if (sd != "..")
++ {
++ path += sd;
++ if (j + 1 < ln->getNumChildren())
++ path += bt::DirSeparator();
++ }
+ }
+
+ // we do not want empty dirs
+--- ktorrent-2.0.3+dfsg1.orig/libktorrent/torrent/chunkcounter.cpp
++++ ktorrent-2.0.3+dfsg1/libktorrent/torrent/chunkcounter.cpp
+@@ -59,12 +59,13 @@
+
+ void ChunkCounter::inc(Uint32 idx)
+ {
++ if (idx < cnt.size())
+ cnt[idx]++;
+ }
+
+ void ChunkCounter::dec(Uint32 idx)
+ {
+- if (cnt[idx] > 0)
++ if (idx < cnt.size() && cnt[idx] > 0)
+ cnt[idx]--;
+ }
+
+--- ktorrent-2.0.3+dfsg1.orig/configure
++++ ktorrent-2.0.3+dfsg1/configure
+@@ -31299,7 +31299,7 @@
+
+ #MIN_CONFIG(3.3)
+ CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS $USE_EXCEPTIONS $USE_RTTI"
+-LDFLAGS="$LDFLAGS -Wl -z now"
++LDFLAGS="$LDFLAGS -Wl"
+
+
+ # Check whether --enable-largefile or --disable-largefile was given.
More information about the pkg-kde-commits
mailing list