Fun fun updates. Added a patch to all ebuilds to patch a security vuln in isofs (CAN-2004-0109); Added several patches for the various versions to tweak the flags passed to the linker to request no page alignment. Without this patch, binutils-2.14.90.0.8 and up will produce unbootable kernels. Lastly, the final patch is for 2.6.5 which is a workaround for a BUG() call generated in the swap code.

27 files changed, 347 insertions, 123 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 7db129c5361e..bff53b705943 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.33 2004/04/12 16:36:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.34 2004/04/16 01:25:20 kumba Exp $
+
+*mips-sources-2.6.4-r1 (15 Apr 2004)
+
+  15 Apr 2004; Joshua Kinard <kumba@gentoo.org> mips-sources-2.4.21-r7.ebuild,
+  mips-sources-2.4.21-r8.ebuild, mips-sources-2.4.22-r10.ebuild,
+  mips-sources-2.4.22-r11.ebuild, mips-sources-2.4.23-r6.ebuild,
+  mips-sources-2.4.23-r7.ebuild, mips-sources-2.4.25-r1.ebuild,
+  mips-sources-2.4.25.ebuild, mips-sources-2.6.3-r1.ebuild,
+  mips-sources-2.6.3-r2.ebuild, mips-sources-2.6.3-r3.ebuild,
+  mips-sources-2.6.3.ebuild, mips-sources-2.6.4-r1.ebuild,
+  mips-sources-2.6.4.ebuild, mips-sources-2.6.5.ebuild,
+  files/CAN-2004-0109-2.4-iso9660.patch,
+  files/CAN-2004-0109-2.6-iso9660.patch,
+  files/mipscvs-2.4.21-no-page-align.patch,
+  files/mipscvs-2.4.22-no-page-align.patch,
+  files/mipscvs-2.4.23-no-page-align.patch,
+  files/mipscvs-2.4.25-no-page-align.patch,
+  files/mipscvs-2.6.5-swapbug-fix.patch,
+  files/mipscvs-2.6.x-no-page-align.patch:
+  Fun fun updates. Added a patch to all ebuilds to patch a security vuln in
+  isofs (CAN-2004-0109); Added several patches for the various versions to tweak
+  the flags passed to the linker to request no page alignment. Without this
+  patch, binutils-2.14.90.0.8 and up will produce unbootable kernels. Lastly,
+  the final patch is for 2.6.5 which is a workaround for a BUG() call generated
+  in the swap code.
 
   12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org>
   mips-sources-2.4.22-r10.ebuild, mips-sources-2.4.23-r6.ebuild,
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index b616e020667f..1f7b75b9fb3a 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,30 +1,36 @@
-MD5 40b051e4f0f89bdf8c6d1701fdee8580 mips-sources-2.4.23-r6.ebuild 2932
-MD5 2c3c59a100006c8f65bfe15d40a71ae2 mips-sources-2.4.22-r10.ebuild 2146
-MD5 f68ccd8232d3fad9033d4bad71f68dbf mips-sources-2.4.21-r7.ebuild 2311
-MD5 dea2ab0de1d16f665a88ead3ee12a56d mips-sources-2.6.3-r1.ebuild 2305
-MD5 a9de50d4234b16e6095c0cb37888701d mips-sources-2.6.4.ebuild 3253
-MD5 213d5b93df0660a9f1e8f56d6f08be32 mips-sources-2.4.25.ebuild 1956
-MD5 58e6b1af9b94f7eddafa504799b9cf64 mips-sources-2.6.3.ebuild 2302
-MD5 2001a8949de881d6e35fa2e6b75d079d ChangeLog 10290
+MD5 4228012f21345a42eff9e11cef6fd7f2 ChangeLog 11593
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 0f953c57b29099c268fb8c7396e943d0 mips-sources-2.6.3-r2.ebuild 3259
-MD5 a361526659bf1585152b2c819e329941 files/mipscvs-2.4.23-makefile-inlinelimit.patch 1314
-MD5 1d8857f9bf884fc661beb87cc9d043d1 files/mipscvs-2.4.22-makefile-fix.patch 1873
-MD5 ef0bb5537d7c6e052bd16a86adec9240 files/digest-mips-sources-2.6.3 216
-MD5 05353361dc9d89699a648d1db065d7f9 files/digest-mips-sources-2.6.4 299
-MD5 95ba3093147f4188db0ea4949e4317cf files/mipscvs-2.4.25-makefile-inlinelimit.patch 1588
-MD5 6ff178aa1398ac2347921194944376f8 files/mipscvs-2.4.23-makefile-fix.patch 1906
+MD5 f8d53f985391c15598188d0fd5fdb0f3 mips-sources-2.4.21-r8.ebuild 2566
+MD5 2e7a7fd0f09bec56a3e13ca9175e0d47 mips-sources-2.4.22-r11.ebuild 2401
+MD5 0e3e519678394ce42f93a27118fa326e mips-sources-2.4.23-r7.ebuild 3187
+MD5 72730ea7694acf1706dc459f869f9f43 mips-sources-2.4.25-r1.ebuild 2232
+MD5 d4300e458ff1e08a6f2248c31d6ee537 mips-sources-2.6.3-r3.ebuild 3513
+MD5 a4626d2d46c2d3a4424fb10448518ea6 mips-sources-2.6.4-r1.ebuild 3510
+MD5 11ae356674a257cc39ef08621118d13b mips-sources-2.6.5.ebuild 3445
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/CAN-2003-0961-do_brk.patch 242
-MD5 1f646066ee81f7aea1f79a79e38a252d files/rtc-fixes.patch 2125
-MD5 de2c00e2df9c2bf74e5c090ade2c23b0 files/digest-mips-sources-2.4.25 217
-MD5 0a3a1be2517b274c5a0c0748a437b6bd files/digest-mips-sources-2.4.21-r7 219
-MD5 5aa63a0a1f498866f08339bcbd33f8e3 files/digest-mips-sources-2.4.23-r6 426
-MD5 de4d75d6d76f866f89e2fca35d161416 files/digest-mips-sources-2.6.3-r1 216
-MD5 214c73bd9aa640a54b52196c8f2c5433 files/digest-mips-sources-2.6.3-r2 299
-MD5 fbb6766828584e454bf053286aad6207 files/mipscvs-2.4.25-makefile-fix.patch 428
-MD5 174438d215b70cad5ffb00ca8123c062 files/CAN-2004-0077-do_munmap.patch 837
-MD5 93f8e3701539d6699921e4becaa72f2d files/digest-mips-sources-2.4.22-r10 218
+MD5 5e4b24d4c540af721c5bc7e3ad77f40b files/CAN-2003-0985-mremap.patch 414
 MD5 147fec50180ad91b6260fc7201dcb90f files/CAN-2004-0010-ncpfs.patch 6050
