Security Updates and housecleaning. Removed 2.4.25, 2.6.4, & 2.6.6 ebuilds. Security patchball has fixes for CAN-2004-0814 and CAN-2004-0816, plus a remote DDoS and race conditions in binfmt_elf. Misc. patches include new ramdisk code for arch/mips/ramdisk/*, spelling tweak to RM52xx CPU in Kconfig, and a new gbefb patch from onion2(tal.org).

18 files changed, 67 insertions, 385 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 49702d4d6512..986f96b47536 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.60 2004/11/02 06:42:51 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.61 2004/11/14 04:59:41 kumba Exp $
+
+*mips-sources-2.6.8.1-r2 (13 Nov 2004)
+
+  13 Nov 2004; Joshua Kinard <kumba@gentoo.org>
+  -mips-sources-2.4.25-r9.ebuild, +mips-sources-2.4.26-r10.ebuild,
+  -mips-sources-2.4.26-r9.ebuild, -mips-sources-2.4.27-r1.ebuild,
+  +mips-sources-2.4.27-r2.ebuild, -mips-sources-2.6.4-r9.ebuild,
+  -mips-sources-2.6.6-r9.ebuild, -mips-sources-2.6.7-r7.ebuild,
+  +mips-sources-2.6.7-r8.ebuild, -mips-sources-2.6.8.1-r1.ebuild,
+  +mips-sources-2.6.8.1-r2.ebuild, -mips-sources-2.6.9-r2.ebuild,
+  +mips-sources-2.6.9-r3.ebuild:
+  Security Updates and housecleaning. Removed 2.4.25, 2.6.4, & 2.6.6 ebuilds.
+  Security patchball has fixes for CAN-2004-0814 and CAN-2004-0816, plus a
+  remote DDoS and race conditions in binfmt_elf. Misc. patches include new
+  ramdisk code for arch/mips/ramdisk/*, spelling tweak to RM52xx CPU in Kconfig,
+  and a new gbefb patch from onion2(tal.org).
 
 *mips-sources-2.6.9-r2 (02 Nov 2004)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 8a207ed5a079..cc9df3954bed 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,18 +1,12 @@
-MD5 788fb4aaaf403c31d9a91158c12bef00 ChangeLog 24629
+MD5 8933c0bd0d83b18da04824492537719f ChangeLog 25500
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 893517a6e0ac0aacc24a86edd1b1a30a mips-sources-2.4.25-r9.ebuild 3541
-MD5 934e335d3e0c5b3db9d0eedb85939a08 mips-sources-2.4.26-r9.ebuild 2826
-MD5 2bc3fe743615151aee229914be53ee7a mips-sources-2.4.27-r1.ebuild 2508
-MD5 71f1e5f2f6af33e5864642f03005e865 mips-sources-2.6.4-r9.ebuild 4193
-MD5 a7cea5c94f6572ad21d374d6cc1bc1f7 mips-sources-2.6.6-r9.ebuild 3827
-MD5 9fc3ac7b1ea25e3080ea3dc04e3bc28e mips-sources-2.6.7-r7.ebuild 4006
-MD5 af43204cafe2af3476713744bae0fae8 mips-sources-2.6.8.1-r1.ebuild 4391
-MD5 67a1dbc30e4d33c12ea01bba2d508b66 mips-sources-2.6.9-r2.ebuild 5210
-MD5 78fa861fb27977a77c40bb56fe1a9ae4 files/digest-mips-sources-2.4.25-r9 386
-MD5 59a7ea73fd0d417be02d033a892f80a7 files/digest-mips-sources-2.4.26-r9 387
-MD5 189b09f9cd21ff2c298279c2a91be8f4 files/digest-mips-sources-2.4.27-r1 387
-MD5 9702a71d858fa96d68bf98b60777b6ff files/digest-mips-sources-2.6.4-r9 468
-MD5 504a5c390970d4da0c25c1eefa6a3958 files/digest-mips-sources-2.6.6-r9 468
-MD5 ec15aeb9b5f17b470c6080185ccf7dba files/digest-mips-sources-2.6.7-r7 468
-MD5 666046b65f46134e19982a15ea560454 files/digest-mips-sources-2.6.8.1-r1 389
-MD5 a6fe1f504417c3267908503e7034ae4d files/digest-mips-sources-2.6.9-r2 385
+MD5 db97df7e123b588d180820cd098a4d51 mips-sources-2.4.26-r10.ebuild 3028
+MD5 a902bc4c48a507a8e1618c44b9dc7f25 mips-sources-2.4.27-r2.ebuild 2709
+MD5 617ba2499dae3914087adefe172a02f2 mips-sources-2.6.7-r8.ebuild 4276
+MD5 cab65d5ba5809113b0c2e69d643cceff mips-sources-2.6.8.1-r2.ebuild 4597
+MD5 c56803a9cfb4b58eae67e37a136c10ff mips-sources-2.6.9-r3.ebuild 5395
+MD5 2d042abdd2f1083d00fe972bf7b51601 files/digest-mips-sources-2.4.26-r10 387
+MD5 d75a072cdec44b6b1d6f585ef9aedefd files/digest-mips-sources-2.4.27-r2 387
+MD5 15b4aafde28e2064b0f476e7c31c4bdc files/digest-mips-sources-2.6.7-r8 468
+MD5 b38ed1de814b4822ad313bad693ac972 files/digest-mips-sources-2.6.8.1-r2 389
+MD5 79d4851b99202fc054865a3cd12470ae files/digest-mips-sources-2.6.9-r3 385
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r9 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r9
deleted file mode 100644
index d45c7c8fb23d..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r9
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
-MD5 10b3bc2866a95e483f19093c980d9786 mipscvs-2.4.25-20040222.diff.bz2 89680
-MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
-MD5 f271e0617626229c9235149d42c26712 mips-sources-generic_patches-1.0.tar.bz2 32520
-MD5 18ad839cec259e123f743432dca994e3 cobalt-patches-24xx-1.4.tar.bz2 5809
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r9 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r10
index 249e42d54f5f..f3f305c7ee8a 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r9
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r10
@@ -1,5 +1,5 @@
 MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
 MD5 36be1f4dfebd34b9ad7b69dab9add812 mipscvs-2.4.26-20040712.diff.bz2 343699
-MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
+MD5 15e65d792b18ed1b16fd2a18faad6110 mips-sources-security_patches-1.4.tar.bz2 85479
 MD5 f271e0617626229c9235149d42c26712 mips-sources-generic_patches-1.0.tar.bz2 32520
 MD5 18ad839cec259e123f743432dca994e3 cobalt-patches-24xx-1.4.tar.bz2 5809
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r2
index 033dae1e7eb0..7249131a84ef 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r1
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r2
@@ -1,5 +1,5 @@
 MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453
 MD5 15a51fcc518466730f54fc6c87f11ee0 mipscvs-2.4.27-20040814.diff.bz2 194003
-MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
+MD5 15e65d792b18ed1b16fd2a18faad6110 mips-sources-security_patches-1.4.tar.bz2 85479
 MD5 f271e0617626229c9235149d42c26712 mips-sources-generic_patches-1.0.tar.bz2 32520
 MD5 18ad839cec259e123f743432dca994e3 cobalt-patches-24xx-1.4.tar.bz2 5809
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r9 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r9
deleted file mode 100644
index 9a0007b7fdac..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r9
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 335f06eba1e5372ba38a0d2b253629bd linux-2.6.4.tar.bz2 34386912
-MD5 99f597693cc1ea2f3fe162600405f32f mipscvs-2.6.4-20040311.diff.bz2 437306
-MD5 9f0061615a95c9e31f30b2b7dacd23ef ip32-iluxa-minpatchset-20040229.diff.bz2 1409
-MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
-MD5 f271e0617626229c9235149d42c26712 mips-sources-generic_patches-1.0.tar.bz2 32520
-MD5 62fa5bbee1bcb8b93e41a73abede8132 cobalt-patches-26xx-1.4.tar.bz2 7596
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r9 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r9
deleted file mode 100644
index fcaedf5d445d..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r9
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 5218790bc3db41e77a7422969639a9ad linux-2.6.6.tar.bz2 34896138
-MD5 28229f4685c0109735f7eceb3ea78f31 mipscvs-2.6.6-20040604.diff.bz2 418820
-MD5 99ae243d80acc8692115f58ab2210c25 ip32-iluxa-minpatchset-20040402.diff.bz2 2260
-MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
-MD5 f271e0617626229c9235149d42c26712 mips-sources-generic_patches-1.0.tar.bz2 32520
-MD5 62fa5bbee1bcb8b93e41a73abede8132 cobalt-patches-26xx-1.4.tar.bz2 7596
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r7 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r8
index d7a89ed42fc8..37154f22b5de 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r7
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r8
@@ -1,6 +1,6 @@
 MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
 MD5 4d59f1ecb42edff3d704bb7c22c42305 mipscvs-2.6.7-20040621.diff.bz2 385542
 MD5 99ae243d80acc8692115f58ab2210c25 ip32-iluxa-minpatchset-20040402.diff.bz2 2260
-MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
+MD5 15e65d792b18ed1b16fd2a18faad6110 mips-sources-security_patches-1.4.tar.bz2 85479
 MD5 f271e0617626229c9235149d42c26712 mips-sources-generic_patches-1.0.tar.bz2 32520
 MD5 c66fffb69cbe68549df23066e95684d6 cobalt-patches-26xx-1.5.tar.bz2 7842
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r2
index e928bf51ee76..b7205d24f63a 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r1
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r2
@@ -1,5 +1,5 @@
 MD5 9517ca999e822b898fbdc7e72796b1aa linux-2.6.8.1.tar.bz2 35628066
 MD5 9a61fd7455debc01d0c450bb1af10fc7 mipscvs-2.6.8.1-20040822.diff.bz2 486866
-MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
+MD5 15e65d792b18ed1b16fd2a18faad6110 mips-sources-security_patches-1.4.tar.bz2 85479
 MD5 f271e0617626229c9235149d42c26712 mips-sources-generic_patches-1.0.tar.bz2 32520
 MD5 65881d9d5fd8a16a1efcf54944fa8c27 cobalt-patches-26xx-1.7.tar.bz2 7441
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r2 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r3
index acbf3129b386..2ce794be5a17 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r2
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r3
@@ -1,5 +1,5 @@
 MD5 e921200f074ca97184e150ef5a4af825 linux-2.6.9.tar.bz2 36261440
 MD5 352cc4ab108e67f3e0db4e5f3dc5cb07 mipscvs-2.6.9-20041022.diff.bz2 352768
-MD5 7f039a1527b4dd2710326343290f6982 mips-sources-security_patches-1.3.tar.bz2 60344
-MD5 35e24f596abdeb44468d70a21d266e2a mips-sources-generic_patches-1.3.tar.bz2 52928
+MD5 15e65d792b18ed1b16fd2a18faad6110 mips-sources-security_patches-1.4.tar.bz2 85479
+MD5 e836202d84b4add5ad619df9ff0b289c mips-sources-generic_patches-1.4.tar.bz2 54375
 MD5 dc6516ffe9fc9b264fc571874d30af47 cobalt-patches-26xx-1.8.tar.bz2 7414
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.25-r9.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.25-r9.ebuild
deleted file mode 100644
index a21524cf5f3f..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.4.25-r9.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.25-r9.ebuild,v 1.1 2004/09/29 09:46:15 kumba Exp $
-
-
-# Version Data
-OKV=${PV/_/-}
-CVSDATE="20040222"			# Date of diff between kernel.org and lmo CVS
-COBALTPATCHVER="1.4"			# Tarball version for cobalt patches
-SECPATCHVER="1.2"			# Tarball version for security patches
-GENPATCHVER="1.0"			# Tarball version for generic patches
-EXTRAVERSION="-mipscvs-${CVSDATE}"
-KV="${OKV}${EXTRAVERSION}"
-
-# Miscellaneous stuff
-S=${WORKDIR}/linux-${OKV}-${CVSDATE}
-
-# Eclass stuff
-ETYPE="sources"
-inherit kernel eutils
-
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 22 Feb 2004
-# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
-# 4) patch to fix the mips64 Makefile to allow building of mips64 kernels
-# 5) Security Fixes
-# 6) Patches for Cobalt support
-
-
-DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
-		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2
-		mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2
-		cobalt? ( mirror://gentoo/cobalt-patches-24xx-${COBALTPATCHVER}.tar.bz2 )"
-
-HOMEPAGE="http://www.linux-mips.org/"
-SLOT="${OKV}"
-PROVIDE="virtual/linux-sources"
-KEYWORDS="-* mips"
-IUSE="cobalt"
-
-
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${OKV}-${CVSDATE}
-	cd ${S}
-
-	# Update the vanilla sources with linux-mips CVS changes
-	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
-
-	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
-	echo -e ""
-	einfo ">>> Generic Patches"
-	epatch ${WORKDIR}/mips-patches/mipscvs-${OKV}-makefile-fix.patch
-
-	# Patch to fix mips64 Makefile so that -finline-limit=10000 gets added to CFLAGS
-	epatch ${WORKDIR}/mips-patches/mipscvs-${OKV}-makefile-inlinelimit.patch
-
-	# Binutils-2.14.90.0.8 and does some magic with page alignment
-	# that prevents the kernel from booting.  This patch fixes it.
-	epatch ${WORKDIR}/mips-patches/mipscvs-${OKV}-no-page-align.patch
-
-	# Security Fixes
-	echo -e ""
-	ebegin ">>> Applying Security Fixes"
-		epatch ${WORKDIR}/security/CAN-2004-0109-2.4-iso9660.patch
-		epatch ${WORKDIR}/security/CAN-2004-0133-xfs_ext3.patch
-		epatch ${WORKDIR}/security/CAN-2004-0177-ext3_jbd.patch
-		epatch ${WORKDIR}/security/CAN-2004-0178-sbblaster.patch
-		epatch ${WORKDIR}/security/CAN-2004-0181-2.4-jfs_ext3.patch
-		epatch ${WORKDIR}/security/CAN-2004-0394-panic.patch
-		epatch ${WORKDIR}/security/CAN-2004-0415-2.4-file_offset_pointers.patch
-		epatch ${WORKDIR}/security/CAN-2004-0427-2.4-do_fork.patch
-		epatch ${WORKDIR}/security/CAN-2004-0495-2.4-sparse.patch
-		epatch ${WORKDIR}/security/CAN-2004-0497-attr_gid.patch
-		epatch ${WORKDIR}/security/CAN-2004-0535-2.4-e1000.patch
-		epatch ${WORKDIR}/security/CAN-2004-0685-2.4-conectiva_usb.patch
-		epatch ${WORKDIR}/security/security-2.4-proc_race.patch
-	eend
-
-
-	# Cobalt Patches
-	if use cobalt; then
-		echo -e ""
-		einfo ">>> Patching kernel for Cobalt support ..."
-		for x in ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/*.patch; do
-			epatch ${x}
-		done
-		cp ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/cobalt-patches.txt ${S}
-		cd ${WORKDIR}
-		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt
-		S="${S}.cobalt"
-	fi
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.26-r9.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.26-r10.ebuild
index eebd7b4cd8e7..388a1b19ac8b 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.26-r9.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.26-r10.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.26-r9.ebuild,v 1.1 2004/09/29 09:46:15 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.26-r10.ebuild,v 1.1 2004/11/14 04:59:41 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20040712"			# Date of diff between kernel.org and lmo CVS
 COBALTPATCHVER="1.4"			# Tarball version for cobalt patches
-SECPATCHVER="1.2"			# Tarball version for security patches
+SECPATCHVER="1.4"			# Tarball version for security patches
 GENPATCHVER="1.0"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -65,7 +65,10 @@ src_unpack() {
 		epatch ${WORKDIR}/security/CAN-2004-0497-attr_gid.patch
 		epatch ${WORKDIR}/security/CAN-2004-0535-2.4-e1000.patch
 		epatch ${WORKDIR}/security/CAN-2004-0685-2.4-conectiva_usb.patch
+		epatch ${WORKDIR}/security/CAN-2004-0814-2.4.26-tty_race_conditions.patch
 		epatch ${WORKDIR}/security/security-2.4-proc_race.patch
+		epatch ${WORKDIR}/security/security-2.4-binfmt_elf-fixes.patch
+		epatch ${WORKDIR}/security/security-2.4-remote_ddos.patch
 	eend
 
 
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.27-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.27-r2.ebuild
index 56030df300bc..4b8d2a990572 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.27-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.27-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.27-r1.ebuild,v 1.1 2004/09/29 09:46:15 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.27-r2.ebuild,v 1.1 2004/11/14 04:59:41 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20040814"			# Date of diff between kernel.org and lmo CVS
 COBALTPATCHVER="1.4"			# Tarball version for cobalt patches
-SECPATCHVER="1.2"			# Tarball version for security patches
+SECPATCHVER="1.4"			# Tarball version for security patches
 GENPATCHVER="1.0"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -60,7 +60,10 @@ src_unpack() {
 	echo -e ""
 	ebegin ">>> Applying Security Fixes"
 		epatch ${WORKDIR}/security/CAN-2004-0394-panic.patch
+		epatch ${WORKDIR}/security/CAN-2004-0814-2.4.26-tty_race_conditions.patch
 		epatch ${WORKDIR}/security/security-2.4-proc_race.patch
+		epatch ${WORKDIR}/security/security-2.4-binfmt_elf-fixes.patch
+		epatch ${WORKDIR}/security/security-2.4-remote_ddos.patch
 	eend
 
 
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.4-r9.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.4-r9.ebuild
deleted file mode 100644
index f0d7de80a786..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.6.4-r9.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.4-r9.ebuild,v 1.1 2004/09/29 09:46:15 kumba Exp $
-
-
-# Version Data
-OKV=${PV/_/-}
-CVSDATE="20040311"			# Date of diff between kernel.org and lmo CVS
-COBALTPATCHVER="1.4"			# Tarball version for cobalt patches
-SECPATCHVER="1.2"			# Tarball version for security patches
-GENPATCHVER="1.0"			# Tarball version for generic patches
-IP32DIFFDATE="20040229"			# Date of diff of iluxa's minpatchset
-EXTRAVERSION="-mipscvs-${CVSDATE}"
-KV="${OKV}${EXTRAVERSION}"
-
-# Miscellaneous stuff
-S=${WORKDIR}/linux-${OKV}-${CVSDATE}
-
-# Eclass stuff
-ETYPE="sources"
-inherit kernel eutils
-
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 11 Mar 2004
-# 3) Patch to tweak arch/mips/Makefile to build proper kernels under binutils-2.15.x
-# 4) Iluxa's minimal O2 patchset
-# 5) Security Fixes
-# 6) Patches for Cobalt support
-
-
-DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
-		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
-		mirror://gentoo/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff.bz2
-		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2
-		mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2
-		cobalt? ( mirror://gentoo/cobalt-patches-26xx-${COBALTPATCHVER}.tar.bz2 )"
-
-HOMEPAGE="http://www.linux-mips.org/"
-SLOT="${OKV}"
-PROVIDE="virtual/linux-sources"
-KEYWORDS="-*"
-IUSE="cobalt"
-
-
-pkg_setup() {
-	# See if we're on a cobalt system (must use the cobalt-mips profile)
-	if use cobalt; then
-		echo -e ""
-		einfo "Please keep in mind that the 2.6 kernel will NOT boot on Cobalt"
-		einfo "systems that are still using the old Cobalt bootloader.  In"
-		einfo "order to boot a 2.6 kernel on Cobalt systems, you must be using"
-		einfo "Peter Horton's new bootloader, which does not have the kernel"
-		einfo "size limitation that the older bootloader has.  If you want"
-		einfo "to use the newer bootloader, make sure you have sys-boot/colo"
-		einfo "installed and setup."
-		echo -e ""
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${OKV}-${CVSDATE}
-	cd ${S}
-
-	# Update the vanilla sources with linux-mips CVS changes
-	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
-
-	# Binutils-2.14.90.0.8 and up does some magic with page alignment
-	# that prevents the kernel from booting.  This patch fixes it.
-	echo -e ""
-	einfo ">>> Generic Patches"
-	epatch ${WORKDIR}/mips-patches/mipscvs-2.6.x-no-page-align.patch
-
-	# Force detection of PS/2 mice on SGI Systems
-	epatch ${WORKDIR}/mips-patches/misc-2.6-force_mouse_detection.patch
-
-	# iluxa's minpatchset for SGI O2
-	echo -e ""
-	einfo ">>> Patching kernel with iluxa's minimal IP32 patchset ..."
-	epatch ${WORKDIR}/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff
-
-	# Security Fixes
-	echo -e ""
-	ebegin ">>> Applying Security Fixes"
-		epatch ${WORKDIR}/security/CAN-2004-0075-2.6-vicam_usb.patch
-		epatch ${WORKDIR}/security/CAN-2004-0109-2.6-iso9660.patch
-		epatch ${WORKDIR}/security/CAN-2004-0181-2.6-jfs_ext3.patch
-		epatch ${WORKDIR}/security/CAN-2004-0228-cpufreq.patch
-		epatch ${WORKDIR}/security/CAN-2004-0229-fb_copy_cmap.patch
-		epatch ${WORKDIR}/security/CAN-2004-0415-2.6.4-file_offset_pointers.patch
-		epatch ${WORKDIR}/security/CAN-2004-0427-2.6-do_fork.patch
-		epatch ${WORKDIR}/security/CAN-2004-0495_0496-2.6-sparse.patch
-		epatch ${WORKDIR}/security/CAN-2004-0497-attr_gid.patch
-		epatch ${WORKDIR}/security/CAN-2004-0596-2.6-eql.patch
-		epatch ${WORKDIR}/security/CAN-2004-0626-death_packet.patch
-		epatch ${WORKDIR}/security/security-2.6-proc_race.patch
-	eend
-
-
-	# Cobalt Patches
-	if use cobalt; then
-		echo -e ""
-		einfo ">>> Patching kernel for Cobalt support ..."
-		for x in ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/*.patch; do
-			epatch ${x}
-		done
-		cp ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/cobalt-patches.txt ${S}
-		cd ${WORKDIR}
-		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt
-		S="${S}.cobalt"
-	fi
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.6-r9.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.6-r9.ebuild
deleted file mode 100644
index 854e3b30d917..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.6.6-r9.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.6-r9.ebuild,v 1.1 2004/09/29 09:46:15 kumba Exp $
-
-
-# Version Data
-OKV=${PV/_/-}
-CVSDATE="20040604"			# Date of diff between kernel.org and lmo CVS
-COBALTPATCHVER="1.4"			# Tarball version for cobalt patches
-SECPATCHVER="1.2"			# Tarball version for security patches
-GENPATCHVER="1.0"			# Tarball version for generic patches
-IP32DIFFDATE="20040402"			# Date of diff of iluxa's minpatchset
-EXTRAVERSION="-mipscvs-${CVSDATE}"
-KV="${OKV}${EXTRAVERSION}"
-
-# Miscellaneous stuff
-S=${WORKDIR}/linux-${OKV}-${CVSDATE}
-
-# Eclass stuff
-ETYPE="sources"
-inherit kernel eutils
-
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 04 Jun 2004
-# 3) Patch to fix the Swap issue in 2.6.5+ (Credit: Peter Horton <cobalt@colonel-panic.org>
-# 4) Iluxa's minimal O2 Patchset
-# 5) Security Fixes
-# 6) Patches for Cobalt support
-
-
-DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
-		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
-		mirror://gentoo/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff.bz2
-		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2
-		mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2
-		cobalt? ( mirror://gentoo/cobalt-patches-26xx-${COBALTPATCHVER}.tar.bz2 )"
-
-HOMEPAGE="http://www.linux-mips.org/"
-SLOT="${OKV}"
-PROVIDE="virtual/linux-sources"
-KEYWORDS="-*"
-IUSE="cobalt"
-
-
-pkg_setup() {
-	# See if we're on a cobalt system (must use the cobalt-mips profile)
-	if use cobalt; then
-		echo -e ""
-		einfo "Please keep in mind that the 2.6 kernel will NOT boot on Cobalt"
-		einfo "systems that are still using the old Cobalt bootloader.  In"
-		einfo "order to boot a 2.6 kernel on Cobalt systems, you must be using"
-		einfo "Peter Horton's new bootloader, which does not have the kernel"
-		einfo "size limitation that the older bootloader has.  If you want"
-		einfo "to use the newer bootloader, make sure you have sys-boot/colo"
-		einfo "installed and setup."
-		echo -e ""
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${OKV}-${CVSDATE}
-	cd ${S}
-
-	# Update the vanilla sources with linux-mips CVS changes
-	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
-
-	# Bug in 2.6.6 that triggers a kernel oops when swap is activated
-	echo -e ""
-	einfo ">>> Generic Patches"
-	epatch ${WORKDIR}/mips-patches/mipscvs-2.6.5-swapbug-fix.patch
-
-	# Force detection of PS/2 mice on SGI Systems
-	epatch ${WORKDIR}/mips-patches/misc-2.6-force_mouse_detection.patch
-
-	# iluxa's minpatchset for SGI O2
-	echo -e ""
-	einfo ">>> Patching kernel with iluxa's minimal IP32 patchset ..."
-	epatch ${WORKDIR}/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff
-
-	# Security Fixes
-	echo -e ""
-	ebegin ">>> Applying Security Fixes"
-		epatch ${WORKDIR}/security/CAN-2004-0415-2.6.6-file_offset_pointers.patch
-		epatch ${WORKDIR}/security/CAN-2004-0495_0496-2.6-sparse.patch
-		epatch ${WORKDIR}/security/CAN-2004-0497-attr_gid.patch
-		epatch ${WORKDIR}/security/CAN-2004-0596-2.6-eql.patch
-		epatch ${WORKDIR}/security/CAN-2004-0626-death_packet.patch
-		epatch ${WORKDIR}/security/security-2.6-attr_check.patch
-		epatch ${WORKDIR}/security/security-2.6-proc_race.patch
-	eend
-
-
-	# Cobalt Patches
-	if use cobalt; then
-		echo -e ""
-		einfo ">>> Patching kernel for Cobalt support ..."
-		for x in ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/*.patch; do
-			epatch ${x}
-		done
-		cp ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/cobalt-patches.txt ${S}
-		cd ${WORKDIR}
-		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt
-		S="${S}.cobalt"
-	fi
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.7-r7.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.7-r8.ebuild
index f41e7e936c21..686dba58d70a 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.7-r7.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.7-r8.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.7-r7.ebuild,v 1.1 2004/09/29 09:46:15 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.7-r8.ebuild,v 1.1 2004/11/14 04:59:41 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20040621"			# Date of diff between kernel.org and lmo CVS
 COBALTPATCHVER="1.5"			# Tarball version for cobalt patches
-SECPATCHVER="1.2"			# Tarball version for security patches
+SECPATCHVER="1.4"			# Tarball version for security patches
 GENPATCHVER="1.0"                       # Tarball version for generic patches
 IP32DIFFDATE="20040402"			# Date of diff of iluxa's minpatchset
 EXTRAVERSION="-mipscvs-${CVSDATE}"
@@ -97,8 +97,12 @@ src_unpack() {
 		epatch ${WORKDIR}/security/CAN-2004-0497-attr_gid.patch
 		epatch ${WORKDIR}/security/CAN-2004-0596-2.6-eql.patch
 		epatch ${WORKDIR}/security/CAN-2004-0626-death_packet.patch
+		epatch ${WORKDIR}/security/CAN-2004-0814-2.6.7-tty_race_conditions.patch
+		epatch ${WORKDIR}/security/CAN-2004-0816-2.6-iptables_dos.patch
 		epatch ${WORKDIR}/security/security-2.6-attr_check.patch
 		epatch ${WORKDIR}/security/security-2.6-proc_race.patch
+		epatch ${WORKDIR}/security/security-2.6.8.1-binfmt_elf-fixes.patch
+		epatch ${WORKDIR}/security/security-2.6-remote_ddos.patch
 	eend
 
 
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.8.1-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.8.1-r2.ebuild
index 628812984b56..043432ccdf67 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.8.1-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.8.1-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.8.1-r1.ebuild,v 1.2 2004/11/02 06:42:51 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.8.1-r2.ebuild,v 1.1 2004/11/14 04:59:41 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20040822"			# Date of diff between kernel.org and lmo CVS
 COBALTPATCHVER="1.7"			# Tarball version for cobalt patches
-SECPATCHVER="1.2"			# Tarball version for security patches
+SECPATCHVER="1.4"			# Tarball version for security patches
 GENPATCHVER="1.0"			# Tarball version for generic patches
 EXTRAVERSION=".$(echo ${OKV} | cut -d. -f4)-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -104,7 +104,10 @@ src_unpack() {
 	# Security Fixes
 	echo -e ""
 	ebegin ">>> Applying Security Fixes"
+		epatch ${WORKDIR}/security/CAN-2004-0814-2.6.8.1-tty_race_conditions.patch
 		epatch ${WORKDIR}/security/security-2.6-proc_race.patch
+		epatch ${WORKDIR}/security/security-2.6.8.1-binfmt_elf-fixes.patch
+		epatch ${WORKDIR}/security/security-2.6-remote_ddos.patch
 	eend
 
 
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.9-r2.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.9-r3.ebuild
index 754e3dc82916..4fe3c5f24798 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.9-r2.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.9-r3.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.9-r2.ebuild,v 1.1 2004/11/02 06:42:51 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.9-r3.ebuild,v 1.1 2004/11/14 04:59:41 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20041022"			# Date of diff between kernel.org and lmo CVS
 COBALTPATCHVER="1.8"			# Tarball version for cobalt patches
-SECPATCHVER="1.3"			# Tarball version for security patches
-GENPATCHVER="1.3"			# Tarball version for generic patches
+SECPATCHVER="1.4"			# Tarball version for security patches
+GENPATCHVER="1.4"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 
@@ -97,13 +97,15 @@ src_unpack() {
 	echo -e ""
 	einfo ">>> Generic Patches"
 		# IP32 Patches
-		epatch ${WORKDIR}/mips-patches/misc-2.6-ip32-onion2-gbefb-fixes-old.patch
+		epatch ${WORKDIR}/mips-patches/misc-2.6-ip32-onion2-gbefb-fixes-20041029.patch
 		epatch ${WORKDIR}/mips-patches/misc-2.6.9-ths-ip32-misc.patch
 		epatch ${WORKDIR}/mips-patches/misc-2.6-ip32-tweak-makefile.patch
-		epatch ${WORKDIR}/mips-patches/misc-2.6-gbefb-compile-fix.patch
+		epatch ${WORKDIR}/mips-patches/misc-2.6-ip32-fix-rm7k.patch
 
 		# Generic
 		epatch ${WORKDIR}/mips-patches/misc-2.6-fix-prologue-error.patch
+		epatch ${WORKDIR}/mips-patches/misc-2.6-new-ramdisk-code.patch
+		epatch ${WORKDIR}/mips-patches/misc-2.6-kconfig-tweak
 	eend
 
 
@@ -136,10 +138,11 @@ src_unpack() {
 	fi
 
 
-#	# Security Fixes
-#	echo -e ""
-#	ebegin ">>> Applying Security Fixes"
-#	eend
+	# Security Fixes
+	echo -e ""
+	ebegin ">>> Applying Security Fixes"
+		epatch ${WORKDIR}/security/security-2.6.9-binfmt_elf-fixes.patch
+	eend
 
 
 #	# IP27 (Origin) Hacks - XXX - Not Implemented