rpms/pidgin/devel pidgin-2.5.7-100-glib2-compat.patch, NONE, 1.1 pidgin-2.5.7-101-yahoo-exclude-msn-auth-buddy.patch, NONE, 1.1 pidgin-2.5.7-102-yahoo-update-pager-default.patch, NONE, 1.1 pidgin-2.5.7-103-yahoo-pidgin-crash.patch, NONE, 1.1 pidgin.spec, 1.75, 1.76 pidgin-2.5.7-glib2-compat.patch, 1.1, NONE

Thu Jun 25 22:26:53 UTC 2009

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1333

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.5.7-100-glib2-compat.patch 
	pidgin-2.5.7-101-yahoo-exclude-msn-auth-buddy.patch 
	pidgin-2.5.7-102-yahoo-update-pager-default.patch 
	pidgin-2.5.7-103-yahoo-pidgin-crash.patch 
Removed Files:
	pidgin-2.5.7-glib2-compat.patch 
Log Message:
add patches that were already tested, more are coming


pidgin-2.5.7-100-glib2-compat.patch:

--- NEW FILE pidgin-2.5.7-100-glib2-compat.patch ---
http://developer.pidgin.im/viewmtn/revision/info/e2bd07369c221038b091b908c8e07f0ae6179cd9
Author  	 nosnilmot at pidgin.im
Branch 	im.pidgin.pidgin
Changelog 	g_strv_length() is only available in glib2 2.6 and newer
Date 	2009-06-21T17:30:13 

-----------------------------------------------------------------
Revision: e2bd07369c221038b091b908c8e07f0ae6179cd9
Ancestor: 73090755eac02937743e2c600c5fc83051f2eeac
Author: nosnilmot at pidgin.im
Date: 2009-06-21T17:30:13
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/yahoo/yahoo.c

ChangeLog: 

g_strv_length() is only available in glib2 2.6 and newer

