More changes (as usual). Mainly security updates - added CAN-2004-1068, CAN-2004-1069, CAN-2004-1016, CAN-2004-1056, CAN-1004-1137, plus a non-CAN shm_unlock patch for 2.6. Also included are new ebuilds for 2.6.10 and 2.4.28, and removed 2.6.7 and 2.4.26 ebuilds. 2.6.10 no longer uses individual cobalt patches -- all have been lumped into a single patch similar to IP30/Octane support, and added code to 2.6.10's ebuild to use RC-kernels when needed via variable switch. See the following gentoo bugs: 72317, 72452, 74384, 74392, 74464, 74465.

15 files changed, 269 insertions, 225 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index c109b347adb0..784249d15d63 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,23 @@
 # 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.66 2004/12/03 06:29:45 kumba Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.67 2005/01/06 05:20:39 kumba Exp $
+
+*mips-sources-2.4.28 (06 Jan 2005)
+
+  06 Jan 2005; Joshua Kinard <kumba@gentoo.org>
+  -mips-sources-2.4.26-r14.ebuild, -mips-sources-2.4.27-r6.ebuild,
+  +mips-sources-2.4.27-r7.ebuild, +mips-sources-2.4.28.ebuild,
+  +mips-sources-2.6.10.ebuild, -mips-sources-2.6.7-r12.ebuild,
+  -mips-sources-2.6.8.1-r6.ebuild, +mips-sources-2.6.8.1-r7.ebuild,
+  -mips-sources-2.6.9-r7.ebuild, +mips-sources-2.6.9-r8.ebuild:
+  More changes (as usual). Mainly security updates - added CAN-2004-1068,
+  CAN-2004-1069, CAN-2004-1016, CAN-2004-1056, CAN-1004-1137, plus a non-CAN
+  shm_unlock patch for 2.6. Also included are new ebuilds for 2.6.10 and 2.4.28,
+  and removed 2.6.7 and 2.4.26 ebuilds. 2.6.10 no longer uses individual cobalt
+  patches -- all have been lumped into a single patch similar to IP30/Octane
+  support, and added code to 2.6.10's ebuild to use RC-kernels when needed via
+  variable switch. See the following gentoo bugs: 72317, 72452, 74384, 74392,
+  74464, 74465.
 
 *mips-sources-2.6.8.1-r6 (03 Dec 2004)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index cee46695705a..a0a7348bb1dd 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,12 +1,12 @@
