rpms/gaim/devel gaim-2.0.0beta5-debian-13_yahoo_webauth_disable.patch, NONE, 1.1 gaim.spec, 1.161, 1.162

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3339

Modified Files:
	gaim.spec 
Added Files:
	gaim-2.0.0beta5-debian-13_yahoo_webauth_disable.patch 
Log Message:
- Debian patch 13_yahoo_webauth_disable
  temporarily disable the broken yahoo web auth fallback


gaim-2.0.0beta5-debian-13_yahoo_webauth_disable.patch:
 yahoo.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE gaim-2.0.0beta5-debian-13_yahoo_webauth_disable.patch ---
When Yahoo auth fails, or user types incorrect password, it falls back to webauth.
Webauth is now broken.  Gaim gets stuck in yahoo authentication, causing user confusion.

This patch is not upstream, because they want to look into fixing webauth instead of disabling this.
We need a more stable client now, thus using this as a temporary workaround.

diff -ur gaim-2.0.0+beta5.orig/libgaim/protocols/yahoo/yahoo.c gaim-2.0.0+beta5/libgaim/protocols/yahoo/yahoo.c
--- gaim-2.0.0+beta5.orig/libgaim/protocols/yahoo/yahoo.c	2006-12-11 12:17:48.000000000 -0500
+++ gaim-2.0.0+beta5/libgaim/protocols/yahoo/yahoo.c	2006-12-11 12:39:04.000000000 -0500
@@ -1905,6 +1905,7 @@
 		msg = g_strdup(_("Invalid username."));
 		break;
 	case 13:
+#if 0
 		if (!yd->wm) {
 			GaimUtilFetchUrlData *url_data;
 			yd->wm = TRUE;
@@ -1925,6 +1926,7 @@
 			                      "in reduced functionality and features."));
 			return;
 		}
+#endif
 		msg = g_strdup(_("Incorrect password."));
 		break;
 	case 14:


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- gaim.spec	6 Dec 2006 19:06:27 -0000	1.161
+++ gaim.spec	11 Dec 2006 22:11:08 -0000	1.162
@@ -33,7 +33,7 @@
 
 Name:		gaim
 Version:	2.0.0
-Release:	0.27.%{betaver}%{?dist}
+Release:	0.28.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -56,7 +56,9 @@
 
 
 ## Patches 0-99: Fedora specific or upstream wont accept
-#Patch5:		gaim2-PIE.patch
+#Patch5:  gaim2-PIE.patch
+# Tempory Hack: disable yahoo web auth fallback
+Patch6:   gaim-2.0.0beta5-debian-13_yahoo_webauth_disable.patch
 
 ## Patches 100+: To be Included in Future Upstream
 Patch102: gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch
@@ -188,10 +190,12 @@
 %prep
 %setup -q -n gaim-%{version}%{betaver}
 ## Patches 0-99: Fedora specific or upstream wont accept
-#%patch5 -p1
 # Considering not doing PIE anymore in the future, as it seems not necessary
 # given all of the other precautions used to build gaim in Fedora.
 # See Bug #133680 for more information about PIE difficulties
+#%patch5 -p1
+# Temporary Hack: disable yahoo webauth fallback
+%patch6 -p1
 
 ## Patches 100+: To be Included in Future Upstream
 %patch102 -p0
@@ -358,6 +362,10 @@
 %endif
 
 %changelog
+* Mon Dec 11 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.28.beta5
+- Debian patch 13_yahoo_webauth_disable
+  temporarily disable the broken yahoo web auth fallback
+
 * Wed Dec 06 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.27.beta5
 - Debian patch 12_gstreamer-cleanup, hopefully fixes #218070