[pkgsrc/trunk]: pkgsrc/chat/xchat2 - Remove the Socks-5 patch because the cur...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c8c922954604
branches:  trunk
changeset: 479090:c8c922954604
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Wed Aug 04 21:36:52 2004 +0000

description:
- Remove the Socks-5 patch because the current version is not vulnerable
  any more.  Should have been done when xchat was updated to 2.0.9.
- Fix xchat bug 986958.  Patch obtained from xchat CVS HEAD.

Bump PKGREVISION.

diffstat:

 chat/xchat2/Makefile         |   3 ++-
 chat/xchat2/distinfo         |   4 ++--
 chat/xchat2/patches/patch-aa |  29 ++++++++++++++++++-----------
 3 files changed, 22 insertions(+), 14 deletions(-)

diffs (59 lines):

diff -r 38b082ed828f -r c8c922954604 chat/xchat2/Makefile
--- a/chat/xchat2/Makefile      Wed Aug 04 21:20:54 2004 +0000
+++ b/chat/xchat2/Makefile      Wed Aug 04 21:36:52 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2004/07/18 14:47:29 schmonz Exp $
+# $NetBSD: Makefile,v 1.33 2004/08/04 21:36:52 minskim Exp $
 #
 
 DISTNAME=      xchat-2.0.10
+PKGREVISION=   1
 CATEGORIES=    chat gnome
 MASTER_SITES=  http://www.xchat.org/files/source/2.0/
 EXTRACT_SUFX=  .tar.bz2
diff -r 38b082ed828f -r c8c922954604 chat/xchat2/distinfo
--- a/chat/xchat2/distinfo      Wed Aug 04 21:20:54 2004 +0000
+++ b/chat/xchat2/distinfo      Wed Aug 04 21:36:52 2004 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2004/07/02 08:04:18 minskim Exp $
+$NetBSD: distinfo,v 1.13 2004/08/04 21:36:52 minskim Exp $
 
 SHA1 (xchat-2.0.10.tar.bz2) = bc5d45589a1c9a4b59edcb12699fd33344243c22
 Size (xchat-2.0.10.tar.bz2) = 1113265 bytes
-SHA1 (patch-aa) = 19abf05787106a93adcfc678bf25ad5d8543ba78
+SHA1 (patch-aa) = c7da24eb1c4fa571a431bab581539df6e9cf2b14
diff -r 38b082ed828f -r c8c922954604 chat/xchat2/patches/patch-aa
--- a/chat/xchat2/patches/patch-aa      Wed Aug 04 21:20:54 2004 +0000
+++ b/chat/xchat2/patches/patch-aa      Wed Aug 04 21:36:52 2004 +0000
@@ -1,13 +1,20 @@
-$NetBSD: patch-aa,v 1.4 2004/07/02 08:04:18 minskim Exp $
+$NetBSD: patch-aa,v 1.5 2004/08/04 21:36:52 minskim Exp $$)C
 
---- src/common/util.c.orig     2004-06-18 23:26:29.000000000 -0500
-+++ src/common/util.c
-@@ -631,7 +631,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);
+--- src/fe-gtk/fkeys.c.orig    2004-07-01 11:28:43.000000000 -0500
++++ src/fe-gtk/fkeys.c
+@@ -1368,9 +1368,14 @@ key_action_tab_comp (GtkWidget *t, GdkEv
+           prefix_len, skip_len = 0, is_nick, is_cmd = 0;
+       char buf[COMP_BUF], ent[CHANLEN], *postfix = NULL, *result, *ch;
+       GList *list = NULL, *tmp_list = NULL;
+-      const char *text = gtk_entry_get_text (GTK_ENTRY (t));
++      const char *text;
+       GCompletion *gcomp = NULL;
  
-       return buf;
++      /* force the IM Context to reset */
++      gtk_editable_set_editable (GTK_EDITABLE (t), FALSE);
++      gtk_editable_set_editable (GTK_EDITABLE (t), TRUE);
++       
++      text = GTK_ENTRY (t)->text;
+       if (text[0] == 0)
+               return 1;
+