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

5 files changed, 25 insertions, 6 deletions

diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index 7060e33252eb..fdd32729ee5f 100644
--- a/sys-kernel/usermode-sources/ChangeLog
+++ b/sys-kernel/usermode-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/usermode-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.38 2004/06/29 17:28:39 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.39 2004/06/30 18:10:28 plasmaroo Exp $
+
+*usermode-sources-2.6.6-r2 (30 Jun 2004)
+
+  30 Jun 2004; <plasmaroo@gentoo.org> -usermode-sources-2.6.6-r1.ebuild,
+  +usermode-sources-2.6.6-r2.ebuild,
+  +files/usermode-sources-2.6.IPTables-RDoS.patch:
+  Version bump for the 2.6 IPTables RDoS vulnerability; bug #55694.
 
 *usermode-sources-2.4.24-r5 (29 Jun 2004)
 
diff --git a/sys-kernel/usermode-sources/Manifest b/sys-kernel/usermode-sources/Manifest
index 0f9389040411..154baddc0c38 100644
--- a/sys-kernel/usermode-sources/Manifest
+++ b/sys-kernel/usermode-sources/Manifest
@@ -1,20 +1,21 @@
-MD5 767f8b3b46cef5acf384953a120300a7 usermode-sources-2.6.6-r1.ebuild 835
-MD5 feb704360681158c261a3d5b91c3e28e ChangeLog 9361
+MD5 3628107752de0003dd0976ed7a570267 ChangeLog 9633
 MD5 bdc320694b696c490e79334c05a037d6 usermode-sources-2.4.26-r2.ebuild 1851
 MD5 a76f13cb946fc2720c04b189616da2de metadata.xml 159
+MD5 1fa698a8fbdf6d3d35f655ebeb329a1b usermode-sources-2.6.6-r2.ebuild 878
 MD5 e414b2e930ee6446164f0bccf16b42df usermode-sources-2.4.24-r5.ebuild 2598
 MD5 9c816c892d6e3d3f0b7b77d3d503ab10 files/usermode-sources-2.4.24.CAN-2004-0075.patch 634
 MD5 174438d215b70cad5ffb00ca8123c062 files/usermode-sources-2.4.24.munmap.patch 837
 MD5 02c062ec3a11a6a1498cdf0b1716c90a files/usermode-sources-2.6.6.FPULockup-53804.patch 895
+MD5 288e26eaaaf3c35f214951caa52754ab files/digest-usermode-sources-2.6.6-r2 132
 MD5 c460ea130cb4ae84a5063ba044e3ce72 files/usermode-sources-2.4.24.CAN-2004-0427.patch 460
 MD5 147fec50180ad91b6260fc7201dcb90f files/usermode-sources-2.4.24.CAN-2004-0010.patch 6050
 MD5 dc18e982f8149588a291956481885a8c files/usermode-sources-2.4.CAN-2004-0495.patch 17549
 MD5 2f7e35e02cfe97af5e6e49bf84614b42 files/digest-usermode-sources-2.4.24-r5 134
-MD5 288e26eaaaf3c35f214951caa52754ab files/digest-usermode-sources-2.6.6-r1 132
 MD5 de75cfa969ed092578d9ddda6c5be334 files/usermode-sources-2.4.24.CAN-2004-0181.patch 1233
 MD5 df8bd0d5ef39221c9dec36a99223c690 files/digest-usermode-sources-2.4.26-r2 134
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/usermode-sources-2.4.24.CAN-2004-0178.patch 424
 MD5 d4a740ae56c2049247083af387a22a85 files/usermode-sources-2.4.26.CAN-2004-0394.patch 350
+MD5 39361f8d16b1fe5891aab62e92f8cd30 files/usermode-sources-2.6.IPTables-RDoS.patch 390
 MD5 0f66013f643c79c97fda489618a4e2fd files/usermode-sources-2.4.CAN-2004-0535.patch 476
 MD5 c9da1bc82b906f6abc648c056e7bf662 files/usermode-sources-2.4.FPULockup-53804.patch 354
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/usermode-sources-2.4.24.CAN-2004-0177.patch 384
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r1 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r2
index 97a9c9ea6e86..97a9c9ea6e86 100644
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r1
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r2
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.6.IPTables-RDoS.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.IPTables-RDoS.patch
new file mode 100644
index 000000000000..8f89d1605c9a
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-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/usermode-sources/usermode-sources-2.6.6-r1.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.6-r2.ebuild
index a4a3226883d7..19fb9bd83eb7 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.6.6-r1.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.6.6-r2.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/usermode-sources/usermode-sources-2.6.6-r1.ebuild,v 1.2 2004/06/24 23:01:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.6-r2.ebuild,v 1.1 2004/06/30 18:10:28 plasmaroo Exp $
 
 K_NOUSENAME="yes"
 ETYPE="sources"
@@ -13,7 +13,7 @@ KV="${OKV}${EXTRAVERSION}"
 S="${WORKDIR}/linux-${KV}"
 IUSE=""
 
-UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2 ${FILESDIR}/${P}.FPULockup-53804.patch"
+UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2 ${FILESDIR}/${P}.FPULockup-53804.patch ${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch"
 
 DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${PV}.tar.bz2