Many more fun changes. New here is support in 2.6.10 for the SGI IP28 machine (Indigo2 Impact R10000), courtesy of Peter Fuerst's work. See the 2.6.10 ebuild for URL and information regarding this support, which is experimental. Also included are a number of security patches, including CAN-2005-0001, and CAN-2004-1235. Specific Gentoo Bug numbers are as follows: 77025, 77094, 75963, 77666, & 77923. Structural changes have been made to the 2.6.10 ebuild as well, and cobalt patches are no longer bundled in an external tarball, but are included in mips-sources_generic-patches now.

Package-Manager: portage-2.0.51-r13

14 files changed, 367 insertions, 214 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 784249d15d63..c906336cee6a 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-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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.68 2005/01/19 02:58:24 kumba Exp $
+
+*mips-sources-2.4.28-r1 (18 Jan 2005)
+
+  18 Jan 2005; Joshua Kinard <kumba@gentoo.org>
+  -mips-sources-2.4.27-r7.ebuild, +mips-sources-2.4.27-r8.ebuild,
+  +mips-sources-2.4.28-r1.ebuild, -mips-sources-2.4.28.ebuild,
+  +mips-sources-2.6.10-r1.ebuild, -mips-sources-2.6.10.ebuild,
+  -mips-sources-2.6.8.1-r7.ebuild, +mips-sources-2.6.8.1-r8.ebuild,
+  -mips-sources-2.6.9-r8.ebuild, +mips-sources-2.6.9-r9.ebuild:
+  Many more fun changes. New here is support in 2.6.10 for the SGI IP28 machine
+  (Indigo2 Impact R10000), courtesy of Peter Fuerst's work. See the 2.6.10
+  ebuild for URL and information regarding this support, which is experimental.
+  Also included are a number of security patches, including CAN-2005-0001, and
+  CAN-2004-1235. Specific Gentoo Bug numbers are as follows: 77025, 77094,
+  75963, 77666, & 77923. Structural changes have been made to the 2.6.10 ebuild
+  as well, and cobalt patches are no longer bundled in an external tarball, but
+  are included in mips-sources_generic-patches now.
 
 *mips-sources-2.4.28 (06 Jan 2005)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index a0a7348bb1dd..f9c7ef1a77f9 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,12 +1,12 @@
-MD5 9f1a5d7e9a8239029fea8063d520f5a6 ChangeLog 28886
+MD5 173f59dad7aa5bfe52dc1a29e9572018 ChangeLog 29899
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-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
+MD5 0bb3bc67228fd8c143e42af31483c781 mips-sources-2.4.27-r8.ebuild 3472
+MD5 2b6f506f18d432aa1db448cd0c16602e mips-sources-2.4.28-r1.ebuild 2905
+MD5 f9f1439e63df181151427e4305a4901a mips-sources-2.6.10-r1.ebuild 10584
+MD5 d2f6055b952588b5add88a19d49af4e1 mips-sources-2.6.8.1-r8.ebuild 5286
+MD5 ce36e682ec524d5f200568d7a55ad77a mips-sources-2.6.9-r9.ebuild 6064
+MD5 9db9eec5526c874d63295b79eb110a3d files/digest-mips-sources-2.4.27-r8 388
+MD5 94fa9e15268b8fca5ff52f766247f223 files/digest-mips-sources-2.4.28-r1 388
+MD5 ceca8cd00c8e5497eb68a3aff9b16604 files/digest-mips-sources-2.6.10-r1 314
+MD5 a91ef54fc3b01497a816172bacd62628 files/digest-mips-sources-2.6.8.1-r8 390
+MD5 6d25918081d8bc7b57a10bb93f9b35e0 files/digest-mips-sources-2.6.9-r9 386
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r7 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r8
index 812657115950..461575d98ee2 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r7
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.27-r8
@@ -1,5 +1,5 @@
 MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453
 MD5 15a51fcc518466730f54fc6c87f11ee0 mipscvs-2.4.27-20040814.diff.bz2 194003
-MD5 abd2f4d9d9656feb6b2b06ee543ad864 mips-sources-security_patches-1.9.tar.bz2 52965
+MD5 d37d9093b783fea06c85ac964fca44a2 mips-sources-security_patches-1.10.tar.bz2 70014
 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-r1
index 286ed8ab83b4..a2288a954f53 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.28
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.28-r1
@@ -1,5 +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 d37d9093b783fea06c85ac964fca44a2 mips-sources-security_patches-1.10.tar.bz2 70014
 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
