Version bump for the 2.6 IPTables RDoS vulnerability; bug #55694.

5 files changed, 25 insertions, 5 deletions

diff --git a/sys-kernel/uclinux-sources/ChangeLog b/sys-kernel/uclinux-sources/ChangeLog
index 3bea5b10a312..3cd8ae979f23 100644
--- a/sys-kernel/uclinux-sources/ChangeLog
+++ b/sys-kernel/uclinux-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/uclinux-sources
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.11 2004/06/25 20:15:29 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.12 2004/06/30 17:51:14 plasmaroo Exp $
+
+*uclinux-sources-2.6.7_p0-r1 (30 Jun 2004)
+
+  30 Jun 2004; <plasmaroo@gentoo.org> +uclinux-sources-2.6.7_p0-r1.ebuild,
+  -uclinux-sources-2.6.7_p0.ebuild,
+  +files/uclinux-sources-2.6.IPTables-RDoS.patch:
+  Version bump for the 2.6 IPTables RDoS vulnerability; bug #55694.
 
 *uclinux-sources-2.4.26_p0-r2 (25 Jun 2004)
 
diff --git a/sys-kernel/uclinux-sources/Manifest b/sys-kernel/uclinux-sources/Manifest
index b61e89447825..6a2de40fa922 100644
--- a/sys-kernel/uclinux-sources/Manifest
+++ b/sys-kernel/uclinux-sources/Manifest
@@ -1,10 +1,11 @@
-MD5 4062f585a155b889d68ae27e6f36f63f ChangeLog 3173
-MD5 f1f5d10e24c58195fa7baf63cae16a54 uclinux-sources-2.6.7_p0.ebuild 1255
+MD5 36beb05088f17d40e8e2863b4525950f ChangeLog 3447
+MD5 137dde9541cab35af93d46d956668f64 uclinux-sources-2.6.7_p0-r1.ebuild 1367
 MD5 f3fa6c474b8727f8215534b7fc9c93ba metadata.xml 304
 MD5 761e2bd0885471c59fbe56d25276b798 uclinux-sources-2.4.26_p0-r2.ebuild 1631
 MD5 dc18e982f8149588a291956481885a8c files/uclinux-sources-2.4.26_p0.CAN-2004-0495.patch 17549
 MD5 d4a740ae56c2049247083af387a22a85 files/uclinux-sources-2.4.26_p0.CAN-2004-0394.patch 350
+MD5 51b7d703355037eac400cf789769f9c7 files/digest-uclinux-sources-2.6.7_p0-r1 135
 MD5 0f66013f643c79c97fda489618a4e2fd files/uclinux-sources-2.4.26_p0.CAN-2004-0535.patch 476
 MD5 62306f42a51f255b1d9cd1597cefa926 files/digest-uclinux-sources-2.4.26_p0-r2 139
 MD5 c9da1bc82b906f6abc648c056e7bf662 files/uclinux-sources-2.4.26_p0.FPULockup-53804.patch 354
-MD5 51b7d703355037eac400cf789769f9c7 files/digest-uclinux-sources-2.6.7_p0 135
+MD5 39361f8d16b1fe5891aab62e92f8cd30 files/uclinux-sources-2.6.IPTables-RDoS.patch 390
diff --git a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0 b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r1
index a0d14dcb41a9..a0d14dcb41a9 100644
--- a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0
+++ b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r1
diff --git a/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.IPTables-RDoS.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.IPTables-RDoS.patch
new file mode 100644
index 000000000000..8f89d1605c9a
--- /dev/null
+++ b/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.IPTables-RDoS.patch
@@ -0,0 +1,11 @@
+--- net/ipv4/netfilter/ip_tables.c.orig	2004-04-04 05:36:47.000000000 +0200
++++ net/ipv4/netfilter/ip_tables.c	2004-06-24 21:24:26.000000000 +0200
+@@ -1461,7 +1461,7 @@
+ 		int *hotdrop)
+ {
+ 	/* tcp.doff is only 4 bits, ie. max 15 * 4 bytes */
+-	char opt[60 - sizeof(struct tcphdr)];
++	u_int8_t opt[60 - sizeof(struct tcphdr)];
+ 	unsigned int i;
+ 
+ 	duprintf("tcp_match: finding option\n");
diff --git a/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0.ebuild b/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r1.ebuild
index e2e433728ef2..10c3dca64c44 100644
--- a/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0.ebuild
+++ b/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0.ebuild,v 1.1 2004/06/25 20:15:29 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r1.ebuild,v 1.1 2004/06/30 17:51:14 plasmaroo Exp $
 
 IUSE=""
 
@@ -39,6 +39,7 @@ src_unpack() {
 
 	cd linux-${KV}
 	epatch ../${MY_P/linux/${base}}.${patch} || die "Failed to apply uClinux patch!"
+	epatch ${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch || die "Failed to apply the IPTables RDoS security patch!"
 
 	set MY_ARCH=${ARCH}
 	unset ARCH