Update piding 2.10.0, contains security fixes for CVE-2011-2943 and CVE-2011-3184.

While here, better fix for PR#45190.
chat/finch itself does not depend on devel/nspr.
chat/libpurple without gnutls option, libpurple is linked with nspr,
so it must be handle in libpurple/buildlink3.mk.


version 2.10.0 (08/18/2011):
	Pidgin:
	* Make the max size of incoming smileys a pref instead of hardcoding it.
	  (Quentin Brandon) (#5231)
	* Added a plugin information dialog to show information for plugins
	  that aren't otherwise visible in the plugins dialog.
	* Fix building with GTK+ earlier than 2.14.0 (GTK+ 2.10 is still the
	  minimum supported) (#14261)

	libpurple:
	* Fix a potential crash in the Log Reader plugin when reading QIP logs.
	* Fix a large number of strcpy() and strcat() invocations to use
	  strlcpy() and strlcat(), etc., forestalling an entire class of
	  string buffer overrun bugs.
	  (The Electronic Frontier Foundation, Dan Auerbach, Chris Palmer,
	  Jacob Appelbaum)
	* Change some filename manipulations in filectl.c to use MAXPATHLEN
	  instead of arbitrary length constants.  (The Electronic Frontier
	  Foundation, Dan Auerbach, Chris Palmer, Jacob Appelbaum)
	* Fix endianness-related crash in NTLM authentication (Jon Goldberg)
	  (#14163)

	Gadu-Gadu:
	* Fixed searching for buddies in public directory. (Tomasz Wasilczyk)
	  (#5242)
	* Better status message handling. (Tomasz Wasilczyk) (#14314)
	* Merged two buddy blocking methods. (Tomasz Wasilczyk) (#5303)
	* Fix building of the bundled libgadu library with older versions
	  of GnuTLS. (patch plucked from upstream) (#14365)

	ICQ:
	* Fix crash selecting Tools->Set Mood when you're online with an
	  ICQ account that is configured as an AIM account. (#14437)

	IRC:
	* Fix a crash when remote users have certain characters in their
	  nicknames. (Discovered by Djego Ibanez) (#14341)
	* Fix the handling of formatting following mIRC ^O (#14436)
	* Fix crash when NAMES is empty. (James McLaughlin) (#14518)

	MSN:
	* Fix incorrect handling of HTTP 100 responses when using the HTTP
	  connection method.  This can lead to a crash. (Discovered by Marius
	  Wachtler)
	* Fix seemingly random crashing. (#14307)
	* Fix a crash when the account is disconnected at the time we are doing a
	  SB request. (Hanzz, ported by shlomif) (#12431)

	XMPP:
	* Do not generate malformed XML ("</>") when setting an empty mood.
	  (#14342)
	* Fix the /join <room> behavior.  (Broken when adding support for
	  <room>@<server>)  (#14205)

	Yahoo!/Yahoo! JAPAN:
	* Fix coming out of idle while in an unavailable state
	* Fix logging into Yahoo! JAPAN.  (#14259)

	Windows-Specific Changes:
	* Open an explorer.exe window at the location of the file when clicking
	  on a file link instead of executing the file, because executing a file
	  can be potentially dangerous.  (Discovered by James Burton of
	  Insomnia Security) (Fixed by Eion Robb)

5 files changed, 12 insertions, 11 deletions

diff --git a/chat/libpurple/Makefile b/chat/libpurple/Makefile
index f4c37f7f5b2..575b4840584 100644
--- a/chat/libpurple/Makefile
+++ b/chat/libpurple/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2011/08/23 13:06:48 obache Exp $
+# $NetBSD: Makefile,v 1.32 2011/08/26 13:14:58 obache Exp $
 
 PKGNAME=	libpurple-${PIDGIN_VERSION}
-PKGREVISION=	1
 COMMENT=	Multi-protocol Instant Messaging client backend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index 2ad80c38e36..70b24a391e9 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2011/06/30 13:03:39 obache Exp $
+# $NetBSD: Makefile.common,v 1.36 2011/08/26 13:14:58 obache Exp $
 #
 # used by chat/finch/Makefile
 # used by chat/libpurple/Makefile
@@ -6,7 +6,7 @@
 # used by chat/pidgin-sametime/Makefile
 # used by chat/pidgin-silc/Makefile
 
-PIDGIN_VERSION=	2.9.0
+PIDGIN_VERSION=	2.10.0
 DISTNAME=	pidgin-${PIDGIN_VERSION}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
diff --git a/chat/libpurple/PLIST b/chat/libpurple/PLIST
index dd961062c7c..4e335b137e3 100644
--- a/chat/libpurple/PLIST
+++ b/chat/libpurple/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2011/06/30 13:03:39 obache Exp $
+@comment $NetBSD: PLIST,v 1.26 2011/08/26 13:14:58 obache Exp $
 include/libpurple/account.h
 include/libpurple/accountopt.h
 include/libpurple/blist.h
@@ -60,7 +60,6 @@ include/libpurple/theme-manager.h
 include/libpurple/theme.h
 include/libpurple/upnp.h
 include/libpurple/util.h
-include/libpurple/valgrind.h
 include/libpurple/value.h
 include/libpurple/version.h
 include/libpurple/whiteboard.h
diff --git a/chat/libpurple/buildlink3.mk b/chat/libpurple/buildlink3.mk
index ea8826e4056..448dbd42a5d 100644
--- a/chat/libpurple/buildlink3.mk
+++ b/chat/libpurple/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2011/06/10 09:39:47 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2011/08/26 13:14:58 obache Exp $
 
 BUILDLINK_TREE+=	libpurple
 
@@ -20,6 +20,9 @@ pkgbase := libpurple
 .if !empty(PKG_BUILD_OPTIONS.libpurple:Mfarsight)
 .  include "../../multimedia/farsight2/buildlink3.mk"
 .endif
+.if empty(PKG_BUILD_OPTIONS.libpurple:Mgnutls)
+.  include "../../devel/nss/buildlink3.mk"
+.endif
 .endif # LIBPURPLE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libpurple
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index 0cd2b9e411f..5b453888423 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.30 2011/06/30 13:03:39 obache Exp $
+$NetBSD: distinfo,v 1.31 2011/08/26 13:14:58 obache Exp $
 
-SHA1 (pidgin-2.9.0.tar.bz2) = 632c681030304443a911c9eeca6d582df0a24fbb
-RMD160 (pidgin-2.9.0.tar.bz2) = c093adadd3362ed7d266dfb07df5b75974605d5a
-Size (pidgin-2.9.0.tar.bz2) = 9925589 bytes
+SHA1 (pidgin-2.10.0.tar.bz2) = 859c6d9c9795c1adcf762b73e072e04a3a85a78d
+RMD160 (pidgin-2.10.0.tar.bz2) = 316e948bc4db03b160962b4ee2b1df64d35be335
+Size (pidgin-2.10.0.tar.bz2) = 9941288 bytes