Update to 2.1.4 (security fix), based on patches provided

by Sergey Svishchev.

Changes in 2.1.4
- Fixed crash in parsing of DHT messages
- Fixed problem with files with .. in their name
- ScanFolder can now handle incomplete torrent files properly

Changes in 2.1.3
- Fixed crash in torrent parsing

Changes in 2.1.2
- Fix 2 security vulnerabilities (thanks to Bryan Burns from Juniper Networks
for finding them)

Changes in 2.1.1
- Rewrite of webserver
- New webgui : coldmilk
- Networking thread has been split up in 2 threads, one for upload, one for
download
- Significant speed improvements when downloading over a LAN

Changes in 2.1
- Some minor bug fixes

Changes in 2.1rc1
- Share ratio column added in main view
- Added option to use a different proxy then the default KDE proxy for HTTP trackers
- Added feature to show/hide columns in main view
- Moved search box to bottom, so that the window is not enlarged in 1024 x 768 resolutions, when you search for something
- Made sure no duplicates get into search box history
- Fixed 'Trackers' tab in InfoWidget to properly resize tracker URL label
- Zeroconf plugin added
- Added µTorrent compatible PEX
- Fixed a bug in WebInterface plugin causing JS tooltips not to show.
- Fixed a bug with 'Stop All' not stopping queued torrents.

5 files changed, 62 insertions, 43 deletions

diff --git a/net/ktorrent/Makefile b/net/ktorrent/Makefile
index e589717e067..3eacb0151a4 100644
--- a/net/ktorrent/Makefile
+++ b/net/ktorrent/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2007/01/26 04:34:53 markd Exp $
+# $NetBSD: Makefile,v 1.7 2007/06/21 19:32:54 wiz Exp $
 
 DISTNAME=	ktorrent-${KTORRENT_VER}
-PKGREVISION=	3
 CATEGORIES=	net kde
 MASTER_SITES=	http://ktorrent.org/downloads/${KTORRENT_VER}/
 
-KTORRENT_VER=	2.1beta1
+KTORRENT_VER=	2.1.4
 
 MAINTAINER=	shattered@users.sourceforge.net
 HOMEPAGE=	http://ktorrent.org/
@@ -15,7 +14,7 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		msgfmt perl:run
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/net/ktorrent/PLIST b/net/ktorrent/PLIST
index f686558fdc1..9504cf08762 100644
--- a/net/ktorrent/PLIST
+++ b/net/ktorrent/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2007/01/26 04:34:53 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/06/21 19:32:54 wiz Exp $
 bin/ktcachecheck
 bin/ktorrent
 bin/ktshell
@@ -299,19 +299,50 @@ share/kde/apps/ktorrent/icons/hicolor/64x64/filesystems/ktprefdownloads.png
 share/kde/apps/ktorrent/ktorrentui.rc
 share/kde/apps/ktorrent/ktpartfileimportpluginui.rc
 share/kde/apps/ktorrent/ktschedulerpluginui.rc
+share/kde/apps/ktorrent/www/coldmilk/favicon.ico
+share/kde/apps/ktorrent/www/coldmilk/icon.png
+share/kde/apps/ktorrent/www/coldmilk/icons/16x16/edit_user.png
+share/kde/apps/ktorrent/www/coldmilk/icons/22x22/exit.png
+share/kde/apps/ktorrent/www/coldmilk/icons/22x22/ktstart_all.png
+share/kde/apps/ktorrent/www/coldmilk/icons/22x22/ktstop_all.png
+share/kde/apps/ktorrent/www/coldmilk/icons/22x22/remove.png
+share/kde/apps/ktorrent/www/coldmilk/icons/22x22/start.png
+share/kde/apps/ktorrent/www/coldmilk/icons/22x22/stop.png
+share/kde/apps/ktorrent/www/coldmilk/icons/32x32/configure.png
+share/kde/apps/ktorrent/www/coldmilk/icons/32x32/extender_opened.png
+share/kde/apps/ktorrent/www/coldmilk/icons/32x32/fileopen.png
+share/kde/apps/ktorrent/www/coldmilk/icons/32x32/folder1.png
+share/kde/apps/ktorrent/www/coldmilk/icons/48x48/exit.png
+share/kde/apps/ktorrent/www/coldmilk/icons/48x48/switchuser.png
+share/kde/apps/ktorrent/www/coldmilk/icons/64x64/down.png
+share/kde/apps/ktorrent/www/coldmilk/icons/64x64/folder1_man.png
+share/kde/apps/ktorrent/www/coldmilk/icons/64x64/looknfeel.png
+share/kde/apps/ktorrent/www/coldmilk/interface.js
+share/kde/apps/ktorrent/www/coldmilk/interface.php
+share/kde/apps/ktorrent/www/coldmilk/login.html
+share/kde/apps/ktorrent/www/coldmilk/page_update.js
+share/kde/apps/ktorrent/www/coldmilk/rest.php
+share/kde/apps/ktorrent/www/coldmilk/shutdown.php
+share/kde/apps/ktorrent/www/coldmilk/style.css
 share/kde/apps/ktorrent/www/default/favicon.ico
