diff options
author | xtraeme <xtraeme@pkgsrc.org> | 2004-04-14 21:02:34 +0000 |
---|---|---|
committer | xtraeme <xtraeme@pkgsrc.org> | 2004-04-14 21:02:34 +0000 |
commit | 7487b6e111e45f3918f9b5debc822ecee3a9254e (patch) | |
tree | adc48ea1a011a40d4b42134bbd60fcde5fb1c8fe /chat/xchat2 | |
parent | 15492a70a4f4706128ea172ef2a6459a029662b8 (diff) | |
download | pkgsrc-7487b6e111e45f3918f9b5debc822ecee3a9254e.tar.gz |
Fix XChat's Socks-5 proxy code, see
http://mail.nl.linux.org/xchat-announce/2004-04/msg00000.html.
Bump PKGREVISION.
Diffstat (limited to 'chat/xchat2')
-rw-r--r-- | chat/xchat2/Makefile | 4 | ||||
-rw-r--r-- | chat/xchat2/distinfo | 3 | ||||
-rw-r--r-- | chat/xchat2/patches/patch-aa | 24 |
3 files changed, 28 insertions, 3 deletions
diff --git a/chat/xchat2/Makefile b/chat/xchat2/Makefile index 28530d04e13..d671e2f94e3 100644 --- a/chat/xchat2/Makefile +++ b/chat/xchat2/Makefile @@ -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 --git a/chat/xchat2/distinfo b/chat/xchat2/distinfo index 57e500dda8c..22b4d5a6c31 100644 --- a/chat/xchat2/distinfo +++ b/chat/xchat2/distinfo @@ -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 --git a/chat/xchat2/patches/patch-aa b/chat/xchat2/patches/patch-aa new file mode 100644 index 00000000000..00e14717bb8 --- /dev/null +++ b/chat/xchat2/patches/patch-aa @@ -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; + } |