-MD5 ee74e37ab1d3b6f46faeea3115294cf9 ChangeLog 27914
+MD5 9f1a5d7e9a8239029fea8063d520f5a6 ChangeLog 28886
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 6919944fd9b961dd5d10dfed2d1a5e91 mips-sources-2.4.26-r14.ebuild 3297
-MD5 dac6bc67dbe0338bbd15d9ea8fb158ec mips-sources-2.4.27-r6.ebuild 2978
-MD5 c2ceceb51ad7d4c20f51be73fd0e411b mips-sources-2.6.7-r12.ebuild 4550
-MD5 6976a80a5a0eea3e0899c7c8ee039d0c mips-sources-2.6.8.1-r6.ebuild 4874
-MD5 ee259d4167450987e5a0a8c0217482d4 mips-sources-2.6.9-r7.ebuild 5674
-MD5 7c3be564b1e5db4571dc07f17d0b9df7 files/digest-mips-sources-2.4.26-r14 387
-MD5 7b7c3d397b813da5645ba56140f88ef9 files/digest-mips-sources-2.4.27-r6 387
-MD5 c68a34e7abfada65ce4ed5e96d677afe files/digest-mips-sources-2.6.7-r12 468
-MD5 6cbe008e0f42344853171e4ea977a934 files/digest-mips-sources-2.6.8.1-r6 389
-MD5 b21a95a0ba6922c61d7b734bb5cd6f6c files/digest-mips-sources-2.6.9-r7 385
+MD5 ac63cb6077009fdd603c77d41da6087b mips-sources-2.6.10.ebuild 6126
+MD5 b03a44e28f7fcb4e46a3f323727461a4 mips-sources-2.6.9-r8.ebuild 5670
+MD5 89b1028f9a1014d5ce2ba9b498cdef9e mips-sources-2.6.8.1-r7.ebuild 4887
+MD5 fa64952f491078af3c361b8f0585aee9 mips-sources-2.4.27-r7.ebuild 3237
+MD5 f23b1c74f13b0bf8a5d2595bf75f540a mips-sources-2.4.28.ebuild 2667
+MD5 5112221cdfa9ea7efd095ed0c24773d6 files/digest-mips-sources-2.4.27-r7 387
+MD5 a4860493335d479078581f399adc57df files/digest-mips-sources-2.4.28 387
+MD5 72a5e2a9671caae70a00661889cd190e files/digest-mips-sources-2.6.10 313
+MD5 3b16e126aa93c2b791c3db5730f18e64 files/digest-mips-sources-2.6.8.1-r7 389
+MD5 d713498333593a1d19bea725f84007f6 files/digest-mips-sources-2.6.9-r8 385
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r14 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r14
deleted file mode 100644
index c17fb41a437e..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r14
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
-MD5 36be1f4dfebd34b9ad7b69dab9add812 mipscvs-2.4.26-20040712.diff.bz2 343699
-MD5 b39bf6ddb86cef566febf33eeaede250 mips-sources-security_patches-1.8.tar.bz2 89893
-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-r6 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r7
index f165bd835486..812657115950 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r6
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r7
@@ -1,5 +1,5 @@
 MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453
 MD5 15a51fcc518466730f54fc6c87f11ee0 mipscvs-2.4.27-20040814.diff.bz2 194003
-MD5 b39bf6ddb86cef566febf33eeaede250 mips-sources-security_patches-1.8.tar.bz2 89893
+MD5 abd2f4d9d9656feb6b2b06ee543ad864 mips-sources-security_patches-1.9.tar.bz2 52965
 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.28 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.28
new file mode 100644
index 000000000000..286ed8ab83b4
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.28
@@ -0,0 +1,5 @@
+MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
+MD5 e5c0438a7e9c0677d6b8432e84bbb844 mipscvs-2.4.28-20050105.diff.bz2 246203
+MD5 abd2f4d9d9656feb6b2b06ee543ad864 mips-sources-security_patches-1.9.tar.bz2 52965
+MD5 c32db0f5eed3cec32445eaf9d8ddea12 mips-sources-generic_patches-1.5.tar.bz2 84550
+MD5 18ad839cec259e123f743432dca994e3 cobalt-patches-24xx-1.4.tar.bz2 5809
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.10 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.10
new file mode 100644
index 000000000000..af424dd9f84f
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.10
@@ -0,0 +1,4 @@
+MD5 cffcd2919d9c8ef793ce1ac07a440eda linux-2.6.10.tar.bz2 36533484
+MD5 259b8040b51928a497ee0e472ca46349 mipscvs-2.6.10-20041229.diff.bz2 326470
+MD5 abd2f4d9d9656feb6b2b06ee543ad864 mips-sources-security_patches-1.9.tar.bz2 52965
+MD5 c32db0f5eed3cec32445eaf9d8ddea12 mips-sources-generic_patches-1.5.tar.bz2 84550
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r12 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r12
deleted file mode 100644
index c8ca2e5e49df..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r12
+++ /dev/null
@@ -1,6 +0,0 @@
-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 b39bf6ddb86cef566febf33eeaede250 mips-sources-security_patches-1.8.tar.bz2 89893
-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-r6 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r7
index 2bfe43c57580..d152ad19bead 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r6
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r7
@@ -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 b39bf6ddb86cef566febf33eeaede250 mips-sources-security_patches-1.8.tar.bz2 89893
+MD5 abd2f4d9d9656feb6b2b06ee543ad864 mips-sources-security_patches-1.9.tar.bz2 52965
 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-r7 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r8