============================================================
--- libpurple/protocols/yahoo/yahoo.c	9f36b37701756957da8074a7c6c19e73d00c6b03
+++ libpurple/protocols/yahoo/yahoo.c	ce8711a2c689ed8580964a51ad66ca548ef6faf0
@@ -1656,11 +1656,16 @@ static void yahoo_auth16_stage2(PurpleUt
 	}
 	else if (len > 0 && ret_data && *ret_data) {
 		gchar **split_data = g_strsplit(ret_data, "\r\n", -1);
-		int totalelements = g_strv_length(split_data);
+		int totalelements = 0;
 		int response_no = -1;
 		char *crumb = NULL;
 		char *crypt = NULL;
 
+#if GLIB_CHECK_VERSION(2,6,0)
+		totalelements = g_strv_length(split_data);
+#else
+		while (split_data[++totalelements] != NULL);	
+#endif
 		if (totalelements >= 5) {
 			response_no = strtol(split_data[1], NULL, 10);
 			crumb = g_strdup(split_data[2] + strlen("crumb="));
@@ -1738,10 +1743,15 @@ static void yahoo_auth16_stage1_cb(Purpl
 	}
 	else if (len > 0 && ret_data && *ret_data) {
 		gchar **split_data = g_strsplit(ret_data, "\r\n", -1);
-		int totalelements = g_strv_length(split_data);
+		int totalelements = 0;
 		int response_no = -1;
 		char *token = NULL;
 
+#if GLIB_CHECK_VERSION(2,6,0)
+		totalelements = g_strv_length(split_data);
+#else
+		while (split_data[++totalelements] != NULL);	
+#endif
 		if(totalelements >= 5) {
 			response_no = strtol(split_data[1], NULL, 10);
 			token = g_strdup(split_data[2] + strlen("ymsgr="));

pidgin-2.5.7-101-yahoo-exclude-msn-auth-buddy.patch:

--- NEW FILE pidgin-2.5.7-101-yahoo-exclude-msn-auth-buddy.patch ---
http://developer.pidgin.im/viewmtn/revision/info/d43ee4f5f6097f7a107a1aa122e09d777de7c77d
Author  	 sadrul at pidgin.im
Branch 	im.pidgin.pidgin
Changelog 	Turns out we need to exclude 'msn/' when authorizing a buddy.
Date 	2009-06-24T08:15:22 

#
#
# patch "libpurple/protocols/yahoo/yahoo.c"
#  from [4fc684e42c8aed006f8f3ee126f9474ac14c46e7]
#    to [e2b0aab601a15a7ca4c3c57b114d3d60fdfa9f66]
#
============================================================
--- libpurple/protocols/yahoo/yahoo.c	4fc684e42c8aed006f8f3ee126f9474ac14c46e7
+++ libpurple/protocols/yahoo/yahoo.c	e2b0aab601a15a7ca4c3c57b114d3d60fdfa9f66
@@ -1125,11 +1125,15 @@ yahoo_buddy_add_authorize_cb(gpointer da
 	struct yahoo_add_request *add_req = data;
 	struct yahoo_packet *pkt;
 	struct yahoo_data *yd = add_req->gc->proto_data;
+	const char *who = add_req->who;
 
+	if (add_req->protocol == 2)
+		who += 4;
+
 	pkt = yahoo_packet_new(YAHOO_SERVICE_AUTH_REQ_15, YAHOO_STATUS_AVAILABLE, 0);
 	yahoo_packet_hash(pkt, "ssiii",
 					  1, add_req->id,
-					  5, add_req->who,
+					  5, who,
 					  241, add_req->protocol,
 					  13, 1,
 					  334, 0);

pidgin-2.5.7-102-yahoo-update-pager-default.patch:

--- NEW FILE pidgin-2.5.7-102-yahoo-update-pager-default.patch ---
http://developer.pidgin.im/viewmtn/revision/info/602ee3404d02198f2a1430c98ac52ae487a0729c
Author  	 darkrain42 at pidgin.im
Branch 	im.pidgin.pidgin
Changelog 	Update the Pager server at login to the new default if "" or old default.
Date 	2009-06-25T02:23:40 

#
#
# patch "libpurple/protocols/yahoo/yahoo.c"
#  from [11185f50aa12b2ed97585f6d7769d14f0d13887e]
#    to [dff59fca73dcd8b459863fd9ed6510acef1420eb]
#
============================================================
--- libpurple/protocols/yahoo/yahoo.c	11185f50aa12b2ed97585f6d7769d14f0d13887e
+++ libpurple/protocols/yahoo/yahoo.c	dff59fca73dcd8b459863fd9ed6510acef1420eb
@@ -3346,7 +3346,8 @@ static void yahoo_server_check(PurpleAcc
 
 	server = purple_account_get_string(account, "server", YAHOO_PAGER_HOST);
 
-	if (strcmp(server, "scs.yahoo.com") == 0)
+	if (*server == '\0' || g_str_equal(server, "scs.yahoo.com") ||
+			g_str_equal(server, "scs.msg.yahoo.com"))
 		purple_account_set_string(account, "server", YAHOO_PAGER_HOST);
 }
 

pidgin-2.5.7-103-yahoo-pidgin-crash.patch:

--- NEW FILE pidgin-2.5.7-103-yahoo-pidgin-crash.patch ---
http://developer.pidgin.im/viewmtn/revision/info/6b28d34173486d3e4f658f62a61c93b56a489cb0
Author  	 sulabh at soc.pidgin.im
Branch 	im.pidgin.pidgin
Changelog 	This should prevent pidgin from crashing, as reported by the ticket #9426.
Date 	2009-06-25T08:16:19 

#
#
# patch "libpurple/protocols/yahoo/yahoo_picture.c"
#  from [ef6c43a5d4728b0e1da24d7fc5c6a214b208d45f]
#    to [678f9fe473e12b16d0bb7a750c7623f9afd11979]
#
============================================================
--- libpurple/protocols/yahoo/yahoo_picture.c	ef6c43a5d4728b0e1da24d7fc5c6a214b208d45f
+++ libpurple/protocols/yahoo/yahoo_picture.c	678f9fe473e12b16d0bb7a750c7623f9afd11979
@@ -110,6 +110,9 @@ void yahoo_process_picture(PurpleConnect
 		l = l->next;
 	}
 
+	if (!who)
+		return;
+
 	if (!purple_privacy_check(purple_connection_get_account(gc), who)) {
 		purple_debug_info("yahoo", "Picture packet from %s dropped.\n", who);
 		return;


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- pidgin.spec	22 Jun 2009 17:32:17 -0000	1.75
+++ pidgin.spec	25 Jun 2009 22:26:51 -0000	1.76
@@ -68,7 +68,7 @@
 
 Name:		pidgin
 Version:	2.5.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -103,7 +103,10 @@ Patch0: pidgin-NOT-UPSTREAM-2.5.3-reread
 Patch1: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 
 ## Patches 100+: To be Included in Future Upstream
-Patch100: pidgin-2.5.7-glib2-compat.patch
+Patch100: pidgin-2.5.7-100-glib2-compat.patch
+Patch101: pidgin-2.5.7-101-yahoo-exclude-msn-auth-buddy.patch
+Patch102: pidgin-2.5.7-102-yahoo-update-pager-default.patch
+Patch103: pidgin-2.5.7-103-yahoo-pidgin-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -350,7 +353,10 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %endif
 
 ## Patches 100+: To be Included in Future Upstream
-%patch100 -p0 -b .glibcompat
+%patch100 -p0 -b .glib2-compat
+%patch101 -p0 -b .yahoo-exclude-msn-auth-buddy
+%patch102 -p0 -b .yahoo-update-pager-default
+%patch103 -p0 -b .yahoo-pidgin-crash
 
 # Our preferences
 cp %{SOURCE1} prefs.xml


--- pidgin-2.5.7-glib2-compat.patch DELETED ---