+MD5 174438d215b70cad5ffb00ca8123c062 files/CAN-2004-0077-do_munmap.patch 837
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
+MD5 21f3a4f186017d925067335e24db36a1 files/CAN-2004-0109-2.4-iso9660.patch 1877
+MD5 5e4b24d4c540af721c5bc7e3ad77f40b files/CAN-2004-0109-2.6-iso9660.patch 414
+MD5 07e4cd29df717318635019f6a3d2e72b files/mipscvs-2.4.21-no-page-align.patch 356
+MD5 a1157e4d6d0ba95b7c76d55311830a05 files/mipscvs-2.4.22-no-page-align.patch 422
+MD5 801d19165cd75bdde5c1e156ca2320db files/mipscvs-2.4.23-no-page-align.patch 442
+MD5 764740b749fd1f81313aa941c55000ac files/mipscvs-2.4.25-no-page-align.patch 1013
+MD5 c65ca9f967d25e79aadfe387f7ce6fa3 files/mipscvs-2.6.x-no-page-align.patch 483
 MD5 054c3c8e9c8804a13c79d01ec52793ed files/mipscvs-2.4.21-makefile-fix.patch 915
-MD5 5e4b24d4c540af721c5bc7e3ad77f40b files/CAN-2003-0985-mremap.patch 414
+MD5 1d8857f9bf884fc661beb87cc9d043d1 files/mipscvs-2.4.22-makefile-fix.patch 1873
+MD5 6ff178aa1398ac2347921194944376f8 files/mipscvs-2.4.23-makefile-fix.patch 1906
+MD5 a361526659bf1585152b2c819e329941 files/mipscvs-2.4.23-makefile-inlinelimit.patch 1314
+MD5 fbb6766828584e454bf053286aad6207 files/mipscvs-2.4.25-makefile-fix.patch 428
+MD5 95ba3093147f4188db0ea4949e4317cf files/mipscvs-2.4.25-makefile-inlinelimit.patch 1588
+MD5 1f646066ee81f7aea1f79a79e38a252d files/rtc-fixes.patch 2125
+MD5 39404cc05cb940b5daa59d3cb382825e files/mipscvs-2.6.5-swapbug-fix.patch 1137
+MD5 0a3a1be2517b274c5a0c0748a437b6bd files/digest-mips-sources-2.4.21-r8 219
+MD5 93f8e3701539d6699921e4becaa72f2d files/digest-mips-sources-2.4.22-r11 218
+MD5 5aa63a0a1f498866f08339bcbd33f8e3 files/digest-mips-sources-2.4.23-r7 426
+MD5 de2c00e2df9c2bf74e5c090ade2c23b0 files/digest-mips-sources-2.4.25-r1 217
+MD5 214c73bd9aa640a54b52196c8f2c5433 files/digest-mips-sources-2.6.3-r3 299
+MD5 05353361dc9d89699a648d1db065d7f9 files/digest-mips-sources-2.6.4-r1 299
+MD5 87d2e9f2c22fddaac6143dd399d51880 files/digest-mips-sources-2.6.5 299
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0109-2.4-iso9660.patch b/sys-kernel/mips-sources/files/CAN-2004-0109-2.4-iso9660.patch
new file mode 100644
index 000000000000..d02b51c57fc6
--- /dev/null
+++ b/sys-kernel/mips-sources/files/CAN-2004-0109-2.4-iso9660.patch
@@ -0,0 +1,87 @@
+--- linux/fs/isofs/rock.c.orig
++++ linux/fs/isofs/rock.c
+@@ -14,6 +14,7 @@
+ #include <linux/slab.h>
+ #include <linux/pagemap.h>
+ #include <linux/smp_lock.h>
++#include <asm/page.h>
+ 
+ #include "rock.h"
+ 
+@@ -419,7 +420,7 @@
+   return 0;
+ }
+ 
+-static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr)
++static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr, char *plimit)
+ {
+ 	int slen;
+ 	int rootflag;
+@@ -431,16 +432,25 @@
+ 		rootflag = 0;
+ 		switch (slp->flags & ~1) {
+ 		case 0:
++			if (slp->len > plimit - rpnt)
++				return NULL;
+ 			memcpy(rpnt, slp->text, slp->len);
+ 			rpnt+=slp->len;
+ 			break;
++		case 2:
++			if (rpnt >= plimit)
++				return NULL;
++			*rpnt++='.';
++			break;
+ 		case 4:
++			if (2 > plimit - rpnt)
++				return NULL;
+ 			*rpnt++='.';
+-			/* fallthru */
+-		case 2:
+ 			*rpnt++='.';
+ 			break;
+ 		case 8:
++			if (rpnt >= plimit)
++				return NULL;
+ 			rootflag = 1;
+ 			*rpnt++='/';
+ 			break;
+@@ -457,17 +467,23 @@
+ 			 * If there is another SL record, and this component
+ 			 * record isn't continued, then add a slash.
+ 			 */
+-			if ((!rootflag) && (rr->u.SL.flags & 1) && !(oldslp->flags & 1))
++			if ((!rootflag) && (rr->u.SL.flags & 1) &&
++			    !(oldslp->flags & 1)) {
++				if (rpnt >= plimit)
++					return NULL;
+ 				*rpnt++='/';
++			}
+ 			break;
+ 		}
+ 
+ 		/*
+ 		 * If this component record isn't continued, then append a '/'.
+ 		 */
+-		if (!rootflag && !(oldslp->flags & 1))
++		if (!rootflag && !(oldslp->flags & 1)) {
++			if (rpnt >= plimit)
++				return NULL;
+ 			*rpnt++='/';
+-
++		}
+ 	}
+ return rpnt;
+ }
+@@ -548,7 +564,10 @@
+ 			CHECK_SP(goto out);
+ 			break;
+ 		case SIG('S', 'L'):
+-			rpnt = get_symlink_chunk(rpnt, rr);
++			rpnt = get_symlink_chunk(rpnt, rr,
++						 link + (PAGE_SIZE - 1));
++			if (rpnt == NULL)
++				goto out;
+ 			break;
+ 		case SIG('C', 'E'):
+ 			/* This tells is if there is a continuation record */
+
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0109-2.6-iso9660.patch b/sys-kernel/mips-sources/files/CAN-2004-0109-2.6-iso9660.patch
new file mode 100644
index 000000000000..03f49e4f6d7d
--- /dev/null
+++ b/sys-kernel/mips-sources/files/CAN-2004-0109-2.6-iso9660.patch
@@ -0,0 +1,13 @@
+--- linux/mm/mremap.c.orig	2004-01-05 17:01:21.382104120 +0000
++++ linux/mm/mremap.c	2004-01-05 17:15:25.689749848 +0000
+@@ -270,6 +270,10 @@
+ 	old_len = PAGE_ALIGN(old_len);
+ 	new_len = PAGE_ALIGN(new_len);
+ 
++	/* Don't allow the degenerate cases */
++	if (!old_len || !new_len)
++		goto out;
++
+ 	/* new_addr is only valid if MREMAP_FIXED is specified */
+ 	if (flags & MREMAP_FIXED) {
+ 		if (new_addr & ~PAGE_MASK)
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r7 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r8
index 3f39217453fa..3f39217453fa 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r7
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r8
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r10 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r11
index 3183414cbd71..3183414cbd71 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r10
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r11
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r6 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r7
index 57d39098851a..57d39098851a 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r6
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r7
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r1
index 0b8c1a6edbd7..0b8c1a6edbd7 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r1
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.3 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.3
deleted file mode 100644
index 28dce10d4167..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6063a7e424355ec52e0cb559fb99034d linux-2.6.3.tar.bz2 34271622
-MD5 a020e3cd14776fd5f0fe11d4d344d38e mipscvs-2.6.3-20040218.diff.bz2 815784
-MD5 5e82d54ca68ca993309b3f331e31d855 cobalt-patches-26xx-1.1.tar.bz2 6534
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.3-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.3-r1
deleted file mode 100644
index d314aa193a9e..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6063a7e424355ec52e0cb559fb99034d linux-2.6.3.tar.bz2 34271622
-MD5 197a63a35637f66baaa29bd5befc3f47 mipscvs-2.6.3-20040301.diff.bz2 837854
-MD5 5e82d54ca68ca993309b3f331e31d855 cobalt-patches-26xx-1.1.tar.bz2 6534
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.3-r2 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.3-r3
index a0320a067ca2..a0320a067ca2 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.3-r2
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.3-r3
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r1
index b4021ba1d5e5..b4021ba1d5e5 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r1
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.5 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.5
new file mode 100644
index 000000000000..b1656d19ce32
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.5
@@ -0,0 +1,4 @@
+MD5 9a76bf64c1151369b250f967d83077aa linux-2.6.5.tar.bz2 34684611
+MD5 f40e319434975c7b46258f97c3eb1264 mipscvs-2.6.5-20040412.diff.bz2 498372
+MD5 4cc61e272d77d85f778e4a59b88ba462 cobalt-patches-26xx-1.2.tar.bz2 6767
+MD5 99ae243d80acc8692115f58ab2210c25 ip32-iluxa-minpatchset-20040402.diff.bz2 2260
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.4.21-no-page-align.patch b/sys-kernel/mips-sources/files/mipscvs-2.4.21-no-page-align.patch
new file mode 100644
index 000000000000..e3e539266ee0
--- /dev/null
+++ b/sys-kernel/mips-sources/files/mipscvs-2.4.21-no-page-align.patch
@@ -0,0 +1,11 @@
+--- arch/mips/Makefile.orig	2004-04-15 05:41:50.173562240 -0400
++++ arch/mips/Makefile	2004-04-15 05:42:00.961922160 -0400
+@@ -38,7 +38,7 @@ endif
+ #
+ GCCFLAGS	:= -I $(TOPDIR)/include/asm/gcc
+ GCCFLAGS	+= -G 0 -mno-abicalls -fno-pic -pipe
+-LINKFLAGS	+= -G 0 -static # -N
++LINKFLAGS	+= -G 0 -static -n
+ MODFLAGS	+= -mlong-calls
+ 
+ ifdef CONFIG_REMOTE_DEBUG
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.4.22-no-page-align.patch b/sys-kernel/mips-sources/files/mipscvs-2.4.22-no-page-align.patch
new file mode 100644
index 000000000000..812d9c20e556
--- /dev/null
+++ b/sys-kernel/mips-sources/files/mipscvs-2.4.22-no-page-align.patch
@@ -0,0 +1,11 @@
+--- arch/mips/Makefile.orig	2004-04-15 05:43:11.663173936 -0400
++++ arch/mips/Makefile	2004-04-15 05:43:49.855367840 -0400
+@@ -44,7 +44,7 @@ check_gcc = $(shell if $(CC) $(1) -S -o 
+ GCCFLAGS	:= -I $(TOPDIR)/include/asm/gcc
+ GCCFLAGS	+= -G 0 -mno-abicalls -fno-pic -pipe
+ GCCFLAGS	+= $(call check_gcc, -mabi=32,)
+-LINKFLAGS	+= -G 0 -static # -N
++LINKFLAGS	+= -G 0 -static -n
+ MODFLAGS	+= -mlong-calls
+ 
+ ifdef CONFIG_KGDB
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.4.23-no-page-align.patch b/sys-kernel/mips-sources/files/mipscvs-2.4.23-no-page-align.patch
new file mode 100644
index 000000000000..189b30d1a640
--- /dev/null
+++ b/sys-kernel/mips-sources/files/mipscvs-2.4.23-no-page-align.patch
@@ -0,0 +1,11 @@
+--- arch/mips/Makefile.orig	2004-04-15 13:21:46.285315576 -0400
++++ arch/mips/Makefile		2004-04-15 13:21:57.202655888 -0400
+@@ -45,7 +45,7 @@ GCCFLAGS	:= -I $(TOPDIR)/include/asm/gcc
+ GCCFLAGS	+= -G 0 -mno-abicalls -fno-pic -pipe
+ GCCFLAGS	+= $(call check_gcc, -mabi=32,)
+ GCCFLAGS	+= $(call check_gcc, -finline-limit=100000,)
+-LINKFLAGS	+= -G 0 -static # -N
++LINKFLAGS	+= -G 0 -static -n
+ MODFLAGS	+= -mlong-calls
+ 
+ ifdef CONFIG_DEBUG_INFO
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.4.25-no-page-align.patch b/sys-kernel/mips-sources/files/mipscvs-2.4.25-no-page-align.patch
new file mode 100644
index 000000000000..d7f7710be7d3
--- /dev/null
+++ b/sys-kernel/mips-sources/files/mipscvs-2.4.25-no-page-align.patch
@@ -0,0 +1,28 @@
+===================================================================
+RCS file: /home/cvs/linux/arch/mips/Makefile,v
+retrieving revision 1.78.2.52
+retrieving revision 1.78.2.54
+diff -u -p -r1.78.2.52 -r1.78.2.54
+--- linux/arch/mips/Makefile	2004/03/10 19:22:11	1.78.2.52
++++ linux/arch/mips/Makefile	2004/03/24 17:07:34	1.78.2.54
+@@ -46,7 +46,7 @@ check_gcc = $(shell if $(CC) $(1) -S -o 
+ GCCFLAGS	:= -I $(TOPDIR)/include/asm/gcc
+ GCCFLAGS	+= -G 0 -mno-abicalls -fno-pic -pipe
+ GCCFLAGS	+= $(call check_gcc, -finline-limit=100000,)
+-LINKFLAGS	+= -G 0 -static # -N
++LINKFLAGS	+= -G 0 -static -n
+ MODFLAGS	+= -mlong-calls
+ 
+ ifdef CONFIG_DEBUG_INFO
+@@ -100,6 +100,11 @@ while :; do \
+ 	gas_abi=; gas_opt=; gas_cpu=; gas_isa=; \
+ 	break; \
+ done; \
++if test "$$gcc_opt" = -march= && test -n "$$gcc_abi"; then \
++	$(CC) $$gcc_abi $$gcc_opt$$gcc_cpu -S -o /dev/null \
++		-xc /dev/null > /dev/null 2>&1 && \
++		gcc_isa=; \
++fi; \
+ echo $$gcc_abi $$gcc_opt$$gcc_cpu $$gcc_isa $$gas_abi $$gas_opt$$gas_cpu $$gas_isa)
+ 
+ #
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.6.5-swapbug-fix.patch b/sys-kernel/mips-sources/files/mipscvs-2.6.5-swapbug-fix.patch
new file mode 100644
index 000000000000..3abafca9f40c
--- /dev/null
+++ b/sys-kernel/mips-sources/files/mipscvs-2.6.5-swapbug-fix.patch
@@ -0,0 +1,27 @@
+diff -urN linux.cvs/include/asm-mips/pgtable-32.h linux.pdh/include/asm-mips/pgtable-32.h
+--- linux.cvs/include/asm-mips/pgtable-32.h	2004-03-11 16:46:57.000000000 +0000
++++ linux.pdh/include/asm-mips/pgtable-32.h	2004-04-15 19:22:17.000000000 +0100
+@@ -208,7 +208,7 @@
+ #define __swp_entry(type,offset)	((swp_entry_t) { ((type) << 1) | ((offset) << 10) })
+ #else
+ 
+-#define __swp_type(x)		(((x).val >> 1) & 0x1f)
++#define __swp_type(x)		(((x).val >> 1) & 0x07)
+ #define __swp_offset(x)		((x).val >> 8)
+ #define __swp_entry(type,offset)	((swp_entry_t) { ((type) << 1) | ((offset) << 8) })
+ #endif
+diff -urN linux.cvs/include/linux/swap.h linux.pdh/include/linux/swap.h
+--- linux.cvs/include/linux/swap.h	2004-03-01 14:06:13.000000000 +0000
++++ linux.pdh/include/linux/swap.h	2004-04-15 19:30:31.000000000 +0100
+@@ -11,7 +11,11 @@
+  * on 32-bit-pgoff_t architectures.  And that assumes that the architecture packs
+  * the type/offset into the pte as 5/27 as well.
+  */
++#ifdef CONFIG_MIPS
++#define MAX_SWAPFILES_SHIFT	3
++#else
+ #define MAX_SWAPFILES_SHIFT	5
++#endif
+ #define MAX_SWAPFILES		(1 << MAX_SWAPFILES_SHIFT)
+ 
+ #ifdef __KERNEL__
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.6.x-no-page-align.patch b/sys-kernel/mips-sources/files/mipscvs-2.6.x-no-page-align.patch
new file mode 100644
index 000000000000..d51b0407026c
--- /dev/null
+++ b/sys-kernel/mips-sources/files/mipscvs-2.6.x-no-page-align.patch
@@ -0,0 +1,11 @@
+--- arch/mips/Makefile.orig	2004-04-15 18:40:42.630148968 -0400
++++ arch/mips/Makefile	2004-04-15 18:40:52.934582456 -0400
+@@ -57,7 +57,7 @@ endif
+ cflags-y			:= -I $(TOPDIR)/include/asm/gcc
+ cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
+ cflags-y			+= $(call check_gcc, -finline-limit=100000,)
+-LDFLAGS_vmlinux			+= -G 0 -static # -N
++LDFLAGS_vmlinux			+= -G 0 -static -n
+ MODFLAGS			+= -mlong-calls
+ 
+ cflags-$(CONFIG_SB1XXX_CORELIS)	+= -mno-sched-prolog -fno-omit-frame-pointer
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.21-r7.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.21-r8.ebuild
index b4adb0f51d97..78dc0de67fc6 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.21-r7.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.21-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.21-r7.ebuild,v 1.3 2004/02/23 10:48:55 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.21-r8.ebuild,v 1.1 2004/04/16 01:25:20 kumba Exp $
 
 
 # Version Data
@@ -27,7 +27,8 @@ inherit kernel eutils
 # 6) mremap fix
 # 7) RTC fixes
 # 8) do_munmap fix
-# 9) Patches for Cobalt support
+# 9) ISO9660 Fix
+# 10) Patches for Cobalt support
 
 
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
@@ -57,6 +58,10 @@ src_unpack() {
 	# MIPS RTC Fixes (Fixes memleaks, backport from 2.4.24)
 	epatch ${FILESDIR}/rtc-fixes.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 ${FILESDIR}/mipscvs-${OKV}-no-page-align.patch
+
 	# Security Fixes
 	echo -e ""
 	ebegin "Applying Security Fixes"
@@ -64,6 +69,7 @@ src_unpack() {
 		epatch ${FILESDIR}/CAN-2003-0985-mremap.patch
 		epatch ${FILESDIR}/CAN-2004-0010-ncpfs.patch
 		epatch ${FILESDIR}/CAN-2004-0077-do_munmap.patch
+		epatch ${FILESDIR}/CAN-2004-0109-2.4-iso9660.patch
 	eend
 
 	# Cobalt Patches
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.22-r10.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.22-r11.ebuild
index cb9e0322dafd..ec0266f8a0ac 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.22-r10.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.22-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.22-r10.ebuild,v 1.4 2004/04/12 16:36:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.22-r11.ebuild,v 1.1 2004/04/16 01:25:20 kumba Exp $
 
 
 # Version Data
@@ -26,7 +26,8 @@ inherit kernel eutils
 # 4) do_brk fix
 # 5) mremap fix
 # 6) RTC fixes
-# 7) Patches for Cobalt support
+# 7) iso9660 fix
+# 8) Patches for Cobalt support
 
 
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
@@ -53,6 +54,10 @@ src_unpack() {
 	# MIPS RTC Fixes (Fixes memleaks, backport from 2.4.24)
 	epatch ${FILESDIR}/rtc-fixes.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 ${FILESDIR}/mipscvs-${OKV}-no-page-align.patch
+
 	# Security Fixes
 	echo -e ""
 	ebegin "Applying Security Fixes"
@@ -60,6 +65,7 @@ src_unpack() {
 		epatch ${FILESDIR}/CAN-2003-0985-mremap.patch
 		epatch ${FILESDIR}/CAN-2004-0010-ncpfs.patch
 		epatch ${FILESDIR}/CAN-2004-0077-do_munmap.patch
+		epatch ${FILESDIR}/CAN-2004-0109-2.4-iso9660.patch
 	eend
 
 	# Cobalt Patches
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.23-r6.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.23-r7.ebuild
index 9174146276da..8927bfc11d4c 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.23-r6.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.23-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.23-r6.ebuild,v 1.4 2004/04/12 16:36:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.23-r7.ebuild,v 1.1 2004/04/16 01:25:20 kumba Exp $
 
 
 # Version Data
@@ -27,7 +27,8 @@ inherit kernel eutils
 # 5) do_brk fix
 # 6) mremap fix
 # 7) RTC fixes
-# 8) Patches for Cobalt support
+# 8) iso9660 fix
+# 9) Patches for Cobalt support
 
 
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
@@ -60,6 +61,10 @@ src_unpack() {
 	# MIPS RTC Fixes (Fixes memleaks, backport from 2.4.24)
 	epatch ${FILESDIR}/rtc-fixes.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 ${FILESDIR}/mipscvs-${OKV}-no-page-align.patch
+
 	# XFS Patches
 	# We don't use epatch here because something funny is messed up in the XFS patches,
 	# thus while they apply, they don't apply properly
@@ -76,6 +81,7 @@ src_unpack() {
 		epatch ${FILESDIR}/CAN-2003-0985-mremap.patch
 		epatch ${FILESDIR}/CAN-2004-0010-ncpfs.patch
 		epatch ${FILESDIR}/CAN-2004-0077-do_munmap.patch
+		epatch ${FILESDIR}/CAN-2004-0109-2.4-iso9660.patch
 	eend
 
 	# Cobalt Patches
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.25.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.25-r1.ebuild
index 29beffa9b0c8..53e9b10a02b2 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.25.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.ebuild,v 1.3 2004/04/12 16:36:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.25-r1.ebuild,v 1.1 2004/04/16 01:25:20 kumba Exp $
 
 
 # Version Data
@@ -24,7 +24,8 @@ inherit kernel eutils
 # 2) linux-mips.org CVS snapshot diff from 28 Nov 2003
 # 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) Patches for Cobalt support
+# 5) iso9660 fix
+# 6) Patches for Cobalt support
 
 
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
@@ -51,6 +52,13 @@ src_unpack() {
 	# Patch to fix mips64 Makefile so that -finline-limit=10000 gets added to CFLAGS
 	epatch ${FILESDIR}/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 ${FILESDIR}/mipscvs-${OKV}-no-page-align.patch
+
+	# Security Fixes
+	epatch ${FILESDIR}/CAN-2004-0109-2.4-iso9660.patch
+
 	# Cobalt Patches
 	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
 		echo -e ""
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.3-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.3-r1.ebuild
deleted file mode 100644
index defcb744da9b..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.6.3-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.3-r1.ebuild,v 1.2 2004/03/08 09:21:15 kumba Exp $
-
-
-# Version Data
-OKV=${PV/_/-}
-CVSDATE="20040301"
-EXTRAVERSION="-mipscvs-${CVSDATE}"
-KV="${OKV}${EXTRAVERSION}"
-COBALTPATCHVER="1.1"
-
-# 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 18 Feb 2004
-# 3) 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/cobalt-patches-26xx-${COBALTPATCHVER}.tar.bz2"
-HOMEPAGE="http://www.linux-mips.org/"
-SLOT="${OKV}"
-PROVIDE="virtual/linux-sources"
-KEYWORDS="-*"
-
-
-pkg_setup() {
-	# See if we're on a cobalt system (must use the cobalt-mips profile)
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
-		echo -e ""
-		ewarn "Please keep in mind that the 2.6 kernel will NOT boot on Cobalt"
-		ewarn "systems that are still using the old Cobalt bootloader.  In"
-		ewarn "order to boot a 2.6 kernel on Cobalt systems, you must be using"
-		ewarn "Peter Horton's new bootloader, which does not have the kernel"
-		ewarn "size limitation that the older bootloader has.  As of this"
-		ewarn "ebuild revision, this bootloader is not in portage, and 2.6"
-		ewarn "support on cobalt should be regarded as HIGHLY experimental."
-		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
-
-	# Cobalt Patches
-	if [ "${PROFILE_ARCH}" = "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.3-r2.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.3-r3.ebuild
index d51a075c6686..6fc1c2898088 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.3-r2.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.3-r2.ebuild,v 1.2 2004/03/08 09:21:15 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.3-r3.ebuild,v 1.1 2004/04/16 01:25:20 kumba Exp $
 
 
 # Version Data
@@ -73,6 +73,13 @@ src_unpack() {
 	# Update the vanilla sources with linux-mips CVS changes
 	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
 
+	# Binutils-2.14.90.0.8 and does some magic with page alignment
+	# that prevents the kernel from booting.  This patch fixes it.
+	epatch ${FILESDIR}/mipscvs-2.6.x-no-page-align.patch
+
+	# Security Fixes
+	epatch ${FILESDIR}/CAN-2004-0109-2.6-iso9660.patch
+
 	# Cobalt Patches
 	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
 		echo -e ""
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.3.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.4-r1.ebuild
index 826b4c803bbf..1f7cf9f0daad 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.3.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.4-r1.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.3.ebuild,v 1.2 2004/03/08 09:21:15 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.4-r1.ebuild,v 1.1 2004/04/16 01:25:20 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
-CVSDATE="20040218"
-EXTRAVERSION="-mipscvs-${CVSDATE}"
+CVSDATE="20040311"
+COBALTPATCHVER="1.2"
+IP32DIFFDATE="20040229"
+[ "${USE_IP32}" = "yes" ] && EXTRAVERSION="-mipscvs-${CVSDATE}-ip32" || EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
-COBALTPATCHVER="1.1"
 
 # Miscellaneous stuff
 S=${WORKDIR}/linux-${OKV}-${CVSDATE}
@@ -27,7 +28,9 @@ inherit kernel eutils
 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/cobalt-patches-26xx-${COBALTPATCHVER}.tar.bz2"
+		mirror://gentoo/cobalt-patches-26xx-${COBALTPATCHVER}.tar.bz2
+		mirror://gentoo/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff.bz2"
+
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
@@ -47,6 +50,16 @@ pkg_setup() {
 		ewarn "support on cobalt should be regarded as HIGHLY experimental."
 		echo -e ""
 	fi
+
+	# See if we're building IP32 sources
+	if [ "${USE_IP32}" = "yes" ]; then
+		echo -e ""
+		ewarn "SGI O2 (IP32) support is still a work in progress, and may or may"
+		ewarn "not work properly.  Any bugs encountered running these sources on"
+		ewarn "an O2 should be reported to the gentoo-mips mailing list.  Patches"
+		ewarn "any bugs are also welcome."
+		echo -e ""
+	fi
 }
 
 src_unpack() {
@@ -57,6 +70,13 @@ src_unpack() {
 	# Update the vanilla sources with linux-mips CVS changes
 	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
 
+	# Binutils-2.14.90.0.8 and does some magic with page alignment
+	# that prevents the kernel from booting.  This patch fixes it.
+	epatch ${FILESDIR}/mipscvs-2.6.x-no-page-align.patch
+
+	# Security Fixes
+	epatch ${FILESDIR}/CAN-2004-0109-2.6-iso9660.patch
+
 	# Cobalt Patches
 	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
 		echo -e ""
@@ -70,5 +90,16 @@ src_unpack() {
 		S="${S}.cobalt"
 	fi
 
+	# IP32 Support
+	# The USE_IP32 variable below must be passed on the command line to the emerge call
+	if [ "${USE_IP32}" = "yes" ]; then
+		echo -e ""
+		einfo ">>> Patching kernel with iluxa's minimal IP32 patchset ..."
+		epatch ${WORKDIR}/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff
+		KV="${KV}-ip32"
+		cd ${WORKDIR}
+		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.ip32
+		S="${S}.ip32"
+	fi
 	kernel_universal_unpack
 }
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.4.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.5.ebuild
index 04c034cfee44..f79417265f12 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.4.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.ebuild,v 1.1 2004/03/13 07:53:14 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.5.ebuild,v 1.1 2004/04/16 01:25:20 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
-CVSDATE="20040311"
+CVSDATE="20040412"
 COBALTPATCHVER="1.2"
-IP32DIFFDATE="20040229"
+IP32DIFFDATE="20040402"
 [ "${USE_IP32}" = "yes" ] && EXTRAVERSION="-mipscvs-${CVSDATE}-ip32" || EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 
@@ -70,6 +70,12 @@ src_unpack() {
 	# Update the vanilla sources with linux-mips CVS changes
 	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
 
+	# Bug in 2.6.5 that triggers a kernel oops when swap is activated
+	epatch ${FILESDIR}/mipscvs-${OKV}-swapbug-fix.patch
+
+	# Security Fixes
+	epatch ${FILESDIR}/CAN-2004-0109-2.6-iso9660.patch
+
 	# Cobalt Patches
 	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
 		echo -e ""