deleted file mode 100644
index af424dd9f84f..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.10
+++ /dev/null
@@ -1,4 +0,0 @@
-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.10-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.10-r1
new file mode 100644
index 000000000000..ac26d38ba653
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.10-r1
@@ -0,0 +1,4 @@
+MD5 cffcd2919d9c8ef793ce1ac07a440eda linux-2.6.10.tar.bz2 36533484
+MD5 bfa5c9bb9e1b95327baae53a9a6c2d35 mipscvs-2.6.10-20050115.diff.bz2 351205
+MD5 d37d9093b783fea06c85ac964fca44a2 mips-sources-security_patches-1.10.tar.bz2 70014
+MD5 e5e5f30d56f362c070cb3d52b41ce0aa mips-sources-generic_patches-1.6.tar.bz2 98327
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r7 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r8
index d152ad19bead..9d9d97c3e957 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r7
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.8.1-r8
@@ -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 abd2f4d9d9656feb6b2b06ee543ad864 mips-sources-security_patches-1.9.tar.bz2 52965
+MD5 d37d9093b783fea06c85ac964fca44a2 mips-sources-security_patches-1.10.tar.bz2 70014
 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-r8 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r9
index fcfe7a503eb4..36f16cd71b93 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r8
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r9
@@ -1,5 +1,5 @@
 MD5 e921200f074ca97184e150ef5a4af825 linux-2.6.9.tar.bz2 36261440
 MD5 352cc4ab108e67f3e0db4e5f3dc5cb07 mipscvs-2.6.9-20041022.diff.bz2 352768
-MD5 abd2f4d9d9656feb6b2b06ee543ad864 mips-sources-security_patches-1.9.tar.bz2 52965
+MD5 d37d9093b783fea06c85ac964fca44a2 mips-sources-security_patches-1.10.tar.bz2 70014
 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-r7.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.27-r8.ebuild
index 00aad9c18155..c43a8404777b 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.27-r7.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.27-r8.ebuild
@@ -1,13 +1,13 @@
 # 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-r7.ebuild,v 1.1 2005/01/06 05:20:39 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.27-r8.ebuild,v 1.1 2005/01/19 02:58:24 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.9"			# Tarball version for security patches
+SECPATCHVER="1.10"			# Tarball version for security patches
 GENPATCHVER="1.0"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -60,7 +60,7 @@ 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/CAN-2004-0814-2.4.27-tty_race_conditions.patch
 		epatch ${WORKDIR}/security/CAN-2004-0883-2.4-smbfs_remote_overflows.patch
 		epatch ${WORKDIR}/security/CAN-2004-1016-dos-scm_send.patch
 		epatch ${WORKDIR}/security/CAN-2004-1056-2.4-dos_drm.patch
