Update pidgin to 2.10.11.

version 2.10.11 (11/23/14):
	General:
	* Fix handling of Self-Signed SSL/TLS Certificates when using the NSS
	  plugin (#16412)
	* Improve default cipher suites used with the NSS plugin (#16262)
	* Add NSS Preferences plugin which allows the SSL/TLS Versions and
	  cipher suites to be configured (#8061)

	Gadu-Gadu:
	* Fix a bug that prevented plugin to load when compiled without GnuTLS.
	  (mancha) (#16431)
	* Fix build for platforms without AF_LOCAL definition. (#16404)

	MSN:
	* Fix broken login due to server change (dx, TReKiE). (#16451, #16455)
	* Fail early when buddy list is unavailable instead of wasting bandwidth
	  endlessly re-trying.

version 2.10.10 (10/22/14):
	General:
	* Check the basic constraints extension when validating SSL/TLS
	  certificates. This fixes a security hole that allowed a malicious
	  man-in-the-middle to impersonate an IM server or any other https
	  endpoint. This affected both the NSS and GnuTLS plugins. (Discovered
	  by an anonymous person and Jacob Appelbaum of the Tor Project, with
	  thanks to Moxie Marlinspike for first publishing about this type of
	  vulnerability. Thanks to Kai Engert for guidance and for some of the
	  NSS changes) (CVE-2014-3694)
	* Allow and prefer TLS 1.2 and 1.1 when using the NSS plugin for SSL.
	  (Elrond and Ashish Gupta) (#15909)

	libpurple3 compatibility:
	* Encrypted account passwords are preserved until the new one is set.
	* Fix loading Google Talk and Facebook XMPP accounts.

	Windows-Specific Changes:
	* Don't allow overwriting arbitrary files on the file system when the
	  user installs a smiley theme via drag-and-drop. (Discovered by Yves
	  Younan of Cisco Talos) (CVE-2014-3697)
	* Updates to dependencies:
		* NSS 3.17.1 and NSPR 4.10.7

	Finch:
	* Fix build against Python 3. (Ed Catmur) (#15969)

	Gadu-Gadu:
	* Updated internal libgadu to version 1.12.0.

	Groupwise:
	* Fix potential remote crash parsing server message that indicates that
	  a large amount of memory should be allocated. (Discovered by Yves Younan
	  and Richard Johnson of Cisco Talos) (CVE-2014-3696)

	IRC:
	* Fix a possible leak of unencrypted data when using /me command
	  with OTR. (Thijs Alkemade) (#15750)

	MXit:
	* Fix potential remote crash parsing a malformed emoticon response.
	  (Discovered by Yves Younan and Richard Johnson of Cisco Talos)
	  (CVE-2014-3695)

	XMPP:
	* Fix potential information leak where a malicious XMPP server and
	  possibly even a malicious remote user could create a carefully crafted
	  XMPP message that causes libpurple to send an XMPP message containing
	  arbitrary memory. (Discovered and fixed by Thijs Alkemade and Paul
	  Aurich) (CVE-2014-3698)
	* Fix Facebook XMPP roster quirks. (#15041, #15957)

	Yahoo:
	* Fix login when using the GnuTLS library for TLS connections. (#16172)

2 files changed, 3 insertions, 13 deletions

diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index 94ad4a39a49..537526c6f82 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,17 +1,11 @@
-# $NetBSD: Makefile,v 1.62 2014/05/09 07:36:55 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2014/12/07 08:45:59 obache Exp $
 
-PKGREVISION=		1
 COMMENT=		Multi-protocol Instant Messaging client GTK frontend
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 2.10.8 (finch)
 
 .include		"../../chat/libpurple/Makefile.common"
 
 USE_TOOLS+=		msgfmt intltool
 
-PKGCONFIG_OVERRIDE+=	gaim.pc.in
-PKGCONFIG_OVERRIDE+=	libpurple/purple.pc.in
-PKGCONFIG_OVERRIDE+=	pidgin/pidgin.pc.in
-
 CONFIGURE_ARGS+=	--enable-gtkui
 
 BUILD_DIRS=		pidgin
@@ -26,14 +20,9 @@ pre-build:
 	# XXX Find a cleaner way.
 	${TEST} -r ${WRKSRC}/libpurple/libpurple.la || \
 	  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
-
 .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 656fa591373..aa3aa9ff065 100644
--- a/chat/pidgin/PLIST
+++ b/chat/pidgin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2012/04/04 13:20:06 obache Exp $
+@comment $NetBSD: PLIST,v 1.22 2014/12/07 08:45:59 obache Exp $
 bin/pidgin
 include/pidgin/gtkaccount.h
 include/pidgin/gtkblist-theme-loader.h
@@ -72,6 +72,7 @@ lib/pidgin/xmppconsole.la
 lib/pidgin/xmppdisco.la
 lib/pkgconfig/pidgin.pc
 man/man1/pidgin.1
+share/appdata/pidgin.appdata.xml
 share/applications/pidgin.desktop
 share/icons/hicolor/16x16/apps/pidgin.png
 share/icons/hicolor/22x22/apps/pidgin.png