From: Elan Ruusamäe <glen@pld-linux.org>
Date: Mon, 23 Apr 2012 07:11:01 +0000 (+0000)
Subject: - do not fetch groups, ticket #946
X-Git-Tag: auto/th/bitlbee-3.0.5-0.17
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?p=packages%2Fbitlbee.git;a=commitdiff_plain;h=7da1b95910a331be34eb5132c0e468bd217e0adc

- do not fetch groups, ticket #946

Changed files:
    bitlbee.spec -> 1.17
    skype-no-groups.patch -> 1.1
---

diff --git a/bitlbee.spec b/bitlbee.spec
index 649f106..7575b19 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -9,7 +9,7 @@ Summary:	An IRC to other chat networks gateway
 Summary(pl.UTF-8):	Bramka pomiędzy IRC-em i innymi sieciami komunikacyjnymi
 Name:		bitlbee
 Version:	3.0.5
-Release:	0.16
+Release:	0.17
 License:	GPL v2+ and MIT
 Group:		Daemons
 Source0:	http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
@@ -18,6 +18,7 @@ URL:		http://www.bitlbee.org/
 Patch0:		config.patch
 Patch1:		systemd.patch
 Patch2:		skyped-FD_CLOEXEC.patch
+Patch3:		skype-no-groups.patch
 BuildRequires:	asciidoc
 BuildRequires:	gnutls-devel
 %{?with_otr:BuildRequires:	libotr-devel >= 3.2.0}
@@ -80,6 +81,7 @@ Skype protocol support for bitlbee.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # fix wrong assumption with $DESTDIR
 %{__sed} -i -e 's,$(shell id -u),0,' Makefile
diff --git a/skype-no-groups.patch b/skype-no-groups.patch
new file mode 100644
index 0000000..a1479e0
--- /dev/null
+++ b/skype-no-groups.patch
@@ -0,0 +1,16 @@
+Do not download custom groups, makes skyped to lag because those queries timeout
+
+http://bugs.bitlbee.org/bitlbee/ticket/946
+
+--- bitlbee-3.0.5/protocols/skype/skype.c~	2012-02-18 12:55:09.000000000 +0200
++++ bitlbee-3.0.5/protocols/skype/skype.c	2012-04-15 15:12:57.245107505 +0300
+@@ -1170,8 +1170,7 @@
+ 	skype_printf(ic, "PASSWORD %s\n", ic->acc->pass);
+ 
+ 	/* This will download all buddies and groups. */
+-	st = skype_printf(ic, "SEARCH GROUPS CUSTOM\n");
+-	skype_printf(ic, "SEARCH FRIENDS\n");
++	st = skype_printf(ic, "SEARCH FRIENDS\n");
+ 
+ 	skype_printf(ic, "SET USERSTATUS ONLINE\n");
+