@@ -68,10 +68,13 @@ src_unpack() {
 		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/CAN-2004-1235-2.4.27-uselib_priv_escalation-nopax.patch
+		epatch ${WORKDIR}/security/CAN-2005-0001-2.4-i386_smp_page_fault_handler.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-grsec_mult_kern_adv.patch
 	eend
 
 
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.28.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.28-r1.ebuild
index 21b2a3ec66d5..7bfff63de436 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.28.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.28-r1.ebuild
@@ -1,13 +1,13 @@
 # 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.28.ebuild,v 1.1 2005/01/06 05:20:39 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.28-r1.ebuild,v 1.1 2005/01/19 02:58:24 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20050105"			# Date of diff between kernel.org and lmo CVS
 COBALTPATCHVER="1.4"			# Tarball version for cobalt patches
-SECPATCHVER="1.9"			# Tarball version for security patches
+SECPATCHVER="1.10"			# Tarball version for security patches
 GENPATCHVER="1.5"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -54,13 +54,16 @@ src_unpack() {
 	# Security Fixes
 	echo -e ""
 	ebegin ">>> Applying Security Fixes"
-		epatch ${WORKDIR}/security/CAN-2004-0814-2.4.26-tty_race_conditions.patch
+		epatch ${WORKDIR}/security/CAN-2004-0814-2.4.28-tty_race_conditions.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/CAN-2004-1235-2.4.28-uselib_priv_escalation-nopax.patch
+		epatch ${WORKDIR}/security/CAN-2005-0001-2.4-i386_smp_page_fault_handler.patch
 		epatch ${WORKDIR}/security/security-2.4-proc_race.patch
+		epatch ${WORKDIR}/security/security-2.4-grsec_mult_kern_adv.patch
 	eend
 
 
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.10-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.10-r1.ebuild
new file mode 100644
index 000000000000..24d724809a8c
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.6.10-r1.ebuild
@@ -0,0 +1,304 @@
+# 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-r1.ebuild,v 1.1 2005/01/19 02:58:24 kumba Exp $
+
+
+# INCLUDED:
+# 1) linux sources from kernel.org
+# 2) linux-mips.org CVS snapshot diff from 09 Jan 2005
+# 3) Generic Fixes
+# 4) Security fixes
+# 5) Patch for IP28 Indigo2 Impact Support	(http://home.alphastar.de/fuerst/download.html)
+# 6) Patch for IP30 Octane Support		(http://helios.et.put.poznan.pl/~sskowron/ip30/)
+# 7) Patch for Cobalt support			(http://www.colonel-panic.org/cobalt-mips/)
+
+
+
+#//------------------------------------------------------------------------------
+
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20050115"			# Date of diff between kernel.org and lmo CVS
+SECPATCHVER="1.10"			# Tarball version for security patches
+GENPATCHVER="1.6"			# 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 ip28 ip30 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 (Revision - 1)
+	PATCHVER="mirror://kernel/linux/kernel/v2.6/testing/patch-${OKV}.bz2"
+	EXTRAVERSION="-${KVRC}-mipscvs-${CVSDATE}"
+	KV="${OKV}-${EXTRAVERSION}"
+else
+	STABLEVER="${OKV}"
+	PATCHVER=""
+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}"
+
+
+
+#//------------------------------------------------------------------------------
+
+
+
+# Error message 
+err_only_one_arch_allowed() {
+	echo -e ""
+	eerror "A patchset for a specific machine-type has already been selected."
+	eerror "No other patches for machines-types are permitted.  You will need a"
+	eerror "separate copy of the kernel sources for each different machine-type"
+	eerror "you want to build a kernel for."
+	die "Only one machine-type patchset allowed"
+}
+
+
+# Check our USE flags for machine-specific flags and give appropriate warnings.
+# Hope the user isn't crazy enough to try using combinations of these flags.
+# Only use one machine-specific flag at a time for each type of desired machine-support.
+pkg_setup() {
+	local arch_is_selected="no"
+
+	# See if we're using IP28 (Indigo2 Impact R10000)
+	if use ip28; then
+		if [ "${arch_is_selected}" = "no" ]; then
+			echo -e ""
+			einfo "Support for the Indigo2 Impact R10000 is probably even more experimental"
+			einfo "than Octane support.  If you seriously do not have a clue in the world about"
+			einfo "what you are doing, what an IP28 is, what a mips is, or even what gentoo is,"
+			einfo "then stop now, and return to regularly scheduled x86 programming.  Consider"
+			einfo "this the warning that you are about to venture into no-man's land with a"
+			einfo "machine that is barely supported, likely very unstable, and may very well"
+			einfo "eat your grandmother's pet cat Fluffy."
+			echo -e ""
+			einfo "That said, support for this system REQUIRES that you use the ip28 cascade"
+			einfo "profile (default-linux/mips/mips64/ip28/XXXX.Y), because a very special"
+			einfo "patch is used on the system gcc, kernel-gcc (gcc-mips64) and the kernel"
+			einfo "itself in order to support this machine.  These patches will only be applied"
+			einfo "if \"ip28\" is defined in USE, which the profile sets.  Other things to keep"
+			einfo "in mind are that this system can only be netbooted (no arcboot support),"
+			einfo "requires a full 64-bit kernel, serial-console only (Impact graphics not"
+			einfo "supported yet), and _nothing_ is guaranteed to work smoothly."
+			echo -e ""
+			arch_is_selected="yes"
+		else
+			err_only_one_arch_allowed
+		fi
+	fi
+
+
+	# See if we're using IP30 (Octane)
+	if use ip30; then
+		if [ "${arch_is_selected}" = "no" ]; 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 ""
+			arch_is_selected="yes"
+		else
+			err_only_one_arch_allowed
+		fi
+	fi
+
+
+	# See if we're on a cobalt system (must use the cobalt-mips profile)
+	if use cobalt; then
+		if [ "${arch_is_selected}" = "no" ]; 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 ""
+			arch_is_selected="yes"
+		else
+			err_only_one_arch_allowed
+		fi
+	fi
+}
+
+
+
+#//------------------------------------------------------------------------------
+
+
+
+# Generic Patches - Safe to use globally
+do_generic_patches() {
+	echo -e ""
+	ebegin ">>> Generic Patches"
+		# IP32 Patches (Safe for non-IP32 use)
+		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-mips-iomap-functions.patch
+
+		# Ugly Hacks (Long Story, ask about it on IRC if you really want to know)
+		if ! use ip30 and ! use ip28; then
+			epatch ${WORKDIR}/mips-patches/misc-2.6-ugly-wrong-kphysaddr-hack.patch
+		fi
+	eend
+}
+
+
+# NOT safe for production systems
+# Use at own risk, do _not_ file bugs on effects of these patches
+do_sekret_patches() {
+	# /* 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 */
+}
+
+
+do_security_patches() {
+	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
+		epatch ${WORKDIR}/security/CAN-2004-1235-2.6-uselib_priv_escalation.patch
+		epatch ${WORKDIR}/security/CAN-2005-0001-2.6.10-prereq-grsec_mult_kern_adv.patch
+		epatch ${WORKDIR}/security/CAN-2005-0001-2.6.10-i386_smp_page_fault_handler.patch
+		epatch ${WORKDIR}/security/security-2.6.10-lsm-local_priv_elevate_flaw.patch
+		epatch ${WORKDIR}/security/security-2.6-nfs-client-o_direct-error.patch
+	eend
+}
+
+
+
+#//------------------------------------------------------------------------------
+
+
+
+# These patches are separate from generic patches for a good reason - namely because it is
+# possible (but untested) that patches for one machine-type may conflict with patches from
+# another machine type and therefore produce unwanted side-effects.  We therefore enforce 
+# this by checking if an arch patch has already been applied, and if so, error out.
+
+# SGI Indigo2 Impact R10000 (IP28)
+do_ip28_support() {
+	echo -e ""
+	einfo ">>> Patching kernel for SGI Indigo2 Impact R10000 (IP28) support ..."
+	epatch ${WORKDIR}/mips-patches/misc-2.6.10-rc2-ip28-i2_impact-support.patch
+	epatch ${WORKDIR}/mips-patches/misc-2.6.10-rc2-ip28-c_r4k-tweak.patch
+	mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.ip28
+	S="${S}.ip28"
+}
+
+
+# SGI Octane 'Speedracer' (IP30)
+do_ip30_support() {
+	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"
+}
+
+
+# Cobalt Microserver
+do_cobalt_support() {
+	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"
+}
+
+
+
+#//------------------------------------------------------------------------------
+
+
+
+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
+	do_generic_patches
+
+	# Machine-specific patches
+	use ip28	&& do_ip28_support
+	use ip30	&& do_ip30_support
+	use cobalt	&& do_cobalt_support
+
+	# Patches for experimental use
+	do_sekret_patches
+
+	# Security Fixes
+	do_security_patches
+
+
+	# All done, resume normal portage work
+	kernel_universal_unpack
+}
+
+
+
+#//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.10.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.10.ebuild
deleted file mode 100644
index 993ad89e41ef..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.6.10.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# 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.8.1-r7.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.8.1-r8.ebuild
index 326f8856d598..81557f045d17 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.8.1-r7.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.8.1-r8.ebuild
@@ -1,13 +1,13 @@
 # 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-r7.ebuild,v 1.1 2005/01/06 05:20:39 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.8.1-r8.ebuild,v 1.1 2005/01/19 02:58:24 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.9"			# Tarball version for security patches
