rev 9107 - in kde-extras/ktorrent/branches/experimental/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Wed Jan 23 13:06:36 UTC 2008 

Author: modax-guest
Date: 2008-01-23 13:06:35 +0000 (Wed, 23 Jan 2008)
New Revision: 9107

Added:
   kde-extras/ktorrent/branches/experimental/debian/patches/02_kclosestnodessearch_endless_loop.diff
Modified:
   kde-extras/ktorrent/branches/experimental/debian/changelog
   kde-extras/ktorrent/branches/experimental/debian/compat
   kde-extras/ktorrent/branches/experimental/debian/libbtcore-dev.install
   kde-extras/ktorrent/branches/experimental/debian/patches/series
   kde-extras/ktorrent/branches/experimental/debian/rules
Log:
* new svn snapshot
* found and fixed a "endless loop & memory hog" bug.

Modified: kde-extras/ktorrent/branches/experimental/debian/changelog
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
+++ kde-extras/ktorrent/branches/experimental/debian/changelog	2008-01-23 13:06:35 UTC (rev 9107)
@@ -1,12 +1,12 @@
-ktorrent (3.0~beta1+svn763151.dfsg.1-1~pre1) UNRELEASED; urgency=low
+ktorrent (3.0~beta1+svn764866.dfsg.1-1~pre1) UNRELEASED; urgency=low
 
   [ Modestas Vainius ]
   * New upstream development snapshot for KDE4:
     - Original tarball has never been officially released upstream, it was
       directly generated from KDE subversion trunk repository.
-    - It's a 3.0 post beta1 svn snapshot as of revision r763151.
-    - Last commit (r763151) is dated 2008-01-18 20:52:32 +0200.
-    - The latest (as of 2008-01-19 14:56:25 +0200) translations are included
+    - It's a 3.0 post beta1 svn snapshot as of revision r764866.
+    - Last commit (r764866) is dated Tue Jan 22 18:57:57 2008 UTC.
+    - The latest (as of 2008-01-23 14:47:30 +0200) translations are included
       in the tarball.
     - ktorrent 3.0 from SVN still needs pruning to be DFSG free. The list of
       files to be pruned did not change from 2.2.4 release.
@@ -22,11 +22,19 @@
     debian/control source section instead.
   * New binary packages (libbtcore1 and libbtcore-dev) for btcore public
     library.
-  * Add kdebase-runtime-data-common as alternative for kdebase-data in
+  * Add kdebase-runtime-data-common as an alternative for kdebase-data in
     ktorrent Recommends. They both ship flags used by ktorrent infowidget
     plugin.
+  * Remove all patches from ktorrent 2.2.x. Add new patches:
+    - 01_system_geoip_and_flags.diff - add support for "system GeoIP" and
+      ability to skip installation of builtin country flags to the build
+      system.
+    - 02_kclosestnodessearch_endless_loop.dif - fix a serious endless loop
+      in DHT code which made ktorrent eat all available memory making machine
+      completely unusable until ktorrent eventually gets killed by the kernel
+      (which, unfortunately, seems to take a long time on Linux).
 
- -- Modestas Vainius <modestas at vainius.eu>  Sat, 19 Jan 2008 21:04:14 +0200
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 23 Jan 2008 14:46:13 +0200
 
 ktorrent (2.2.4.dfsg.1-1) unstable; urgency=medium
 

Modified: kde-extras/ktorrent/branches/experimental/debian/compat
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/compat	2008-01-23 07:29:22 UTC (rev 9106)
+++ kde-extras/ktorrent/branches/experimental/debian/compat	2008-01-23 13:06:35 UTC (rev 9107)
@@ -1 +1 @@
-6
+5

Modified: kde-extras/ktorrent/branches/experimental/debian/libbtcore-dev.install
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/libbtcore-dev.install	2008-01-23 07:29:22 UTC (rev 9106)
+++ kde-extras/ktorrent/branches/experimental/debian/libbtcore-dev.install	2008-01-23 13:06:35 UTC (rev 9107)
@@ -1,55 +1,3 @@
-debian/tmp/usr/include/libbtcore/bcodec/bdecoder.h
-debian/tmp/usr/include/libbtcore/bcodec/bencoder.h
-debian/tmp/usr/include/libbtcore/bcodec/bnode.h
-debian/tmp/usr/include/libbtcore/bcodec/value.h
-debian/tmp/usr/include/libbtcore/btcore_export.h
-debian/tmp/usr/include/libbtcore/btversion.h
-debian/tmp/usr/include/libbtcore/datachecker/datacheckerlistener.h
-debian/tmp/usr/include/libbtcore/diskio/cache.h
-debian/tmp/usr/include/libbtcore/diskio/chunkmanager.h
-debian/tmp/usr/include/libbtcore/interfaces/chunkdownloadinterface.h
-debian/tmp/usr/include/libbtcore/interfaces/exitoperation.h
-debian/tmp/usr/include/libbtcore/interfaces/ipblockinginterface.h
-debian/tmp/usr/include/libbtcore/interfaces/logmonitorinterface.h
-debian/tmp/usr/include/libbtcore/interfaces/monitorinterface.h
-debian/tmp/usr/include/libbtcore/interfaces/peerinterface.h
-debian/tmp/usr/include/libbtcore/interfaces/peersource.h
-debian/tmp/usr/include/libbtcore/interfaces/queuemanagerinterface.h
-debian/tmp/usr/include/libbtcore/interfaces/torrentfileinterface.h
-debian/tmp/usr/include/libbtcore/interfaces/torrentinterface.h
-debian/tmp/usr/include/libbtcore/interfaces/trackerslist.h
-debian/tmp/usr/include/libbtcore/mse/streamsocket.h
-debian/tmp/usr/include/libbtcore/net/address.h
-debian/tmp/usr/include/libbtcore/net/portlist.h
-debian/tmp/usr/include/libbtcore/net/socket.h
-debian/tmp/usr/include/libbtcore/net/socketmonitor.h
-debian/tmp/usr/include/libbtcore/peer/authenticationmonitor.h
-debian/tmp/usr/include/libbtcore/peer/peerid.h
-debian/tmp/usr/include/libbtcore/peer/peermanager.h
-debian/tmp/usr/include/libbtcore/torrent/choker.h
-debian/tmp/usr/include/libbtcore/torrent/globals.h
-debian/tmp/usr/include/libbtcore/torrent/ipblocklist.h
-debian/tmp/usr/include/libbtcore/torrent/server.h
-debian/tmp/usr/include/libbtcore/torrent/timeestimator.h
-debian/tmp/usr/include/libbtcore/torrent/torrent.h
-debian/tmp/usr/include/libbtcore/torrent/torrentcontrol.h
-debian/tmp/usr/include/libbtcore/torrent/torrentcreator.h
-debian/tmp/usr/include/libbtcore/torrent/torrentfile.h
-debian/tmp/usr/include/libbtcore/tracker/httptracker.h
-debian/tmp/usr/include/libbtcore/tracker/tracker.h
-debian/tmp/usr/include/libbtcore/tracker/udptrackersocket.h
-debian/tmp/usr/include/libbtcore/util/array.h
-debian/tmp/usr/include/libbtcore/util/bitset.h
-debian/tmp/usr/include/libbtcore/util/constants.h
-debian/tmp/usr/include/libbtcore/util/error.h
-debian/tmp/usr/include/libbtcore/util/file.h
-debian/tmp/usr/include/libbtcore/util/fileops.h
-debian/tmp/usr/include/libbtcore/util/functions.h
-debian/tmp/usr/include/libbtcore/util/log.h
-debian/tmp/usr/include/libbtcore/util/ptrmap.h
-debian/tmp/usr/include/libbtcore/util/sha1hash.h
-debian/tmp/usr/include/libbtcore/util/sha1hashgen.h
-debian/tmp/usr/include/libbtcore/util/timer.h
-debian/tmp/usr/include/libbtcore/util/waitjob.h
+debian/tmp/usr/include/libbtcore/*
 debian/tmp/usr/lib/libbtcore.so
 debian/tmp/usr/share/kde4/apps/cmake/modules/FindBTCore.cmake

Added: kde-extras/ktorrent/branches/experimental/debian/patches/02_kclosestnodessearch_endless_loop.diff
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/patches/02_kclosestnodessearch_endless_loop.diff	                        (rev 0)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/02_kclosestnodessearch_endless_loop.diff	2008-01-23 13:06:35 UTC (rev 9107)
@@ -0,0 +1,22 @@
+--- ktorrent/libbtcore/dht/kclosestnodessearch.cpp	2008-01-23 14:25:19.000000000 +0200
++++ ktorrent/libbtcore/dht/kclosestnodessearch.cpp	2008-01-23 14:28:17.000000000 +0200
+@@ -67,10 +67,7 @@
+ 	
+ 	void KClosestNodesSearch::pack(PackedNodeContainer* cnt)
+ 	{
+-		Uint32 j = 0;
+-		
+-		KNSitr i = emap.begin();
+-		while (i != emap.end())
++		for (KNSitr i = emap.begin(); i != emap.end(); i++)
+ 		{
+ 			const KBucketEntry & e = i->second;
+ 			if (e.getAddress().ipVersion() == 4)
+@@ -85,7 +82,6 @@
+ 				PackBucketEntry(i->second,d,0);
+ 				cnt->addNode(d);
+ 			}
+-			j++;
+ 		}
+ 	}
+ 

Modified: kde-extras/ktorrent/branches/experimental/debian/patches/series
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/patches/series	2008-01-23 07:29:22 UTC (rev 9106)
+++ kde-extras/ktorrent/branches/experimental/debian/patches/series	2008-01-23 13:06:35 UTC (rev 9107)
@@ -1 +1,2 @@
 01_system_geoip_and_flags.diff
+02_kclosestnodessearch_endless_loop.diff

Modified: kde-extras/ktorrent/branches/experimental/debian/rules
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/rules	2008-01-23 07:29:22 UTC (rev 9106)
+++ kde-extras/ktorrent/branches/experimental/debian/rules	2008-01-23 13:06:35 UTC (rev 9107)
@@ -5,8 +5,13 @@
 DEB_CMAKE_EXTRA_FLAGS += -DWITH_SYSTEM_GEOIP:BOOL=ON \
                          -DWITH_BUILTIN_COUNTRY_FLAGS:BOOL=OFF
 
-DEB_DH_INSTALL_ARGS=
+DEB_DH_INSTALL_ARGS =
 
+DEB_DBG_PACKAGE_ALL = ktorrent-dbg
+
+libbtcore1-binary-fixup::
+	dpkg-gensymbols -Pdebian/libbtcore1 -plibbtcore1
+
 prune-tarball:
 	# Remove non-free components: flags and geoip data file
 	rm -f plugins/infowidget/geoip/*.png

More information about the pkg-kde-commits mailing list