Added patch to fix proxy vulnerabiltiy. Applied patch to affected versions.

8 files changed, 59 insertions, 15 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 6dbc9f420007..4121abe242b0 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.87 2004/04/05 10:28:04 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.88 2004/04/05 15:04:17 zul Exp $
 
   05 Apr 2004; Guy Martin <gmsoft@gentoo.org> xchat-2.0.7.ebuild:
   Marked stable on hppa.
 
+  05 Apr 2004; Chuck Short <zul@gentoo.org> xchat-1.8.11.ebuild,
+  xchat-2.0.1.ebuild, xchat-2.0.6-r1.ebuild, xchat-2.0.7.ebuild,
+  xchat-2.0.8.ebuild, files/xc208-fixsocks5.diff:
+  Added patch to fix sock5 vulnerabiltiy for users using a proxy. Applied patch 
+  to affected versions.
+
 *xchat-2.0.8 (29 Mar 2004)
 
   29 Mar 2004; Chuck Short <zul@gentoo.org> xchat-2.0.8.ebuild:
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index eaddc6bd8515..00a05b69681e 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,14 +1,15 @@
-MD5 7f284ad13b684150861aa4366eb14fe2 ChangeLog 12145
+MD5 62d22a57c7fc83c90cdeaa4d96e5fcab xchat-2.0.1.ebuild 2023
+MD5 6052d88e6598a25b1c9b1adf6edd23d5 xchat-2.0.6-r1.ebuild 2469
+MD5 08703edc29fac00a3f855a66ffc10ce1 xchat-2.0.8.ebuild 2083
+MD5 581a2aef2ec292c5245fc7b2ec485684 xchat-1.8.11.ebuild 2299
+MD5 cf27401e857eb5f5d60b5bfb27a0e162 xchat-2.0.7.ebuild 2078
+MD5 c088b316783e0977f53e26502b072d60 ChangeLog 12428
 MD5 fb5772136a872c08434566d4f0bcdc7f metadata.xml 179
-MD5 dd7301da7d85bb9a2a559e0a2731d7c1 xchat-1.8.11.ebuild 2217
-MD5 3c00efd4e318063b3406138eeb1be17d xchat-2.0.1.ebuild 1946
-MD5 f10959baccdc0f5d02aac5a9e93a0233 xchat-2.0.8.ebuild 1997
-MD5 4413eef7d08114ed31069a3d548d7ec5 xchat-2.0.6-r1.ebuild 2389
-MD5 7ce9493ad2e04e5b17c9723e4190c8a7 xchat-2.0.7.ebuild 1995
-MD5 e2b99b2d2dfc54ba96e560c0ed8392df files/digest-xchat-1.8.11 65
 MD5 1ee812a2b3e28e3866413e75a80ff983 files/digest-xchat-2.0.1 64
-MD5 aac7b6be8968c5e6e1bdf580546a18fd files/digest-xchat-2.0.8 64
-MD5 1c19b8dfe0dfe3574cb74726f3f04466 files/digest-xchat-2.0.6-r1 64
 MD5 15dadb9b77f7536f6c7769689fc883c9 files/digest-xchat-2.0.7 64
+MD5 aac7b6be8968c5e6e1bdf580546a18fd files/digest-xchat-2.0.8 64
 MD5 a8f607d224408d4a27777d2ffce8beac files/xc1811fixststint.diff 422
+MD5 31de685eff3d16d9466416434c9fd6c3 files/xc208-fixsocks5.diff 688
+MD5 e2b99b2d2dfc54ba96e560c0ed8392df files/digest-xchat-1.8.11 65
+MD5 1c19b8dfe0dfe3574cb74726f3f04466 files/digest-xchat-2.0.6-r1 64
 MD5 a834756e7ca9b9d6146f1fd60a2cad5d files/xchat-2.0.6-fix_dccsend.patch 430
diff --git a/net-irc/xchat/files/xc208-fixsocks5.diff b/net-irc/xchat/files/xc208-fixsocks5.diff
new file mode 100644
index 000000000000..816801477075
--- /dev/null
+++ b/net-irc/xchat/files/xc208-fixsocks5.diff
@@ -0,0 +1,22 @@
+# Fix broken Socks5 traversal in xchat <= 2.0.8
+diff -ru xchat-2.0.8/src/common/server.c xchat-2.0.9/src/common/server.c
+--- xchat-2.0.8/src/common/server.c	2004-03-16 15:33:47.000000000 +1100
++++ xchat-2.0.8p1/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 --git a/net-irc/xchat/xchat-1.8.11.ebuild b/net-irc/xchat/xchat-1.8.11.ebuild
index ea69b5f9ee78..d2876ab2d27a 100644
--- a/net-irc/xchat/xchat-1.8.11.ebuild
+++ b/net-irc/xchat/xchat-1.8.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.11.ebuild,v 1.11 2004/01/04 01:34:08 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.11.ebuild,v 1.12 2004/04/05 15:04:17 zul Exp $
 
 inherit eutils
 
