Update xchat2 to 2.0.9.

Changes:
 - Updated translations (bg, cs, de, en_GB, eu, fi, lt, nl, ru, sk,
                         uk, wa).
 - Fixed the Socks5 overflow security bug.
 - DCC IP address setting can now be a hostname too (Flavio
   Chierichetti) [773229].
 - Don't try random DCC ports when a range is set (mib) [889987].
 - Fix: Spurious nick completion (mib) [916944].
 - Serverlist passwd box is now masked (Cristian Peraferrer) [920113].
 - Fix: Sometimes messes up the tab order on reconnect (Gabor Szeder)
   [941773].
 - Fix: Crashes when setting $CHARSET to nonexistant charset [945855].
 - Plugin API: Added some fields to the "channels" list.
 - Plugin API: Added "win_status" and "xchatdirfs" fields to
   xchat_get_info.
 - Plugin API: Added xchat_send_modes() function.
 - Fix: Unload, then reload a plugin on FreeBSD fails (Kevin Leung).
 - Plugins should now work on HPUX too.
 - Perl-plugin: Fixes for 3 arg version of emit_print, unhooking the
   same hook multiple times and get_list returning correct values for
   address32 field and some memory leaks (Lian Situ).
 - Made menu keybindings work when the menubar is hidden on GTK 2.4.
 - Added support for the new GTK 2.4 file chooser dialog.
 - Fix for BiDi in xtext (Ilya Konstantinov).
 - Smaller bug fixes [962211] [958599] [950353] and
   [945617] (Frederic Krueger).

4 files changed, 19 insertions, 31 deletions

diff --git a/chat/xchat2/Makefile b/chat/xchat2/Makefile
index d047acc8740..0fa5b5f016f 100644
--- a/chat/xchat2/Makefile
+++ b/chat/xchat2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2004/05/07 01:14:47 xtraeme Exp $
+# $NetBSD: Makefile,v 1.30 2004/06/07 05:56:00 minskim Exp $
 #
 
-DISTNAME=	xchat-2.0.8
-PKGREVISION=	2
+DISTNAME=	xchat-2.0.9
 CATEGORIES=	chat gnome
 MASTER_SITES=	http://www.xchat.org/files/source/2.0/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/chat/xchat2/distinfo b/chat/xchat2/distinfo
index 22b4d5a6c31..5a8ac46458a 100644
--- a/chat/xchat2/distinfo
+++ b/chat/xchat2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2004/04/14 21:02:34 xtraeme Exp $
+$NetBSD: distinfo,v 1.11 2004/06/07 05:56:00 minskim Exp $
 
-SHA1 (xchat-2.0.8.tar.bz2) = 68177f242001a2632f4f474989ee9a8a41e725f9
-Size (xchat-2.0.8.tar.bz2) = 997439 bytes
-SHA1 (patch-aa) = 98e1efa4e83bcfb76dafeb96176d760738e8021b
+SHA1 (xchat-2.0.9.tar.bz2) = b0b810b5123864a624988169f4acb08aef1739e6
+Size (xchat-2.0.9.tar.bz2) = 1093203 bytes
+SHA1 (patch-aa) = f802e1f2de1a9272f4c668a84cc41c45b16c370d
diff --git a/chat/xchat2/patches/patch-aa b/chat/xchat2/patches/patch-aa
index b6255dddcb7..34e0ded440e 100644
--- a/chat/xchat2/patches/patch-aa
+++ b/chat/xchat2/patches/patch-aa
@@ -1,25 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2004/05/07 12:06:47 cjep Exp $
-# Fix broken Socks5 traversal in xchat <= 2.0.8
+$NetBSD: patch-aa,v 1.3 2004/06/07 05:56:00 minskim Exp $
 
-http://mail.nl.linux.org/xchat-announce/2004-04/msg00000.html
-
---- src/common/server.c	2004-03-16 15:33:47.000000000 +1100
-+++ src/common/server.c	2004-04-05 15:33:15.000000000 +1000
-@@ -1054,7 +1054,7 @@
- 	struct sock5_connect1 sc1;
- 	unsigned char *sc2;
- 	unsigned int packetlen, addrlen;
--	unsigned char buf[10];
-+	unsigned char buf[260];
+--- src/common/util.c.orig	2004-05-29 05:19:23.000000000 -0500
++++ src/common/util.c
+@@ -605,7 +605,7 @@ get_cpu_str (void)
+ 	} else
+ #endif
+ 		snprintf (buf, 128,
+-					(cpus == 1) ? "%s %s [%s]" : "%s %s [%s/SMP]",
++					"%s %s [%s]",
+ 					un.sysname, un.release, un.machine);
  
- 	sc1.version = 5;
- 	sc1.nmethods = 1;
-@@ -1095,7 +1095,7 @@
- 	{
- 		if (recv (sok, buf, 1, 0) != 1)
- 			return 1;
--		packetlen = buf[0] + 2;
-+		packetlen = buf[0] + 2;	/* can't exceed 260 */
- 		if (recv (sok, buf, packetlen, 0) != packetlen)
- 			return 1;
- 	}
+ 	return buf;
diff --git a/doc/CHANGES b/doc/CHANGES
index 168c14b742f..49c779b9cb3 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6177 2004/06/07 05:54:01 minskim Exp $
+$NetBSD: CHANGES,v 1.6178 2004/06/07 05:56:00 minskim Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -2837,3 +2837,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Updated verilog-current to 20040606 [dmcmahill 2004-06-07]
 	Updated bzflag to 1.10.6 [snj 2004-06-07]
 	Updated grepmail to 5.23 [snj 2004-06-07]
+	Updated xchat2 to 2.0.9 [minskim 2004-06-07]