Update to version 1.2.1

Security fixes for three DoS vulnerabilities:

 Remote DoS on receiving malformed HTML
 Remote DoS on receiving certain messages over IRC
 Jabber remote crash

Changes:
- URL escaping now works with UTF-8 text. This may break some old
  log files.
- Revert to XOR auth for ICQ as the md5 is not fully functional
- Fix bug with going away while in a jabber chat
- MSN bug fixes (Felipe Contreras)
- Escape things properly in IRC

From MAINTAINER via PR pkg/29888

4 files changed, 9 insertions, 38 deletions

diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 1f0f0051f0b..d24ff8a509e 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.82 2005/03/22 09:47:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.83 2005/04/05 09:50:05 salo Exp $
 
-DISTNAME=	gaim-1.2.0
+DISTNAME=	gaim-1.2.1
 CATEGORIES=	chat x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
index b2596a5a70c..707dc04b68b 100644
--- a/chat/gaim/PLIST
+++ b/chat/gaim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2005/01/04 09:02:39 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.38 2005/04/05 09:50:05 salo Exp $
 bin/gaim
 bin/gaim-remote
 include/gaim/account.h
@@ -113,6 +113,7 @@ ${PKGLOCALEDIR}/locale/en_AU/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gaim.mo
@@ -124,8 +125,8 @@ ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/my_MM/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gaim.mo
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index 3dfd07cda66..816d061bee8 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.62 2005/03/22 09:47:47 jmmv Exp $
+$NetBSD: distinfo,v 1.63 2005/04/05 09:50:05 salo Exp $
 
-SHA1 (gaim-1.2.0.tar.bz2) = 6aa42c56a1c7dae34a831006ecd4f02dd1fe13a6
-RMD160 (gaim-1.2.0.tar.bz2) = e860058814c97db362e087526ca197746f4fd365
-Size (gaim-1.2.0.tar.bz2) = 5200934 bytes
+SHA1 (gaim-1.2.1.tar.bz2) = d5279ab3e9bb9d34272d48a9536c801d0f9d1441
+RMD160 (gaim-1.2.1.tar.bz2) = 34e4d3727a19b749ee74b3658d9e81956bb8ed75
+Size (gaim-1.2.1.tar.bz2) = 5223019 bytes
 SHA1 (patch-aa) = 555c394dbb4cd9ef4fea621d30ce72baae309067
-SHA1 (patch-ab) = b9758039c9b39006db6d3211099786e2614cbe5d
 SHA1 (patch-ad) = 21ffc478343793ce065c75a24ed0cf58b0677359
diff --git a/chat/gaim/patches/patch-ab b/chat/gaim/patches/patch-ab
deleted file mode 100644
index 93fc80cdf9c..00000000000
--- a/chat/gaim/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.14 2005/03/22 09:47:47 jmmv Exp $
-
---- src/protocols/yahoo/yahoochat.c.orig	Mon Mar 21 20:00:56 2005
-+++ src/protocols/yahoo/yahoochat.c	Mon Mar 21 20:03:09 2005
-@@ -342,9 +342,12 @@
- void yahoo_process_chat_join(GaimConnection *gc, struct yahoo_packet *pkt)
- {
- 	struct yahoo_data *yd = (struct yahoo_data *) gc->proto_data;
-+	GaimAccount *account;
- 	GaimConversation *c = NULL;
-+	GaimConversationUiOps *ops;
- 	GSList *l;
- 	GList *members = NULL;
-+	GList *roomies = NULL;
- 	char *room = NULL;
- 	char *topic = NULL;
- 	char *someid, *someotherid, *somebase64orhashosomething, *somenegativenumber;
-@@ -443,10 +446,8 @@
- 		yahoo_chat_add_users(GAIM_CONV_CHAT(c), members);
- 	}
- 
--	GList *roomies=NULL;
--	GaimConversationUiOps *ops;
- 	ops = gaim_conversation_get_ui_ops(c);
--	GaimAccount *account = gaim_connection_get_account(gc);
-+	account = gaim_connection_get_account(gc);
- 	for (l = account->deny; l != NULL; l = l->next) {
- 		for (roomies = members; roomies; roomies = roomies->next) {
- 			if (!gaim_utf8_strcasecmp((char *)l->data, roomies->data)) {