From 036144d7272568520b8c6e0b2107d12ce0d7ba04 Mon Sep 17 00:00:00 2001
From: Stu Tomlinson <stu@nosnilmot.com>
Date: Dec 29 2011 12:59:45 +0000
Subject: - 2.10.1, includes security fixes for CVE-2011-3594, CVE-2011-4601,

  CVE-2011-4602, CVE-2011-4603

---

diff --git a/.gitignore b/.gitignore
index 7aec76c..de573d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ pidgin-2.7.3.tar.bz2
 /pidgin-2.8.0.tar.bz2
 /pidgin-2.9.0.tar.bz2
 /pidgin-2.10.0.tar.bz2
+/pidgin-2.10.1.tar.bz2
diff --git a/pidgin-2.10.1-fix-msn-ft-crashes.patch b/pidgin-2.10.1-fix-msn-ft-crashes.patch
new file mode 100644
index 0000000..aab707b
--- /dev/null
+++ b/pidgin-2.10.1-fix-msn-ft-crashes.patch
@@ -0,0 +1,33 @@
+----------------------------------------------------------------------
+Revision: 9d51cb9fbcc04d21597eed0381f4d06c53facc44
+Parent:   17326b88b85d2f13939a71ca80d4a617f0527f9a
+Author:   Cristi Posoiu
+Date:     06/03/11 02:55:31
+Branch:   im.pidgin.pidgin
+
+Changelog: 
+
+Fix up some cases of file transfers never finishing.  This will help certain
+instances of Yahoo file transfers not working, but not all.  Fixes #12472.
+
+Changes against parent 17326b88b85d2f13939a71ca80d4a617f0527f9a
+
+  patched  libpurple/ft.c
+
+============================================================
+--- libpurple/ft.c	2b8633b159e16099b858dd21ed122e9c3811a9d5
++++ libpurple/ft.c	ffba61c0a50c9d5f866f8b1f0dec16cf13bbd65c
+@@ -1100,9 +1100,11 @@ purple_xfer_write(PurpleXfer *xfer, cons
+ 		r = write(xfer->fd, buffer, s);
+ 		if (r < 0 && errno == EAGAIN)
+ 			r = 0;
+-		if ((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer))
+-			purple_xfer_set_completed(xfer, TRUE);
+ 	}
++	if (r >= 0 && (purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer) &&
++		!purple_xfer_is_completed(xfer))
++		purple_xfer_set_completed(xfer, TRUE);
++	
+ 
+ 	return r;
+ }
diff --git a/sources b/sources
index 01bea23..fdf0667 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e1453c9093c4f32beec19abd14069a3f  pidgin-2.10.0.tar.bz2
+eafb06b4083a201fe22d310e897a19dd  pidgin-2.10.1.tar.bz2