Update pidgin to 2.10.3.

(fixes CVE-2011-3594, CVE-2011-4601, CVE-2011-4602, CVE-2011-4603, CVE-2011-4939
 and CVE-2012-1178)

version 2.10.3 (03/26/2012):
	* Fix buddies not going offline.

version 2.10.2 (03/14/2012):
	General:
	* Fix compilation when using binutils 2.22 and new GDK pixbuf. (#14799)
	* Fix compilation of the MXit protocol plugin with GLib 2.31. (#14773)

	Pidgin:
	* Add support for the GNOME3 Network dialog. (#13882)
	* Fix rare crash. (#14392)
	* Add support for the GNOME3 Default Application dialog for configuring
	  the Browser.

	libpurple:
	* Support new connection states and signals for NetworkManager 0.9+.
	  (Dan Williams) (#13859)

	AIM and ICQ:
	* Fix a possible crash when receiving an unexpected message
	  from the server. (Thijs Alkemade) (#14983)
	* Allow signing on with usernames containing periods and
	  underscores. (#13500)
	* Allow adding buddies containing periods and underscores. (#13500)
	* Don't try to format ICQ usernames entered as email addresses.
	  Gets rid of an "Unable to format username" error at login. (#13883)

	MSN:
	* Fix possible crashes caused by not validating incoming messages as
	  UTF-8. (Thijs Alkemade) (#14884)
	* Support new protocol version MSNP18. (#14753)
	* Fix messages to offline contacts. (#14302)

	Windows-Specific Changes:
	* Fix the installer downloading of spell-checking dictionaries (#14612)
	* Fix compilation of the Bonjour protocol plugin. (#14802)

	Plugins:
	* The autoaccept plugin will no longer reset the preference for unknown
	  buddies to "Auto Reject" in certain cases. (#14964)

version 2.10.1 (12/06/2011):
	Finch:
	* Fix compilation on OpenBSD.

	AIM and ICQ:
	* Fix remotely-triggerable crashes by validating strings in a few
	  messages related to buddy list management.  Thanks to Evgeny Boger
	  for reporting this!  (#14682)

	Bonjour:
	* IPv6 fixes (Linus Lüssing)

	Gadu-Gadu:
	* Fix problems linking against GnuTLS. (#14544)

	IRC:
	* Fix a memory leak when admitting UTF-8 text with a non-UTF-8 primary
	  encoding.  (#14700)

	Jabber:
	* Fix crashes and memory leaks when receiving malformed voice
	  and video requests.  Thanks to Thijs Alkemade for reporting this!

	Sametime:
	* Separate "username" and "server" when adding new Sametime accounts.
	  (#14608)
	* Fix compilation in Visual C++. (#14608)

	SILC:
	* Fix CVE-2011-3594, by UTF-8 validating incoming messages before
	  passing them to glib or libpurple.  Identified by Diego Bauche
	  Madero from IOActive.  (#14636)

	Yahoo!:
	* Fetch buddy icons in some cases where we previously weren't. (#13050)

	Windows-Specific Changes:
	* Fix compilation

8 files changed, 16 insertions, 23 deletions

diff --git a/chat/finch/Makefile b/chat/finch/Makefile
index 3f8a1f2666f..54f1aaef51d 100644
--- a/chat/finch/Makefile
+++ b/chat/finch/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2012/03/09 12:34:01 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2012/04/04 13:20:06 obache Exp $
 
 PKGNAME=	finch-${PIDGIN_VERSION}
-PKGREVISION=	5
 
 COMMENT=	Multi-protocol Instant Messaging client console frontend
 
@@ -32,7 +31,6 @@ CONFIGURE_ARGS+=	--with-ncurses-headers=${BUILDLINK_DIR}/include
 USE_NCURSES=		yes # force ncurses, for libpanel
 
 BUILD_DIRS=		finch
-INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
 .include "options.mk"
 
@@ -42,9 +40,7 @@ pre-build:
 	${TEST} -r ${WRKSRC}/libpurple/libpurple.la || \
 	  ln -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple
 
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/finch.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+INSTALL_DIRS=		finch doc
 
 BUILDLINK_API_DEPENDS.libpurple+=	libpurple-${PIDGIN_VERSION}{,nb*}
 .include "../../chat/libpurple/buildlink3.mk"
diff --git a/chat/libpurple/Makefile b/chat/libpurple/Makefile
index a2cf544bc3c..a950a9f64c3 100644
--- a/chat/libpurple/Makefile
+++ b/chat/libpurple/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2012/03/09 12:34:01 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2012/04/04 13:20:06 obache Exp $
 
 PKGNAME=	libpurple-${PIDGIN_VERSION}
-PKGREVISION=	6
 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 70b24a391e9..cc65073a4b2 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2011/08/26 13:14:58 obache Exp $
+# $NetBSD: Makefile.common,v 1.37 2012/04/04 13:20:06 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.10.0
+PIDGIN_VERSION=	2.10.3
 DISTNAME=	pidgin-${PIDGIN_VERSION}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index 60c49fcdc69..6f73e092939 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.32 2012/03/09 11:45:01 fhajny Exp $
+$NetBSD: distinfo,v 1.33 2012/04/04 13:20:06 obache Exp $
 
-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
+SHA1 (pidgin-2.10.3.tar.bz2) = 7dfeabdb1ade4311c91ac9c9f988276f67ead6ee
+RMD160 (pidgin-2.10.3.tar.bz2) = 10af4caee9f22a251f867e3befebcc659e2b42f3
+Size (pidgin-2.10.3.tar.bz2) = 9970676 bytes
 SHA1 (patch-libpurple_protocols_gg_lib_libgadu.h) = 5756134e17ae2ce28d3555cd40354245e22a5bd6
diff --git a/chat/pidgin-sametime/Makefile b/chat/pidgin-sametime/Makefile
index 370535df02f..263e1f9a640 100644
--- a/chat/pidgin-sametime/Makefile
+++ b/chat/pidgin-sametime/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2012/03/09 12:34:03 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2012/04/04 13:20:06 obache Exp $
 
 PKGNAME=	pidgin-sametime-${PIDGIN_VERSION}
-PKGREVISION=	5
 COMMENT=	Lotus Sametime plugin for the Pidgin instant messenger
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/chat/pidgin-silc/Makefile b/chat/pidgin-silc/Makefile
index c26eb9be726..07a985d0163 100644
--- a/chat/pidgin-silc/Makefile
+++ b/chat/pidgin-silc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2012/03/09 12:34:03 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2012/04/04 13:20:06 obache Exp $
 
 PKGNAME=	pidgin-silc-${PIDGIN_VERSION}
-PKGREVISION=	5
 COMMENT=	SILC plugin for the Pidgin instant messenger
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index 5cb5708d2e0..c99d7a2afa1 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.38 2012/03/09 12:34:02 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2012/04/04 13:20:06 obache Exp $
 
-PKGREVISION=		5
 COMMENT=		Multi-protocol Instant Messaging client GTK frontend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -29,12 +28,12 @@ pre-build:
 	  ln -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple/.
 	cd ${WRKSRC} && ${BUILD_MAKE_CMD} pidgin.desktop
 
+INSTALL_DIRS=		pidgin doc
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/pidgin.desktop \
 	  ${DESTDIR}${PREFIX}/share/applications
 
-# XXX install pidgin.1 via doc/Makefile
-
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/chat/pidgin/PLIST b/chat/pidgin/PLIST
index 3243b3a7652..656fa591373 100644
--- a/chat/pidgin/PLIST
+++ b/chat/pidgin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2011/08/26 13:14:58 obache Exp $
+@comment $NetBSD: PLIST,v 1.21 2012/04/04 13:20:06 obache Exp $
 bin/pidgin
 include/pidgin/gtkaccount.h
 include/pidgin/gtkblist-theme-loader.h
@@ -71,6 +71,7 @@ ${PLIST.vv}lib/pidgin/vvconfig.la
 lib/pidgin/xmppconsole.la
 lib/pidgin/xmppdisco.la
 lib/pkgconfig/pidgin.pc
+man/man1/pidgin.1
 share/applications/pidgin.desktop
 share/icons/hicolor/16x16/apps/pidgin.png
 share/icons/hicolor/22x22/apps/pidgin.png