From f6cf7dbfa1eea5e7359c6a0cc111e01334c963cc Mon Sep 17 00:00:00 2001
From: sborrill <sborrill@pkgsrc.org>
Date: Tue, 20 Feb 2007 18:45:00 +0000
Subject: Remove a deprecated request from the Jabber plugin so that it works
 with ejabberd servers.

http://www.xmpp.org/extensions/xep-0094.html
XEP-0094: Agent Information
Status: Obsolete
Last Updated: 2003-10-08

The problem is that centericq treats some error replies as pertaining
to authentication.  Previously ejabberd sent "feature-not-implemented"
for unknown requests, but now it sends "service-unavailable", as
required by the RFC.  centericq has a workaround to ignore the former
error, but not the latter.  Therefore it believes that authentication
has failed (which is not the case).

Thanks to Jonathan Schleifer and Magnus Henoch for the patch and
clarification.
---
 chat/centericq/Makefile         |  4 ++--
 chat/centericq/distinfo         |  3 ++-
 chat/centericq/patches/patch-au | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 chat/centericq/patches/patch-au

(limited to 'chat')

diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile
index 2d08e70a028..096f834fe56 100644
--- a/chat/centericq/Makefile
+++ b/chat/centericq/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2007/02/20 17:38:52 sborrill Exp $
+# $NetBSD: Makefile,v 1.65 2007/02/20 18:45:00 sborrill Exp $
 #
 
 DISTNAME=	centericq-4.21.0
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	chat
 MASTER_SITES=	http://thekonst.net/download/ \
 		http://centericq.de/archive/source/releases/
diff --git a/chat/centericq/distinfo b/chat/centericq/distinfo
index 697d4fb72b2..440b79bf7d1 100644
--- a/chat/centericq/distinfo
+++ b/chat/centericq/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2006/10/01 13:56:00 rillig Exp $
+$NetBSD: distinfo,v 1.22 2007/02/20 18:45:00 sborrill Exp $
 
 SHA1 (centericq-4.21.0.tar.bz2) = 26b07c4bdcbe8c6888ceab98140b33007bec8554
 RMD160 (centericq-4.21.0.tar.bz2) = 69207fcaf5c90b9ae4609221526b839659c5ccfc
@@ -23,3 +23,4 @@ SHA1 (patch-aq) = ce0db172171d874cd35c4b0293ea96f5a580810e
 SHA1 (patch-ar) = b06ba8fad9a2dbcfacb0c81e2689cca02a38dd01
 SHA1 (patch-as) = 55822a88a4fd17e57a06f0f186a6649fe3e4b092
 SHA1 (patch-at) = 7dd7158371940522c7d393ea8d9194c2e4154cf8
+SHA1 (patch-au) = 6e33ed258b9762afc0f2bd0e4e726818f8811619
diff --git a/chat/centericq/patches/patch-au b/chat/centericq/patches/patch-au
new file mode 100644
index 00000000000..6bf7745e3d9
--- /dev/null
+++ b/chat/centericq/patches/patch-au
@@ -0,0 +1,16 @@
+$NetBSD: patch-au,v 1.1 2007/02/20 18:45:00 sborrill Exp $
+
+--- src/hooks/jabberhook.cc.orig	2007-02-20 18:20:36.000000000 +0000
++++ src/hooks/jabberhook.cc	2007-02-20 18:21:08.000000000 +0000
+@@ -887,11 +887,6 @@
+ void jabberhook::gotloggedin() {
+     xmlnode x;
+ 
+-    x = jutil_iqnew(JPACKET__GET, NS_AGENTS);
+-    xmlnode_put_attrib(x, "id", "Agent List");
+-    jab_send(jc, x);
+-    xmlnode_free(x);
+-
+     x = jutil_iqnew(JPACKET__GET, NS_ROSTER);
+     xmlnode_put_attrib(x, "id", "Roster");
+     jab_send(jc, x);
-- 
cgit v1.2.3