[bitlbee] add an upstream fix for a high-priority twitter disconnect/crash

[Adam Williamson]

commit 0639f7ffe348b90b4e72f0599b922c683c0fb93b
Author: Adam Williamson <awilliam at redhat.com>
Date:   Sat Jan 14 13:19:22 2012 -0500

    add an upstream fix for a high-priority twitter disconnect/crash

 871_870.diff |   22 ++++++++++++++++++++++
 bitlbee.spec |    9 ++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/871_870.diff b/871_870.diff
new file mode 100644
index 0000000..530203b
--- /dev/null
+++ b/871_870.diff
@@ -0,0 +1,22 @@
+=== modified file 'protocols/twitter/twitter_lib.c'
+--- protocols/twitter/twitter_lib.c	2011-12-26 18:17:51 +0000
++++ protocols/twitter/twitter_lib.c	2012-01-10 15:13:18 +0000
+@@ -889,7 +889,7 @@
+ 	} else if (req->status_code == 401) {
+ 		imcb_error(ic, "Authentication failure");
+ 		imc_logout(ic, FALSE);
+-		goto end;
++		return;
+ 	} else {
+ 		// It didn't go well, output the error and return.
+ 		if (++td->http_fails >= 5)
+@@ -941,7 +941,7 @@
+ 	} else if (req->status_code == 401) {
+ 		imcb_error(ic, "Authentication failure");
+ 		imc_logout(ic, FALSE);
+-		goto end;
++		return;
+ 	} else {
+ 		// It didn't go well, output the error and return.
+ 		if (++td->http_fails >= 5)
+
diff --git a/bitlbee.spec b/bitlbee.spec
index a1a0969..45f8960 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -1,7 +1,7 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
 Version:           3.0.4
-Release:           2%{?dist}
+Release:           3%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
 URL:               http://www.bitlbee.org/
@@ -22,6 +22,9 @@ Patch4:            bitlbee-des3-implement.patch
 Patch5:            bitlbee-forkdaemon.patch
 # Reopened http://bugs.bitlbee.org/bitlbee/ticket/738
 Patch6:            bitlbee-systemd.patch
+# Upstream twitter fix: http://bugs.bitlbee.org/bitlbee/ticket/888
+# http://code.bitlbee.org/lh/bitlbee/diff/871
+Patch7:            871_870.diff
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
 BuildRequires:     glib2-devel >= 2.4, libxslt
@@ -73,6 +76,7 @@ completely stable and not 100% foolproof so use at your own risk.
 %patch5 -p1
 %patch6 -p1
 %endif
+%patch7 -p0
 
 %build
 # Note that we cannot use openssl in Fedora packages ... it breaks GPL
@@ -193,6 +197,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Jan 14 2012 Adam Williamson <awilliam at redhat.com> - 3.0.4-3
+- add upstream fix for a high-priority twitter disconnect/crasher
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild