changeset 28876:3a43e48c870e

propagate from branch 'im.pidgin.pidgin.2.6.5' (head 794204a24ba7bf26cdb07ae71b9573b09927d641) to branch 'im.pidgin.pidgin' (head 037ff1c0c37fb6717fbc6fe2c658d6f9dda4e148)
author Paul Aurich <paul@darkrain42.org>
date Fri, 08 Jan 2010 20:11:49 +0000
parents 711b828d5173 (current diff) 10ec0fbfc790 (diff)
children b8d97cf37200
files ChangeLog ChangeLog.API ChangeLog.win32 NEWS configure.ac libpurple/account.c libpurple/protocols/msn/slp.c libpurple/protocols/mxit/splashscreen.c libpurple/protocols/oscar/oscar.c pidgin/gtkconv.c po/ChangeLog
diffstat 6 files changed, 39 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jan 08 15:34:10 2010 +0000
+++ b/ChangeLog	Fri Jan 08 20:11:49 2010 +0000
@@ -1,17 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.6.5 (??/??/20??):
-	libpurple:
-	* TLS certificates are actually stored to the local cache once again
-	  (accepting a name mismatch on a certificate should now be remembered)
-
-	General:
-	* Build-time fixes for Solaris.  (Paul Townsend)
-
-	AIM and ICQ:
-	* Messages from some mobile clients are no longer displayed as
-	  Chinese characters (broken in 2.6.4)
-
+version 2.6.6 (??/??/20??):
 	Gadu-Gadu:
 	* Fix display of avatars after a server-side change. (Krzysztof
 	  Klinikowski)
@@ -31,6 +20,24 @@
 	* When getting info on a domain-only (server) JID, show uptime
 	  (when given by the result of the "last query") and don't show status as
 	  offline.
+
+version 2.6.5 (01/08/2010):
+	libpurple:
+	* TLS certificates are actually stored to the local cache once again
+	  (accepting a name mismatch on a certificate should now be remembered)
+
+	General:
+	* Build-time fixes for Solaris.  (Paul Townsend)
+
+	AIM and ICQ:
+	* Messages from some mobile clients are no longer displayed as
+	  Chinese characters (broken in 2.6.4)
+
+	MSN:
+	* Fix an issue allowing a remote user to download arbitrary files from
+	  a libpurple client.  (CVE-2010-0013)
+
+	XMPP:
 	* Do not crash when attempting to register for a new account on Windows.
 	* Fix file transfer with clients that do not support Entity Capabilities
 	  (e.g. Spark)
--- a/ChangeLog.API	Fri Jan 08 15:34:10 2010 +0000
+++ b/ChangeLog.API	Fri Jan 08 20:11:49 2010 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.6.5 (??/??/20??):
+version 2.6.6 (??/??/2010):
 	libpurple:
 		Changed:
 		* purple_xfer_cancel_local is now called instead of
@@ -15,6 +15,9 @@
 		  and Purple::Log:ReadFlags::::<type> to
 		  Purple::Log::ReadFlags::<type>)  (Chris Foote)
 
+version 2.6.5 (01/08/2010):
+	No changes
+
 version 2.6.4 (11/29/2009):
 	No changes
 
--- a/ChangeLog.win32	Fri Jan 08 15:34:10 2010 +0000
+++ b/ChangeLog.win32	Fri Jan 08 20:11:49 2010 +0000
@@ -1,6 +1,10 @@
-version 2.6.5 (??/??/20??):
+
+version 2.6.6 (??/??/2010):
 	* Installer translations for: Norwegian nynorsk
 
+version 2.6.5 (01/08/2010):
+	* No changes
+
 version 2.6.4 (11/29/2009):
 	* Register URL handlers for everything that Windows knows about.  Still
 	  use the HTTP "open" handler for security reasons.
--- a/NEWS	Fri Jan 08 15:34:10 2010 +0000
+++ b/NEWS	Fri Jan 08 20:11:49 2010 +0000
@@ -2,7 +2,12 @@
 
 Our development blog is available at: http://planet.pidgin.im
 
-2.6.5 (??/??/20??):
+2.6.6 (??/??/2010):
+
+2.6.5 (01/08/2010):
+	Paul: This release fixes a pretty serious bug in the MSN code, so we're
+	releasing this build a little earlier than planned with only major
+	bugs fixed.  See the ChangeLog for details.  Enjoy!
 
 2.6.4 (11/29/2009):
 	John:  It's release time again.  Lots of bug fixes this time around, as
--- a/libpurple/protocols/msn/slp.c	Fri Jan 08 15:34:10 2010 +0000
+++ b/libpurple/protocols/msn/slp.c	Fri Jan 08 20:11:49 2010 +0000
@@ -343,7 +343,6 @@
 		obj = msn_object_new_from_string(msnobj_data);
 		type = msn_object_get_type(obj);
 		g_free(msnobj_data);
-
 		if (type == MSN_OBJECT_EMOTICON) {
 			img = find_valid_emoticon(slplink->session->account, obj->location);
 		} else if (type == MSN_OBJECT_USERTILE) {
--- a/po/ChangeLog	Fri Jan 08 15:34:10 2010 +0000
+++ b/po/ChangeLog	Fri Jan 08 20:11:49 2010 +0000
@@ -1,8 +1,11 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.6.6
+	* Norwegian Nynorsk win32 translation added (Yngve Spjeld Landro)
+	* Russian translation updated (Антон Самохвалов)
+
 version 2.6.5
-	* Norwegian Nynorsk win32 translation added (Yngve Spjeld Landro)
-	* Russian translation updated (Антон Самохвалов)
+	* No changes
 
 version 2.6.4
 	* Afrikaans translation updated (Friedel Wolff)