[pkgsrc/trunk]: pkgsrc/doc Fix XChat's Socks-5 proxy code, see

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6a63a4f30f66
branches:  trunk
changeset: 472967:6a63a4f30f66
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Wed Apr 14 21:02:34 2004 +0000

description:
Fix XChat's Socks-5 proxy code, see
http://mail.nl.linux.org/xchat-announce/2004-04/msg00000.html.
Bump PKGREVISION.

diffstat:

 chat/xchat2/Makefile         |   4 ++--
 chat/xchat2/distinfo         |   3 ++-
 chat/xchat2/patches/patch-aa |  24 ++++++++++++++++++++++++
 doc/CHANGES                  |   3 ++-
 4 files changed, 30 insertions(+), 4 deletions(-)

diffs (66 lines):

diff -r 8581d0d90985 -r 6a63a4f30f66 chat/xchat2/Makefile
--- a/chat/xchat2/Makefile      Wed Apr 14 20:53:08 2004 +0000
+++ b/chat/xchat2/Makefile      Wed Apr 14 21:02:34 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2004/04/14 16:15:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.28 2004/04/14 21:02:34 xtraeme Exp $
 #
 
 DISTNAME=      xchat-2.0.8
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    chat gnome
 MASTER_SITES=  http://www.xchat.org/files/source/2.0/
 EXTRACT_SUFX=  .tar.bz2
diff -r 8581d0d90985 -r 6a63a4f30f66 chat/xchat2/distinfo
--- a/chat/xchat2/distinfo      Wed Apr 14 20:53:08 2004 +0000
+++ b/chat/xchat2/distinfo      Wed Apr 14 21:02:34 2004 +0000
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.9 2004/03/24 20:35:09 xtraeme Exp $
+$NetBSD: distinfo,v 1.10 2004/04/14 21:02:34 xtraeme Exp $
 
 SHA1 (xchat-2.0.8.tar.bz2) = 68177f242001a2632f4f474989ee9a8a41e725f9
 Size (xchat-2.0.8.tar.bz2) = 997439 bytes
+SHA1 (patch-aa) = 98e1efa4e83bcfb76dafeb96176d760738e8021b
diff -r 8581d0d90985 -r 6a63a4f30f66 chat/xchat2/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/xchat2/patches/patch-aa      Wed Apr 14 21:02:34 2004 +0000
@@ -0,0 +1,24 @@
+# Fix broken Socks5 traversal in xchat <= 2.0.8
+
+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];
+ 
+       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;
+       }
diff -r 8581d0d90985 -r 6a63a4f30f66 doc/CHANGES
--- a/doc/CHANGES       Wed Apr 14 20:53:08 2004 +0000
+++ b/doc/CHANGES       Wed Apr 14 21:02:34 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5576 2004/04/14 15:45:45 manu Exp $
+$NetBSD: CHANGES,v 1.5577 2004/04/14 21:05:04 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -1951,3 +1951,4 @@
        Updated timidity to 2.13.0 [adam 2004-04-14]
        Added libspf-alt-0.4.0 [manu 2004-04-14]
        Updated milter-greylist to 1.2 [manu 2004-04-14]
+       Updated xchat2 to 2.0.8nb2 [xtraeme 2004-04-14]