+share/kde/apps/ktorrent/www/default/grad1.jpg
+share/kde/apps/ktorrent/www/default/grad2.jpg
+share/kde/apps/ktorrent/www/default/header_tile.png
+share/kde/apps/ktorrent/www/default/icon.png
 share/kde/apps/ktorrent/www/default/interface.php
 share/kde/apps/ktorrent/www/default/ktorrentwebinterfacelogo.png
 share/kde/apps/ktorrent/www/default/login.html
-share/kde/apps/ktorrent/www/default/redirect.html
 share/kde/apps/ktorrent/www/default/remove.png
+share/kde/apps/ktorrent/www/default/shutdown.php
 share/kde/apps/ktorrent/www/default/start.png
 share/kde/apps/ktorrent/www/default/stop.png
+share/kde/apps/ktorrent/www/default/style.css
+share/kde/apps/ktorrent/www/default/stylen.css
+share/kde/apps/ktorrent/www/default/wz_tooltip.js
 share/kde/apps/ktorrent/www/mobile/favicon.ico
 share/kde/apps/ktorrent/www/mobile/interface.php
 share/kde/apps/ktorrent/www/mobile/ktorrentwebinterfacelogo.png
 share/kde/apps/ktorrent/www/mobile/login.html
-share/kde/apps/ktorrent/www/mobile/redirect.html
 share/kde/apps/ktorrent/www/mobile/remove.png
 share/kde/apps/ktorrent/www/mobile/settings.php
 share/kde/apps/ktorrent/www/mobile/start.png
@@ -337,6 +368,7 @@ share/kde/services/ktschedulerplugin.desktop
 share/kde/services/ktsearchplugin.desktop
 share/kde/services/ktupnpplugin.desktop
 share/kde/services/ktwebinterfaceplugin.desktop
+share/kde/services/ktzeroconfplugin.desktop
 share/kde/servicetypes/ktorrentplugin.desktop
 share/locale/ar/LC_MESSAGES/ktorrent.mo
 share/locale/bg/LC_MESSAGES/ktorrent.mo
@@ -350,15 +382,22 @@ share/locale/el/LC_MESSAGES/ktorrent.mo
 share/locale/en_GB/LC_MESSAGES/ktorrent.mo
 share/locale/es/LC_MESSAGES/ktorrent.mo
 share/locale/et/LC_MESSAGES/ktorrent.mo
+share/locale/eu/LC_MESSAGES/ktorrent.mo
+share/locale/fa/LC_MESSAGES/ktorrent.mo
+share/locale/fi/LC_MESSAGES/ktorrent.mo
 share/locale/fr/LC_MESSAGES/ktorrent.mo
 share/locale/ga/LC_MESSAGES/ktorrent.mo
 share/locale/gl/LC_MESSAGES/ktorrent.mo
+share/locale/hr/LC_MESSAGES/ktorrent.mo
 share/locale/hu/LC_MESSAGES/ktorrent.mo
 share/locale/it/LC_MESSAGES/ktorrent.mo
 share/locale/ja/LC_MESSAGES/ktorrent.mo
-share/locale/ka/LC_MESSAGES/ktorrent.mo
+share/locale/km/LC_MESSAGES/ktorrent.mo
 share/locale/lt/LC_MESSAGES/ktorrent.mo
+share/locale/mk/LC_MESSAGES/ktorrent.mo
 share/locale/ms/LC_MESSAGES/ktorrent.mo
+share/locale/nb/LC_MESSAGES/ktorrent.mo
+share/locale/nds/LC_MESSAGES/ktorrent.mo
 share/locale/nl/LC_MESSAGES/ktorrent.mo
 share/locale/pa/LC_MESSAGES/ktorrent.mo
 share/locale/pl/LC_MESSAGES/ktorrent.mo
@@ -380,6 +419,13 @@ share/locale/zh_TW/LC_MESSAGES/ktorrent.mo
 @comment in kde: @dirrm share/kde/config.kcfg
 @dirrm share/kde/apps/ktorrent/www/mobile
 @dirrm share/kde/apps/ktorrent/www/default
+@dirrm share/kde/apps/ktorrent/www/coldmilk/icons/64x64
+@dirrm share/kde/apps/ktorrent/www/coldmilk/icons/48x48
+@dirrm share/kde/apps/ktorrent/www/coldmilk/icons/32x32
+@dirrm share/kde/apps/ktorrent/www/coldmilk/icons/22x22
+@dirrm share/kde/apps/ktorrent/www/coldmilk/icons/16x16
+@dirrm share/kde/apps/ktorrent/www/coldmilk/icons
+@dirrm share/kde/apps/ktorrent/www/coldmilk
 @dirrm share/kde/apps/ktorrent/icons/hicolor/64x64/filesystems
 @dirrm share/kde/apps/ktorrent/icons/hicolor/64x64/actions
 @dirrm share/kde/apps/ktorrent/icons/hicolor/64x64
diff --git a/net/ktorrent/distinfo b/net/ktorrent/distinfo
index f5f961d95f2..dc5c2631e90 100644
--- a/net/ktorrent/distinfo
+++ b/net/ktorrent/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2007/01/13 18:54:24 joerg Exp $
+$NetBSD: distinfo,v 1.3 2007/06/21 19:32:54 wiz Exp $
 
-SHA1 (ktorrent-2.1beta1.tar.gz) = 433d0b6b8ef47d544f446d2b9026dfd455af8172
-RMD160 (ktorrent-2.1beta1.tar.gz) = 857b81de55ee117039a6577d3cbde5172edd7ae3
-Size (ktorrent-2.1beta1.tar.gz) = 3178912 bytes
-SHA1 (patch-aa) = 7f33855d20864ce5c97eedc8d897c5e7fa088d3d
-SHA1 (patch-ab) = d0b698d0215d7c7585435481ce4398e44abbf851
+SHA1 (ktorrent-2.1.4.tar.gz) = 454992ec5f0b4f67e62474cf863a2d66dbd77f28
+RMD160 (ktorrent-2.1.4.tar.gz) = 8286012e5fbc0bd827d5cb70c7895e5460f21a0b
+Size (ktorrent-2.1.4.tar.gz) = 3631999 bytes
+SHA1 (patch-aa) = 0d545e270b759427c1103b2c10c4fbc0968e7bf2
diff --git a/net/ktorrent/patches/patch-aa b/net/ktorrent/patches/patch-aa
index 2fb136d352d..ae9c11db411 100644
--- a/net/ktorrent/patches/patch-aa
+++ b/net/ktorrent/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2007/01/13 18:54:24 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2007/06/21 19:32:55 wiz Exp $
 
---- libktorrent/net/socket.cpp.orig	2006-11-21 19:08:44.000000000 +0000
+--- libktorrent/net/socket.cpp.orig	2007-02-04 13:22:44.000000000 +0000
 +++ libktorrent/net/socket.cpp
 @@ -38,7 +38,7 @@
  #include <sys/filio.h>
  #endif
  
--#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && __FreeBSD_version < 600020) || defined (Q_OS_SOLARIS)
-+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && !defined(__DragonFly__) && __FreeBSD_version < 600020) || defined (Q_OS_SOLARIS)
+-#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && __FreeBSD_version < 600020) || defined (Q_OS_SOLARIS) || defined(Q_OS_NETBSD) 
++#ifndef MSG_NOSIGNAL
  #define MSG_NOSIGNAL 0
  #endif
  
@@ -29,15 +29,3 @@ $NetBSD: patch-aa,v 1.2 2007/01/13 18:54:24 joerg Exp $
  		int val = 1;
  		if (setsockopt(m_fd,SOL_SOCKET,SO_NOSIGPIPE,&val,sizeof(int)) < 0)
  		{
-@@ -160,7 +160,11 @@ namespace net
- 	
- 	int Socket::send(const bt::Uint8* buf,int len)
- 	{
-+#ifdef MSG_NOSIGNAL
- 		int ret = ::send(m_fd,buf,len,MSG_NOSIGNAL);
-+#else
-+		int ret = ::send(m_fd,buf,len,0);	/* SIGPIPE is ignored anyway */
-+#endif
- 		if (ret < 0)
- 		{
- 			if (errno != EAGAIN && errno != EWOULDBLOCK)
diff --git a/net/ktorrent/patches/patch-ab b/net/ktorrent/patches/patch-ab
deleted file mode 100644
index acc34e113f3..00000000000
--- a/net/ktorrent/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/01/13 18:54:24 joerg Exp $
-
---- plugins/webinterface/php_handler.cpp.orig	2007-01-13 18:37:18.000000000 +0000
-+++ plugins/webinterface/php_handler.cpp
-@@ -19,6 +19,8 @@
-  ***************************************************************************/
- #include "php_handler.h"
- 
-+#include <unistd.h>
-+
- using namespace kt;
- PhpHandler::PhpHandler(PhpInterface *php):QObject()
- {