@@ -31,6 +31,9 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/xc1811fixststint.diff
 
+	# Fix for sock5 vulnerability - see #46856
+	epatch ${FILESDIR}/xc208-fixsocks5.diff
+
 	use python && ( \
 		cp configure configure.orig
 		local mylibs=`/usr/bin/python-config`
diff --git a/net-irc/xchat/xchat-2.0.1.ebuild b/net-irc/xchat/xchat-2.0.1.ebuild
index 4dfe670383c1..af7ce0c67ee3 100644
--- a/net-irc/xchat/xchat-2.0.1.ebuild
+++ b/net-irc/xchat/xchat-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.1.ebuild,v 1.10 2004/01/04 01:34:08 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.1.ebuild,v 1.11 2004/04/05 15:04:17 zul Exp $
 
 IUSE="perl tcltk python ssl gtk mmx ipv6"
 
@@ -50,6 +50,9 @@ src_compile() {
 		&& myopts="${myopts} --enable-ipv6" \
 		|| myopts="${myopts} --disable-ipv6"
 
+	# Fix for sock5 vulnerabilty - #46856
+	epatch ${FILESDIR}/xc208-fixsocks5.diff
+
 	econf \
 		--program-suffix=-2 \
 		${myopts} || die "Configure failed"
diff --git a/net-irc/xchat/xchat-2.0.6-r1.ebuild b/net-irc/xchat/xchat-2.0.6-r1.ebuild
index 291e1c4b28f6..18eb86cdc7bb 100644
--- a/net-irc/xchat/xchat-2.0.6-r1.ebuild
+++ b/net-irc/xchat/xchat-2.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.6-r1.ebuild,v 1.6 2004/01/08 17:22:06 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.6-r1.ebuild,v 1.7 2004/04/05 15:04:17 zul Exp $
 
 inherit flag-o-matic
 
@@ -45,6 +45,9 @@ src_compile() {
 		&& gtkconf="--disable-gtkfe" \
 		|| gtkconf="--enable-gtkfe"
 
+	# Fix for sock5 vulnerability - see 46856
+	epatch ${FILESDIR}/xc208-fixsocks5.diff
+
 	econf \
 		${gtkconf} \
 		`use_enable ssl openssl` \
diff --git a/net-irc/xchat/xchat-2.0.7.ebuild b/net-irc/xchat/xchat-2.0.7.ebuild
index 1bf6c7139830..747cc2cf9e71 100644
--- a/net-irc/xchat/xchat-2.0.7.ebuild
+++ b/net-irc/xchat/xchat-2.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.7.ebuild,v 1.8 2004/04/05 10:28:04 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.7.ebuild,v 1.9 2004/04/05 15:04:17 zul Exp $
 
 inherit flag-o-matic
 
@@ -45,6 +45,9 @@ src_compile() {
 		&& gtkconf="--disable-gtkfe" \
 		|| gtkconf="--enable-gtkfe"
 
+	# Fix for sock5 vulnerability - see #46856
+	epatch ${FILESDIR}/xc208-fixsocks5.diff
+
 	econf \
 		${gtkconf} \
 		`use_enable ssl openssl` \
diff --git a/net-irc/xchat/xchat-2.0.8.ebuild b/net-irc/xchat/xchat-2.0.8.ebuild
index 8cd2f7f7076d..c2c2109acd68 100644
--- a/net-irc/xchat/xchat-2.0.8.ebuild
+++ b/net-irc/xchat/xchat-2.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.8.ebuild,v 1.1 2004/03/29 12:31:32 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.8.ebuild,v 1.2 2004/04/05 15:04:17 zul Exp $
 
 inherit flag-o-matic
 
@@ -45,6 +45,9 @@ src_compile() {
 		&& gtkconf="--disable-gtkfe" \
 		|| gtkconf="--enable-gtkfe"
 
+	# fix for sock5 vulnerability - see #46856
+	epatch ${FILESDIR}/xc208-fixsocks5.diff
+
 	econf \
 		${gtkconf} \
 		`use_enable ssl openssl` \