+SECPATCHVER="1.10"			# 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,11 +104,16 @@ src_unpack() {
 		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/CAN-2004-1235-2.6-uselib_priv_escalation.patch
+		epatch ${WORKDIR}/security/CAN-2005-0001-2.6.8.1-prereq-grsec_mult_kern_adv.patch
+		epatch ${WORKDIR}/security/CAN-2005-0001-2.6.8.1-i386_smp_page_fault_handler.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.8.1-shm_unlock.patch
+		epatch ${WORKDIR}/security/security-2.6.10-lsm-local_priv_elevate_flaw.patch
+		epatch ${WORKDIR}/security/security-2.6-nfs-client-o_direct-error.patch
 	eend
 
 
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.9-r8.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.9-r9.ebuild
index 72bfc261218a..c230dbc5bd1a 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.9-r8.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.9-r9.ebuild
@@ -1,13 +1,13 @@
 # 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-r8.ebuild,v 1.1 2005/01/06 05:20:39 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.9-r9.ebuild,v 1.1 2005/01/19 02:58:24 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.9"			# Tarball version for security patches
+SECPATCHVER="1.10"			# Tarball version for security patches
 GENPATCHVER="1.4"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -140,10 +140,14 @@ src_unpack() {
 		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/CAN-2004-1235-2.6-uselib_priv_escalation.patch
+		epatch ${WORKDIR}/security/CAN-2005-0001-2.6.9-prereq-grsec_mult_kern_adv.patch
+		epatch ${WORKDIR}/security/CAN-2005-0001-2.6.9-i386_smp_page_fault_handler.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.9-shm_unlock.patch
+		epatch ${WORKDIR}/security/security-2.6.10-lsm-local_priv_elevate_flaw.patch
+		epatch ${WORKDIR}/security/security-2.6-nfs-client-o_direct-error.patch
 	eend