index 4dc954d646ed..fcfe7a503eb4 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r7
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r8
@@ -1,5 +1,5 @@
 MD5 e921200f074ca97184e150ef5a4af825 linux-2.6.9.tar.bz2 36261440
 MD5 352cc4ab108e67f3e0db4e5f3dc5cb07 mipscvs-2.6.9-20041022.diff.bz2 352768
-MD5 b39bf6ddb86cef566febf33eeaede250 mips-sources-security_patches-1.8.tar.bz2 89893
+MD5 abd2f4d9d9656feb6b2b06ee543ad864 mips-sources-security_patches-1.9.tar.bz2 52965
 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.27-r6.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.27-r7.ebuild
index ae2ea3a646ec..00aad9c18155 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.27-r6.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.27-r7.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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-r6.ebuild,v 1.1 2004/12/03 06:29:45 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.27-r7.ebuild,v 1.1 2005/01/06 05:20:39 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.8"			# Tarball version for security patches
+SECPATCHVER="1.9"			# Tarball version for security patches
 GENPATCHVER="1.0"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -62,12 +62,16 @@ src_unpack() {
 		epatch ${WORKDIR}/security/CAN-2004-0394-panic.patch
 		epatch ${WORKDIR}/security/CAN-2004-0814-2.4.26-tty_race_conditions.patch
 		epatch ${WORKDIR}/security/CAN-2004-0883-2.4-smbfs_remote_overflows.patch
-		epatch ${WORKDIR}/security/CAN-2004-1074-2.4-kernel_dos_vma.patch
+		epatch ${WORKDIR}/security/CAN-2004-1016-dos-scm_send.patch
+		epatch ${WORKDIR}/security/CAN-2004-1056-2.4-dos_drm.patch
+		epatch ${WORKDIR}/security/CAN-2004-1068-2.4-af_unix-kern-mem.patch
+		epatch ${WORKDIR}/security/CAN-2004-1074-2.4-kernel_dos_aout.patch
+		epatch ${WORKDIR}/security/CAN-2004-1074-2.4.28-kernel_dos_vma.patch
+		epatch ${WORKDIR}/security/CAN-2004-1137-igmp_vuln.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
 		epatch ${WORKDIR}/security/security-2.4-mips-ptrace.patch
-		epatch ${WORKDIR}/security/security-2.4-af_unix-kern-mem.patch
 	eend
 
 
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.26-r14.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.28.ebuild
index 37c81ea81bde..21b2a3ec66d5 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.26-r14.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.28.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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-r14.ebuild,v 1.1 2004/12/03 06:29:45 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.28.ebuild,v 1.1 2005/01/06 05:20:39 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
-CVSDATE="20040712"			# Date of diff between kernel.org and lmo CVS
+CVSDATE="20050105"			# Date of diff between kernel.org and lmo CVS
 COBALTPATCHVER="1.4"			# Tarball version for cobalt patches
-SECPATCHVER="1.8"			# Tarball version for security patches
-GENPATCHVER="1.0"			# Tarball version for generic patches
+SECPATCHVER="1.9"			# Tarball version for security patches
+GENPATCHVER="1.5"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 
@@ -39,7 +39,7 @@ SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
-KEYWORDS="-* mips"
+KEYWORDS="-* ~mips"
 IUSE="cobalt"
 
 
@@ -51,28 +51,16 @@ src_unpack() {
 	# 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
-
 	# Security Fixes
 	echo -e ""
 	ebegin ">>> Applying Security Fixes"
-		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-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/CAN-2004-0814-2.4.26-tty_race_conditions.patch
-		epatch ${WORKDIR}/security/CAN-2004-0883-2.4-smbfs_remote_overflows.patch
-		epatch ${WORKDIR}/security/CAN-2004-1074-2.4-kernel_dos_vma.patch
+		epatch ${WORKDIR}/security/CAN-2004-1016-dos-scm_send.patch
+		epatch ${WORKDIR}/security/CAN-2004-1056-2.4-dos_drm.patch
+		epatch ${WORKDIR}/security/CAN-2004-1074-2.4-kernel_dos_aout.patch
+		epatch ${WORKDIR}/security/CAN-2004-1074-2.4.28-kernel_dos_vma.patch
+		epatch ${WORKDIR}/security/CAN-2004-1137-igmp_vuln.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
-		epatch ${WORKDIR}/security/security-2.4-mips-ptrace.patch
-		epatch ${WORKDIR}/security/security-2.4-af_unix-kern-mem.patch
 	eend
 
 
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.10.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.10.ebuild
new file mode 100644
index 000000000000..993ad89e41ef
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.6.10.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2005 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.10.ebuild,v 1.1 2005/01/06 05:20:39 kumba Exp $
+
+
+# INCLUDED:
+# 1) linux sources from kernel.org
+# 2) linux-mips.org CVS snapshot diff from 29 Dec 2004
+# 3) Generic Fixes
+# 4) Security fixes
+# 5) Patch for Cobalt support (http://www.colonel-panic.org/cobalt-mips/)
+# 6) Patch for IP30 Octane Support (http://helios.et.put.poznan.pl/~sskowron/ip30/)
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20041229"			# Date of diff between kernel.org and lmo CVS
+SECPATCHVER="1.9"			# Tarball version for security patches
+GENPATCHVER="1.5"			# Tarball version for generic patches
+EXTRAVERSION="-mipscvs-${CVSDATE}"
+KV="${OKV}${EXTRAVERSION}"
+USERC="no"				# If set to "yes", then it will attempt to use an RC kernel
+
+# Sources dir
+S="${WORKDIR}/linux-${OKV}-${CVSDATE}"
+
+# Eclass stuff
+ETYPE="sources"
+inherit kernel eutils
+
+# Misc. stuff
+HOMEPAGE="http://www.linux-mips.org/"
+SLOT="${OKV}"
+PROVIDE="virtual/linux-sources"
+KEYWORDS="-*"
+IUSE="cobalt ip30 livecd"
+#IUSE="cobalt ip30 ip27 livecd"
+
+
+# If USERC == "yes", use a release candidate kernel (2.6.x-rcy)
+if [ "${USERC}" = "yes" ]; then
+	KVMjMn="${OKV%.*}"				# Kernel Major/Minor
+	KVREV="${OKV%%-*}"				# Kernel Revision Pt. 1
+	KVREV="${KVREV##*.}"				# Kernel Revision Pt. 2
+	KVRC="${OKV#*-}"				# Kernel RC
+	STABLEVER="${KVMjMn}.$((${KVREV} - 1))"		# Last stable Kernel version
+	PATCHVER="mirror://kernel/linux/kernel/v2.6/testing/patch-${OKV}.bz2"
+	EXTRAVERSION="-${KVRC}-mipscvs-${CVSDATE}"
+	KV="${OKV}-${EXTRAVERSION}"
+else
+	STABLEVER="${OKV}"
+fi
+
+
+DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${STABLEVER}.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
+		${PATCHVER}"
+#		ip27? ( mirror://lmoftp/blah.tar.bz2 )				# IP27 Patches - XXX - Not Implemented
+
+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
+
+	# See if we're using IP30 (Octane)
+	if use ip30; then
+		echo -e ""
+		einfo "Octane Support is EXPERIMENTAL!  Note the use of caps and the word"
+		einfo "EXPERIMENTAL.  That said, while current tests of Octane support"
+		einfo "generally have worked well, there are some known drawbacks, including"
+		einfo "lack of an X driver (Octane only works in console framebuffer for"
+		einfo "now, but this will likely change).  Also, and this is important,"
+		einfo "but you can ONLY use ONE scsi disk in the Octane.  Use of a second or"
+		einfo "more disks will oops the kernel.  It is hoped the move to the qla1280"
+		einfo "scsi driver will resolve this bug, but that is in the future.  For now,"
+		einfo "the qlogicisp driver is the only thing available, and thus limits us to"
+		einfo "one scsi disk."
+		echo -e ""
+		einfo "Also, Octane can only be netbooted.  There is no support for disk-booting"
+		einfo "as of yet.  Disk-booting will require a 64bit Arcboot or an entirely new"
+		einfo "bootloader, and both are non-existant at this point in time."
+		echo -e ""
+	fi
+
+#	# See if we're using IP27 (Origin) - XXX - Not Implemented
+#	if use ip27; then
+#		echo -e ""
+#		einfo ""
+#		echo -e ""
+#	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	mv ${WORKDIR}/linux-${STABLEVER} ${WORKDIR}/linux-${OKV}-${CVSDATE}
+	cd ${S}
+
+
+	# If USERC == "yes", use a release candidate kernel (2.6.x-rcy)
+	if [ "${USERC}" = "yes" ]; then
+		echo -e ""
+		einfo ">>> Applying ${OKV} patch ..."
+		epatch ${WORKDIR}/patch-${OKV}
+	fi
+
+
+	# Update the vanilla sources with linux-mips CVS changes
+	echo -e ""
+	einfo ">>> Applying mipscvs-${CVSDATE} patch ..."
+	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
+
+	# Generic patches we always include
+	echo -e ""
+	ebegin ">>> Generic Patches"
+		# IP32 Patches
+		epatch ${WORKDIR}/mips-patches/misc-2.6.10-ip32-onion2-gbefb-fixes.patch
+		epatch ${WORKDIR}/mips-patches/misc-2.6.10-ip32-tweak-makefile.patch
+		epatch ${WORKDIR}/mips-patches/misc-2.6.10-ths-mips-tweaks.patch
+
+		# Generic
+		epatch ${WORKDIR}/mips-patches/misc-2.6-fix-prologue-error.patch
+		epatch ${WORKDIR}/mips-patches/misc-2.6.10-add-ramdisk-back.patch
+		epatch ${WORKDIR}/mips-patches/misc-2.6.10-undef_debug_tlb.patch
+	eend
+
+
+	# IP30 (Octane) Patch
+	if use ip30; then
+		echo -e ""
+		einfo ">>> Patching kernel for SGI Octane (IP30) support ..."
+		epatch ${WORKDIR}/mips-patches/misc-2.6.10-rc2-ip30-octane-support.patch
+		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.ip30
+		S="${S}.ip30"
+	fi
+
+
+	# /* EXPERIMENTAL - DO NOT USE IN PRODUCTION KERNELS */
+	# Patches used in building LiveCDs
+	if use livecd; then
+		epatch ${WORKDIR}/mips-patches/misc-2.6-livecd-partitioned-cdroms.patch
+	fi
+	# /* EXPERIMENTAL - DO NOT USE IN PRODUCTION KERNELS */
+
+
+	# Cobalt Patches
+	if use cobalt; then
+		echo -e ""
+		einfo ">>> Patching kernel for Cobalt support ..."
+		epatch ${WORKDIR}/mips-patches/misc-2.6.9-cobalt-support.patch
+		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt
+		S="${S}.cobalt"
+	fi
+
+
+	# Security Fixes
+	echo -e ""
+	ebegin ">>> Applying Security Fixes"
+		epatch ${WORKDIR}/security/CAN-2004-0883-2.6.9-smbfs_remote_overflows.patch
+		epatch ${WORKDIR}/security/CAN-2004-1056-2.6.9-dos_drm.patch
+	eend
+
+
+#	# IP27 (Origin) Hacks - XXX - Not Implemented
+#	if use ip27; then
+#		echo -e ""
+#		einfo ">>> Patching kernel for SGI Origin (IP27) support ..."
+#	fi
+
+
+	kernel_universal_unpack
+}
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.7-r12.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.7-r12.ebuild
deleted file mode 100644
index f88b97552ca0..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.6.7-r12.ebuild
+++ /dev/null
@@ -1,127 +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.7-r12.ebuild,v 1.1 2004/12/03 06:29:45 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.8"			# 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 21 Jun 2004
-# 3) Patch to fix an O2 compile-time error
-# 4) Iluxa's minimal O2 Patchset
-# 5) Security fixes
-# 6) patch to fix iptables build failures
-# 7) 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
-
-	# Fix a compile glitch for SGI O2/IP32
-	echo -e ""
-	einfo ">>> Generic Patches"
-	epatch ${WORKDIR}/mips-patches/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch
-
-	# Misc Fixes
-	epatch ${WORKDIR}/mips-patches/misc-2.6-iptables_headers.patch
-
-	# Force detection of PS/2 mice on SGI Systems
-	epatch ${WORKDIR}/mips-patches/misc-2.6-force_mouse_detection.patch
-
-	# Something happened to compat_alloc_user_space between 2.6.6 and 2.6.7 that
-	# Breaks ifconfig.
-	epatch ${WORKDIR}/mips-patches/misc-2.6-compat_alloc_user_space.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.7-file_offset_pointers.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/CAN-2004-0814-2.6.7-tty_race_conditions.patch
-		epatch ${WORKDIR}/security/CAN-2004-0816-2.6-iptables_dos.patch
-		epatch ${WORKDIR}/security/CAN-2004-0883-2.6.8.1-smbfs_remote_overflows.patch
-		epatch ${WORKDIR}/security/CAN-2004-1074-2.6-kernel_dos_vma.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.7-binfmt_elf-fixes.patch
-		epatch ${WORKDIR}/security/security-2.6-remote_ddos.patch
-		epatch ${WORKDIR}/security/security-2.6.7-mips-ptrace.patch
-		epatch ${WORKDIR}/security/security-2.6-af_unix-kern-mem.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.8.1-r6.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.8.1-r7.ebuild
index 87d0539cd766..326f8856d598 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.8.1-r6.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.8.1-r7.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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-r6.ebuild,v 1.1 2004/12/03 06:29:45 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.8.1-r7.ebuild,v 1.1 2005/01/06 05:20:39 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.8"			# Tarball version for security patches
+SECPATCHVER="1.9"			# Tarball version for security patches
 GENPATCHVER="1.0"			# Tarball version for generic patches
 EXTRAVERSION=".$(echo ${OKV} | cut -d. -f4)-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -34,7 +34,6 @@ SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
 KEYWORDS="-*"
 IUSE="cobalt"
-#IUSE="cobalt ip27"
 
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
@@ -42,7 +41,6 @@ SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.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 )"
-#		ip27? ( mirror://lmoftp/blah.tar.bz2 )						# IP27 Patches - XXX - Not Implemented
 
 pkg_setup() {
 	# See if we're on a cobalt system (must use the cobalt-mips profile)
@@ -57,13 +55,6 @@ pkg_setup() {
 		einfo "installed and setup."
 		echo -e ""
 	fi
-
-#	# See if we're using IP27 (Origin) - XXX - Not Implemented
-#	if use ip27; then
-#		echo -e ""
-#		einfo ""
-#		echo -e ""
-#	fi
 }
 
 src_unpack() {
@@ -106,12 +97,18 @@ src_unpack() {
 	ebegin ">>> Applying Security Fixes"
 		epatch ${WORKDIR}/security/CAN-2004-0814-2.6.8.1-tty_race_conditions.patch
 		epatch ${WORKDIR}/security/CAN-2004-0883-2.6.8.1-smbfs_remote_overflows.patch
-		epatch ${WORKDIR}/security/CAN-2004-1074-2.6-kernel_dos_vma.patch
+		epatch ${WORKDIR}/security/CAN-2004-1016-dos-scm_send.patch
+		epatch ${WORKDIR}/security/CAN-2004-1056-2.6.8.1-dos_drm.patch
+		epatch ${WORKDIR}/security/CAN-2004-1068-2.6-af_unix-kern-mem.patch
+		epatch ${WORKDIR}/security/CAN-2004-1069-2.6-af_unix-network-sec.patch
+		epatch ${WORKDIR}/security/CAN-2004-1074-2.6-kernel_dos_aout.patch
+		epatch ${WORKDIR}/security/CAN-2004-1074-2.6.8.1-kernel_dos_vma.patch
+		epatch ${WORKDIR}/security/CAN-2004-1137-igmp_vuln.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
 		epatch ${WORKDIR}/security/security-2.6.8.1-mips-ptrace.patch
-		epatch ${WORKDIR}/security/security-2.6-af_unix-kern-mem.patch
+		epatch ${WORKDIR}/security/security-2.6.8.1-shm_unlock.patch
 	eend
 
 
@@ -129,12 +126,5 @@ src_unpack() {
 	fi
 
 
-#	# IP27 (Origin) Hacks - XXX - Not Implemented
-#	if use ip27; then
-#		echo -e ""
-#		einfo ">>> Patching kernel for SGI Origin (IP27) support ..."
-#	fi
-
-
 	kernel_universal_unpack
 }
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.9-r7.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.9-r8.ebuild
index e380c49060b8..72bfc261218a 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.9-r7.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.9-r8.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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-r7.ebuild,v 1.1 2004/12/03 06:29:45 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.9-r8.ebuild,v 1.1 2005/01/06 05:20:39 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.8"			# Tarball version for security patches
+SECPATCHVER="1.9"			# Tarball version for security patches
 GENPATCHVER="1.4"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -22,7 +22,7 @@ inherit kernel eutils
 
 # INCLUDED:
 # 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 14 Aug 2004
+# 2) linux-mips.org CVS snapshot diff from 22 Oct 2004
 # 3) Generic Fixes
 # 4) Security fixes
 # 5) Patches for Cobalt support (http://www.colonel-panic.org/cobalt-mips/)
@@ -33,7 +33,6 @@ SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
 KEYWORDS="-* ~mips"
 IUSE="cobalt ip30 livecd"
-#IUSE="cobalt ip30 ip27 livecd"
 
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
@@ -41,7 +40,6 @@ SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.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 )"
-#		ip27? ( mirror://lmoftp/blah.tar.bz2 )						# IP27 Patches - XXX - Not Implemented
 
 pkg_setup() {
 	# See if we're on a cobalt system (must use the cobalt-mips profile)
@@ -76,13 +74,6 @@ pkg_setup() {
 		einfo "bootloader, and both are non-existant at this point in time."
 		echo -e ""
 	fi
-
-#	# See if we're using IP27 (Origin) - XXX - Not Implemented
-#	if use ip27; then
-#		echo -e ""
-#		einfo ""
-#		echo -e ""
-#	fi
 }
 
 src_unpack() {
@@ -142,19 +133,19 @@ src_unpack() {
 	echo -e ""
 	ebegin ">>> Applying Security Fixes"
 		epatch ${WORKDIR}/security/CAN-2004-0883-2.6.9-smbfs_remote_overflows.patch
-		epatch ${WORKDIR}/security/CAN-2004-1074-2.6-kernel_dos_vma.patch
+		epatch ${WORKDIR}/security/CAN-2004-1016-dos-scm_send.patch
+		epatch ${WORKDIR}/security/CAN-2004-1056-2.6.9-dos_drm.patch
+		epatch ${WORKDIR}/security/CAN-2004-1068-2.6-af_unix-kern-mem.patch
+		epatch ${WORKDIR}/security/CAN-2004-1069-2.6-af_unix-network-sec.patch
+		epatch ${WORKDIR}/security/CAN-2004-1074-2.6-kernel_dos_aout.patch
+		epatch ${WORKDIR}/security/CAN-2004-1074-2.6.9-kernel_dos_vma.patch
+		epatch ${WORKDIR}/security/CAN-2004-1137-igmp_vuln.patch
+
 		epatch ${WORKDIR}/security/security-2.6.9-binfmt_elf-fixes.patch
 		epatch ${WORKDIR}/security/security-2.6.9-mips-ptrace.patch
-		epatch ${WORKDIR}/security/security-2.6-af_unix-kern-mem.patch
+		epatch ${WORKDIR}/security/security-2.6.9-shm_unlock.patch
 	eend
 
 
-#	# IP27 (Origin) Hacks - XXX - Not Implemented
-#	if use ip27; then
-#		echo -e ""
-#		einfo ">>> Patching kernel for SGI Origin (IP27) support ..."
-#	fi
-
-
 	kernel_universal_unpack
 }