Batch of security updates that apparently got missed. Finally removed 2.4.{21,22,23} and 2.6.3 from repository. Added newer 2.6.6 snapshot (20040406), and marked 2.4.26 stable.

41 files changed, 298 insertions, 957 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index cb7e503d7852..9d2cca89efd2 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,37 @@
 # 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.42 2004/05/11 03:08:29 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.43 2004/06/04 09:32:17 kumba Exp $
+
+
+*mips-sources-2.4.25-r3 (04 Jun 2004)
+
+  04 Jun 2004; Joshua Kinard <kumba@gentoo.org>
+  -files/CAN-2003-0961-do_brk.patch, -files/CAN-2003-0985-mremap.patch,
+  -files/CAN-2004-0010-ncpfs.patch, +files/CAN-2004-0075-2.6-vicam_usb.patch,
+  -files/CAN-2004-0077-do_munmap.patch, +files/CAN-2004-0133-xfs_ext3.patch,
+  +files/CAN-2004-0181-2.4-jfs_ext3.patch,
+  +files/CAN-2004-0181-2.6-jfs_ext3.patch, +files/CAN-2004-0228-cpufreq.patch,
+  +files/CAN-2004-0229-fb_copy_cmap.patch, +files/CAN-2004-0394-panic.patch,
+  +files/CAN-2004-0427-2.4-do_fork.patch,
+  +files/CAN-2004-0427-2.6-do_fork.patch,
+  -files/bigendian-byteorder-fix.patch,
+  -files/mipscvs-2.4.21-makefile-fix.patch,
+  -files/mipscvs-2.4.21-no-page-align.patch,
+  -files/mipscvs-2.4.22-makefile-fix.patch,
+  -files/mipscvs-2.4.22-no-page-align.patch,
+  -files/mipscvs-2.4.23-makefile-fix.patch,
+  -files/mipscvs-2.4.23-makefile-inlinelimit.patch,
+  -files/mipscvs-2.4.23-no-page-align.patch, -files/rtc-fixes.patch,
+  -mips-sources-2.4.21-r9.ebuild, -mips-sources-2.4.22-r12.ebuild,
+  -mips-sources-2.4.23-r8.ebuild, -mips-sources-2.4.25-r2.ebuild,
+  +mips-sources-2.4.25-r3.ebuild, -mips-sources-2.4.26-r1.ebuild,
+  +mips-sources-2.4.26-r2.ebuild, -mips-sources-2.6.3-r4.ebuild,
+  -mips-sources-2.6.4-r2.ebuild, +mips-sources-2.6.4-r3.ebuild,
+  -mips-sources-2.6.5-r1.ebuild, +mips-sources-2.6.5-r2.ebuild,
+  +mips-sources-2.6.6-r1.ebuild:
+  Batch of security updates that apparently got missed. Finally removed
+  2.4.{21,22,23} and 2.6.3 from repository. Added newer 2.6.6 snapshot
+  (20040406), and marked 2.4.26 stable.
 
 *mips-sources-2.6.6 (10 May 2004)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index cd8e96fca248..c17e002207db 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,44 +1,34 @@
-MD5 fb8c38e747bac6e97e1ac9fcdee6473b ChangeLog 14107
+MD5 0b39499c014a868d4808d12c28ddcad4 ChangeLog 15696
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 c629d75296a8cee92224e5f436b372ad mips-sources-2.4.26-r1.ebuild 1948
-MD5 1b39f940c71e909a82398b004b2168bb mips-sources-2.6.3-r4.ebuild 3628
-MD5 c34bf904d1fc86a98c6c682c38af97da mips-sources-2.6.4-r2.ebuild 3628
-MD5 7d14b94464a3ae3ea0c79feee40b5e80 mips-sources-2.6.5-r1.ebuild 3749
-MD5 a5147fe5fd1b55935fbf0d4d5ddc0e30 mips-sources-2.6.6.ebuild 2745
-MD5 dd2951c21f50fee5662f76c627dfcc4d mips-sources-2.4.21-r9.ebuild 2783
-MD5 4b38bf0b5c0a7b16df45ef3cabe75693 mips-sources-2.4.22-r12.ebuild 2618
-MD5 6e0db1dd40ba72782fafd2b24a2b071f mips-sources-2.4.23-r8.ebuild 3403
-MD5 a0f78574bc5d9c2432773f5da0aea9fc mips-sources-2.4.25-r2.ebuild 2502
-MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/CAN-2003-0961-do_brk.patch 242
-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 c505904f996de9caf29752fd254fc183 mips-sources-2.4.25-r3.ebuild 2707
+MD5 8da9a1238b4d58122debbfa6666c4275 mips-sources-2.4.26-r2.ebuild 2064
+MD5 c1cd3e9f368ca4898f380ad1e59bacb6 mips-sources-2.6.4-r3.ebuild 3931
+MD5 02e7101cdeb8aebaedceb958bd367389 mips-sources-2.6.5-r2.ebuild 3998
+MD5 932ef05ae2b011d47a674c579771aa08 mips-sources-2.6.6-r1.ebuild 2747
+MD5 3c4b86dd8ba76fec3513a2a3db0c8034 mips-sources-2.6.6.ebuild 2744
+MD5 6f4bba5dda7a99d77b1564f5489fef6e files/CAN-2004-0075-2.6-vicam_usb.patch 1129
+MD5 5bf9836a632a861728d33f9736bb7431 files/CAN-2004-0133-xfs_ext3.patch 427
+MD5 de75cfa969ed092578d9ddda6c5be334 files/CAN-2004-0181-2.4-jfs_ext3.patch 1233
+MD5 c8b7be9ee0da1415fa0274da5859aa62 files/CAN-2004-0181-2.6-jfs_ext3.patch 1366
 MD5 21f3a4f186017d925067335e24db36a1 files/CAN-2004-0109-2.4-iso9660.patch 1877
 MD5 31ec7b4310dd7be3e34aab0204f9b1e8 files/CAN-2004-0109-2.6-iso9660.patch 2072
-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 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 eaeda68a619caaddd5b8fdc5e7c39932 files/CAN-2004-0177-ext3_jbd.patch 384
+MD5 ac42024b6e6ee1e2165914db4b22a61c files/CAN-2004-0178-sbblaster.patch 424
+MD5 1dd59d14a720c0c23e47e28d0b4fd6f9 files/CAN-2004-0228-cpufreq.patch 437
+MD5 a92712e41465c49670ef7a54c2d16040 files/CAN-2004-0229-fb_copy_cmap.patch 471
+MD5 d4a740ae56c2049247083af387a22a85 files/CAN-2004-0394-panic.patch 350
+MD5 c460ea130cb4ae84a5063ba044e3ce72 files/CAN-2004-0427-2.4-do_fork.patch 460
+MD5 5674421c7e2c7e50e2509bed7d96c4d4 files/CAN-2004-0427-2.6-do_fork.patch 332
+MD5 5c6bf5770bf59976861382f45bdeb7ff files/digest-mips-sources-2.4.25-r3 217
+MD5 098807e58d4f8bc7efcaea114ba28fcd files/digest-mips-sources-2.4.26-r2 218
+MD5 497365345d8a39da49a8bd2495a17d8c files/digest-mips-sources-2.6.4-r3 299
+MD5 eb9f26d678449f22ce5b7c00762eeb91 files/digest-mips-sources-2.6.5-r2 299
+MD5 0a4fad9dd87776740e3c46f19ea7f5f8 files/digest-mips-sources-2.6.6-r1 298
+MD5 6be9a61a23f202281c721c3b85760efb files/digest-mips-sources-2.6.6 299
 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 764740b749fd1f81313aa941c55000ac files/mipscvs-2.4.25-no-page-align.patch 1013
+MD5 fbb6766828584e454bf053286aad6207 files/mipscvs-2.4.26-makefile-fix.patch 428
 MD5 008eff91c704bd23097666a1cd94ada3 files/mipscvs-2.6.5-swapbug-fix.patch 1329
 MD5 db1aaa77e691906f3857e54e363c4ff4 files/mipscvs-2.6.5-unistd-linkage.patch 515
-MD5 9d52d43f6353c028c44315b0c997e44c files/digest-mips-sources-2.4.21-r9 219
-MD5 5667cbf8a220acc2f2cfa330cdccaa40 files/digest-mips-sources-2.4.22-r12 218
-MD5 e764098f38d0318340f87718f10b540f files/digest-mips-sources-2.4.23-r8 426
-MD5 5c6bf5770bf59976861382f45bdeb7ff files/digest-mips-sources-2.4.25-r2 217
-MD5 232aadbd2c4bcf3ab20f89ee90bf9d95 files/digest-mips-sources-2.6.3-r4 299
-MD5 fbb6766828584e454bf053286aad6207 files/mipscvs-2.4.26-makefile-fix.patch 428
-MD5 497365345d8a39da49a8bd2495a17d8c files/digest-mips-sources-2.6.4-r2 299
-MD5 ac42024b6e6ee1e2165914db4b22a61c files/CAN-2004-0178-sbblaster.patch 424
-MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/CAN-2004-0177-ext3_jbd.patch 384
-MD5 eb9f26d678449f22ce5b7c00762eeb91 files/digest-mips-sources-2.6.5-r1 299
-MD5 098807e58d4f8bc7efcaea114ba28fcd files/digest-mips-sources-2.4.26-r1 218
-MD5 6be9a61a23f202281c721c3b85760efb files/digest-mips-sources-2.6.6 299
+MD5 c65ca9f967d25e79aadfe387f7ce6fa3 files/mipscvs-2.6.x-no-page-align.patch 483
diff --git a/sys-kernel/mips-sources/files/CAN-2003-0961-do_brk.patch b/sys-kernel/mips-sources/files/CAN-2003-0961-do_brk.patch
deleted file mode 100644
index fef1f1e981e2..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2003-0961-do_brk.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/mm/mmap.c Fri Sep 12 06:44:06 2003
-+++ b/mm/mmap.c Thu Oct  2 01:18:19 2003
-@@ -1041,6 +1041,9 @@
-	if (!len)
-		return addr;
- 
-+ 	if ((addr + len) > TASK_SIZE || (addr + len) < addr)
-+ 		return -EINVAL;
-+ 
-	/*
-	 * mlock MCL_FUTURE?
-	 */
diff --git a/sys-kernel/mips-sources/files/CAN-2003-0985-mremap.patch b/sys-kernel/mips-sources/files/CAN-2003-0985-mremap.patch
deleted file mode 100644
index 03f49e4f6d7d..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2003-0985-mremap.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/CAN-2004-0010-ncpfs.patch b/sys-kernel/mips-sources/files/CAN-2004-0010-ncpfs.patch
deleted file mode 100644
index 6b4b1cefa49e..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0010-ncpfs.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-diff -urN linux-2.4.25-pre6/fs/ncpfs/dir.c linux-2.4.25-pre7/fs/ncpfs/dir.c
---- linux-2.4.25-pre6/fs/ncpfs/dir.c	2002-11-28 15:53:15.000000000 -0800
-+++ linux-2.4.25-pre7/fs/ncpfs/dir.c	2004-01-23 10:53:26.000000000 -0800
-@@ -266,8 +266,8 @@
- 	struct ncp_server *server;
- 	struct inode *dir = dentry->d_parent->d_inode;
- 	struct ncp_entry_info finfo;
--	int res, val = 0, len = dentry->d_name.len + 1;
--	__u8 __name[len];
-+	int res, val = 0, len;
-+	__u8 __name[NCP_MAXPATHLEN + 1];
- 
- 	if (!dentry->d_inode || !dir)
- 		goto finished;
-@@ -291,14 +291,15 @@
- 		dentry->d_parent->d_name.name, dentry->d_name.name,
- 		NCP_GET_AGE(dentry));
- 
-+	len = sizeof(__name);
- 	if (ncp_is_server_root(dir)) {
- 		res = ncp_io2vol(server, __name, &len, dentry->d_name.name,
--						len-1, 1);
-+						dentry->d_name.len, 1);
- 		if (!res)
- 			res = ncp_lookup_volume(server, __name, &(finfo.i));
- 	} else {
- 		res = ncp_io2vol(server, __name, &len, dentry->d_name.name,
--						len-1, !ncp_preserve_case(dir));
-+						dentry->d_name.len, !ncp_preserve_case(dir));
- 		if (!res)
- 			res = ncp_obtain_info(server, dir, __name, &(finfo.i));
- 	}
-@@ -548,9 +549,9 @@
- 	int valid = 0;
- 	int hashed = 0;
- 	ino_t ino = 0;
--	__u8 __name[256];
-+	__u8 __name[NCP_MAXPATHLEN + 1];
- 
--	qname.len = 256;
-+	qname.len = sizeof(__name);
- 	if (ncp_vol2io(NCP_SERVER(inode), __name, &qname.len,
- 			entry->i.entryName, entry->i.nameLen,
- 			!ncp_preserve_entry_case(inode, entry->i.NSCreator)))
-@@ -705,16 +706,19 @@
- {
- 	struct ncp_server* server = NCP_SBP(sb);
- 	struct nw_info_struct i;
--	int result, len = strlen(server->m.mounted_vol) + 1;
--	__u8 __name[len];
-+	int result;
- 
- 	if (ncp_single_volume(server)) {
-+		int len;
- 		struct dentry* dent;
-+		__u8 __name[NCP_MAXPATHLEN + 1];
- 
--		result = -ENOENT;
--		if (ncp_io2vol(server, __name, &len, server->m.mounted_vol,
--								len-1, 1))
-+		len = sizeof(__name);
-+		result = ncp_io2vol(server, __name, &len, server->m.mounted_vol,
-+				    strlen(server->m.mounted_vol), 1);
-+		if (result)
- 			goto out;
-+		result = -ENOENT;
- 		if (ncp_lookup_volume(server, __name, &i)) {
- 			PPRINTK("ncp_conn_logged_in: %s not found\n",
- 				server->m.mounted_vol);
-@@ -745,8 +749,8 @@
- 	struct ncp_server *server = NCP_SERVER(dir);
- 	struct inode *inode = NULL;
- 	struct ncp_entry_info finfo;
--	int error, res, len = dentry->d_name.len + 1;
--	__u8 __name[len];
-+	int error, res, len;
-+	__u8 __name[NCP_MAXPATHLEN + 1];
- 
- 	error = -EIO;
- 	if (!ncp_conn_valid(server))
-@@ -755,14 +759,15 @@
- 	PPRINTK("ncp_lookup: server lookup for %s/%s\n",
- 		dentry->d_parent->d_name.name, dentry->d_name.name);
- 
-+	len = sizeof(__name);
- 	if (ncp_is_server_root(dir)) {
- 		res = ncp_io2vol(server, __name, &len, dentry->d_name.name,
--						len-1, 1);
-+				 dentry->d_name.len, 1);
- 		if (!res)
- 			res = ncp_lookup_volume(server, __name, &(finfo.i));
- 	} else {
- 		res = ncp_io2vol(server, __name, &len, dentry->d_name.name,
--						len-1, !ncp_preserve_case(dir));
-+				 dentry->d_name.len, !ncp_preserve_case(dir));
- 		if (!res)
- 			res = ncp_obtain_info(server, dir, __name, &(finfo.i));
- 	}
-@@ -825,9 +830,9 @@
- {
- 	struct ncp_server *server = NCP_SERVER(dir);
- 	struct ncp_entry_info finfo;
--	int error, result, len = dentry->d_name.len + 1;
-+	int error, result, len;
- 	int opmode;
--	__u8 __name[len];
-+	__u8 __name[NCP_MAXPATHLEN + 1];
- 	
- 	PPRINTK("ncp_create_new: creating %s/%s, mode=%x\n",
- 		dentry->d_parent->d_name.name, dentry->d_name.name, mode);
-@@ -836,8 +841,9 @@
- 		goto out;
- 
- 	ncp_age_dentry(server, dentry);
-+	len = sizeof(__name);
- 	error = ncp_io2vol(server, __name, &len, dentry->d_name.name,
--						len-1, !ncp_preserve_case(dir));
-+			   dentry->d_name.len, !ncp_preserve_case(dir));
- 	if (error)
- 		goto out;
- 
-@@ -880,8 +886,8 @@
- {
- 	struct ncp_entry_info finfo;
- 	struct ncp_server *server = NCP_SERVER(dir);
--	int error, len = dentry->d_name.len + 1;
--	__u8 __name[len];
-+	int error, len;
-+	__u8 __name[NCP_MAXPATHLEN + 1];
- 
- 	DPRINTK("ncp_mkdir: making %s/%s\n",
- 		dentry->d_parent->d_name.name, dentry->d_name.name);
-@@ -890,8 +896,9 @@
- 		goto out;
- 
- 	ncp_age_dentry(server, dentry);
-+	len = sizeof(__name);
- 	error = ncp_io2vol(server, __name, &len, dentry->d_name.name,
--						len-1, !ncp_preserve_case(dir));
-+			   dentry->d_name.len, !ncp_preserve_case(dir));
- 	if (error)
- 		goto out;
- 
-@@ -909,8 +916,8 @@
- static int ncp_rmdir(struct inode *dir, struct dentry *dentry)
- {
- 	struct ncp_server *server = NCP_SERVER(dir);
--	int error, result, len = dentry->d_name.len + 1;
--	__u8 __name[len];
-+	int error, result, len;
-+	__u8 __name[NCP_MAXPATHLEN + 1];
- 
- 	DPRINTK("ncp_rmdir: removing %s/%s\n",
- 		dentry->d_parent->d_name.name, dentry->d_name.name);
-@@ -923,8 +930,9 @@
- 	if (!d_unhashed(dentry))
- 		goto out;
- 
-+	len = sizeof(__name);
- 	error = ncp_io2vol(server, __name, &len, dentry->d_name.name,
--						len-1, !ncp_preserve_case(dir));
-+			   dentry->d_name.len, !ncp_preserve_case(dir));
- 	if (error)
- 		goto out;
- 
-@@ -1022,9 +1030,8 @@
- {
- 	struct ncp_server *server = NCP_SERVER(old_dir);
- 	int error;
--	int old_len = old_dentry->d_name.len + 1;
--	int new_len = new_dentry->d_name.len + 1;
--	__u8 __old_name[old_len], __new_name[new_len];
-+	int old_len, new_len;
-+	__u8 __old_name[NCP_MAXPATHLEN + 1], __new_name[NCP_MAXPATHLEN + 1];
- 
- 	DPRINTK("ncp_rename: %s/%s to %s/%s\n",
- 		old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
-@@ -1037,15 +1044,17 @@
- 	ncp_age_dentry(server, old_dentry);
- 	ncp_age_dentry(server, new_dentry);
- 
-+	old_len = sizeof(__old_name);
- 	error = ncp_io2vol(server, __old_name, &old_len,
--					old_dentry->d_name.name, old_len-1,
--					!ncp_preserve_case(old_dir));
-+			   old_dentry->d_name.name, old_dentry->d_name.len,
-+			   !ncp_preserve_case(old_dir));
- 	if (error)
- 		goto out;
- 
-+	new_len = sizeof(__new_name);
- 	error = ncp_io2vol(server, __new_name, &new_len,
--					new_dentry->d_name.name, new_len-1,
--					!ncp_preserve_case(new_dir));
-+			   new_dentry->d_name.name, new_dentry->d_name.len,
-+			   !ncp_preserve_case(new_dir));
- 	if (error)
- 		goto out;
- 
-
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0075-2.6-vicam_usb.patch b/sys-kernel/mips-sources/files/CAN-2004-0075-2.6-vicam_usb.patch
new file mode 100644
index 000000000000..e131c957cb0a
--- /dev/null
+++ b/sys-kernel/mips-sources/files/CAN-2004-0075-2.6-vicam_usb.patch
@@ -0,0 +1,39 @@
+--- linux-2.6.6-rc1/drivers/usb/media/vicam.c	2004-04-15 11:18:18.000000000 +0200
++++ linux-2.6.6-rc1-mich/drivers/usb/media/vicam.c	2004-04-15 11:50:02.791604312 +0200
+@@ -612,15 +612,20 @@ vicam_ioctl(struct inode *inode, struct 
+ 
+ 	case VIDIOCSPICT:
+ 		{
+-			struct video_picture *vp = (struct video_picture *) arg;
+-
+-			DBG("VIDIOCSPICT depth = %d, pal = %d\n", vp->depth,
+-			    vp->palette);
++			struct video_picture vp;
++			
++			if (copy_from_user(&vp, arg, sizeof(vp))) {
++				retval = -EFAULT;
++				break;
++			}
++			
++			DBG("VIDIOCSPICT depth = %d, pal = %d\n", vp.depth,
++			    vp.palette);
+ 
+-			cam->gain = vp->brightness >> 8;
++			cam->gain = vp.brightness >> 8;
+ 
+-			if (vp->depth != 24
+-			    || vp->palette != VIDEO_PALETTE_RGB24)
++			if (vp.depth != 24
++			    || vp.palette != VIDEO_PALETTE_RGB24)
+ 				retval = -EINVAL;
+ 
+ 			break;
+@@ -659,7 +659,7 @@
+ 		{
+ 
+ 			struct video_window *vw = (struct video_window *) arg;
+-			DBG("VIDIOCSWIN %d x %d\n", vw->width, vw->height);
++			DBG("VIDIOCSWIN %d x %d\n", vw.width, vw.height);
+ 
+ 			if ( vw->width != 320 || vw->height != 240 )
+ 				retval = -EFAULT;
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0077-do_munmap.patch b/sys-kernel/mips-sources/files/CAN-2004-0077-do_munmap.patch
deleted file mode 100644
index e120b35b7adb..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0077-do_munmap.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur linux-2.4.25-rc3/mm/mremap.c linux-2.4.25-rc4/mm/mremap.c
---- linux-2.4.25-rc3/mm/mremap.c	2004-02-18 13:56:01.000000000 +0000
-+++ linux-2.4.25-rc4/mm/mremap.c	2004-02-18 13:49:08.000000000 +0000
-@@ -258,16 +258,20 @@
- 		if ((addr <= new_addr) && (addr+old_len) > new_addr)
- 			goto out;
- 
--		do_munmap(current->mm, new_addr, new_len);
-+		ret = do_munmap(current->mm, new_addr, new_len);
-+		if (ret && new_len)
-+			goto out;
- 	}
- 
- 	/*
- 	 * Always allow a shrinking remap: that just unmaps
- 	 * the unnecessary pages..
- 	 */
--	ret = addr;
- 	if (old_len >= new_len) {
--		do_munmap(current->mm, addr+new_len, old_len - new_len);
-+		ret = do_munmap(current->mm, addr+new_len, old_len - new_len);
-+		if (ret && old_len != new_len)
-+			goto out;
-+		ret = addr;
- 		if (!(flags & MREMAP_FIXED) || (new_addr == addr))
- 			goto out;
- 	}
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0133-xfs_ext3.patch b/sys-kernel/mips-sources/files/CAN-2004-0133-xfs_ext3.patch
new file mode 100644
index 000000000000..c756bc328bf2
--- /dev/null
+++ b/sys-kernel/mips-sources/files/CAN-2004-0133-xfs_ext3.patch
@@ -0,0 +1,11 @@
+--- linux-2.4.22/fs/xfs/xfs_log.c.can-2004-0133	2004-03-23 12:28:11.000000000 -0700
++++ linux-2.4.22/fs/xfs/xfs_log.c	2004-03-23 12:58:59.000000000 -0700
+@@ -1251,7 +1251,7 @@
+ 			  kmem_zalloc(sizeof(xlog_in_core_t), KM_SLEEP);
+ 		iclog = *iclogp;
+ 		iclog->hic_data = (xlog_in_core_2_t *)
+-			  kmem_alloc(iclogsize, KM_SLEEP);
++			  kmem_zalloc(iclogsize, KM_SLEEP);
+ 
+ 		iclog->ic_prev = prev_iclog;
+ 		prev_iclog = iclog;
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0181-2.4-jfs_ext3.patch b/sys-kernel/mips-sources/files/CAN-2004-0181-2.4-jfs_ext3.patch
new file mode 100644
index 000000000000..5f7f1441b268
--- /dev/null
+++ b/sys-kernel/mips-sources/files/CAN-2004-0181-2.4-jfs_ext3.patch
@@ -0,0 +1,38 @@
+--- linux-2.4.22/fs/jfs/jfs_logmgr.c.jfs-sec	2004-03-23 12:30:35.000000000 -0700
++++ linux-2.4.22/fs/jfs/jfs_logmgr.c	2004-03-23 13:01:51.000000000 -0700
+@@ -1693,7 +1693,7 @@
+ 		if (lbuf == 0)
+ 			goto error;
+ 		lbuf->l_bh.b_data = lbuf->l_ldata =
+-		    (char *) __get_free_page(GFP_KERNEL);
++		    (char *) get_zeroed_page(GFP_KERNEL);
+ 		if (lbuf->l_ldata == 0) {
+ 			kfree(lbuf);
+ 			goto error;
+--- linux-2.4.22/fs/jfs/jfs_metapage.c.jfs-sec	2004-03-23 12:30:48.000000000 -0700
++++ linux-2.4.22/fs/jfs/jfs_metapage.c	2004-03-23 13:01:51.000000000 -0700
+@@ -375,6 +375,10 @@
+ 		}
+ 		mp->data = kmap(mp->page) + page_offset;
+ 	}
++
++	if (new)
++		memset(mp->data, 0, PSIZE);
++
+ 	jfs_info("__get_metapage: returning = 0x%p", mp);
+ 	return mp;
+ 
+--- linux-2.4.22/fs/jfs/super.c.jfs-sec	2004-03-23 12:31:10.000000000 -0700
++++ linux-2.4.22/fs/jfs/super.c	2004-03-23 13:01:51.000000000 -0700
+@@ -423,10 +423,10 @@
+ 
+ 	if ((flags & (SLAB_CTOR_VERIFY | SLAB_CTOR_CONSTRUCTOR)) ==
+ 	    SLAB_CTOR_CONSTRUCTOR) {
++		memset(jfs_ip, 0, sizeof(struct jfs_inode_info));
+ 		INIT_LIST_HEAD(&jfs_ip->anon_inode_list);
+ 		init_rwsem(&jfs_ip->rdwrlock);
+ 		init_MUTEX(&jfs_ip->commit_sem);
+-		jfs_ip->atlhead = 0;
+ 		jfs_ip->active_ag = -1;
+ 	}
+ }
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0181-2.6-jfs_ext3.patch b/sys-kernel/mips-sources/files/CAN-2004-0181-2.6-jfs_ext3.patch
new file mode 100644
index 000000000000..4f4742b992f0
--- /dev/null
+++ b/sys-kernel/mips-sources/files/CAN-2004-0181-2.6-jfs_ext3.patch
@@ -0,0 +1,39 @@
+--- linux-2.6.3/fs/jfs/jfs_logmgr.c.zy62.orig	2004-02-17 20:57:59.000000000 -0700
++++ linux-2.6.3/fs/jfs/jfs_logmgr.c	2004-04-02 16:57:38.000000000 -0700
+@@ -1702,7 +1702,7 @@
+ 		lbuf = kmalloc(sizeof(struct lbuf), GFP_KERNEL);
+ 		if (lbuf == 0)
+ 			goto error;
+-		lbuf->l_ldata = (char *) __get_free_page(GFP_KERNEL);
++		lbuf->l_ldata = (char *) get_zeroed_page(GFP_KERNEL);
+ 		if (lbuf->l_ldata == 0) {
+ 			kfree(lbuf);
+ 			goto error;
+--- linux-2.6.3/fs/jfs/jfs_metapage.c.zy62.orig	2004-02-17 20:57:20.000000000 -0700
++++ linux-2.6.3/fs/jfs/jfs_metapage.c	2004-04-02 16:29:03.000000000 -0700
+@@ -341,6 +341,10 @@
+ 		}
+ 		mp->data = kmap(mp->page) + page_offset;
+ 	}
++
++	if (new)
++		memset(mp->data, 0, PSIZE);
++
+ 	jfs_info("__get_metapage: returning = 0x%p", mp);
+ 	return mp;
+ 
+--- linux-2.6.3/fs/jfs/super.c.zy62.orig	2004-02-17 20:57:48.000000000 -0700
++++ linux-2.6.3/fs/jfs/super.c	2004-04-02 17:57:02.903281078 -0700
+@@ -549,11 +549,11 @@
+ 
+ 	if ((flags & (SLAB_CTOR_VERIFY | SLAB_CTOR_CONSTRUCTOR)) ==
+ 	    SLAB_CTOR_CONSTRUCTOR) {
++		memset(jfs_ip, 0, sizeof(struct jfs_inode_info));
+ 		INIT_LIST_HEAD(&jfs_ip->anon_inode_list);
+ 		init_rwsem(&jfs_ip->rdwrlock);
+ 		init_MUTEX(&jfs_ip->commit_sem);
+ 		init_rwsem(&jfs_ip->xattr_sem);
+-		jfs_ip->atlhead = 0;
+ 		jfs_ip->active_ag = -1;
+ #ifdef CONFIG_JFS_POSIX_ACL
+ 		jfs_ip->i_acl = JFS_ACL_NOT_CACHED;
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0228-cpufreq.patch b/sys-kernel/mips-sources/files/CAN-2004-0228-cpufreq.patch
new file mode 100644
index 000000000000..746ade9ab1c0
--- /dev/null
+++ b/sys-kernel/mips-sources/files/CAN-2004-0228-cpufreq.patch
@@ -0,0 +1,11 @@
+--- linux-2.6.3/drivers/cpufreq/cpufreq_userspace.c.overflow	2004-02-18 04:57:16.000000000 +0100
++++ linux-2.6.3/drivers/cpufreq/cpufreq_userspace.c	2004-05-14 11:40:37.000000000 +0200
+@@ -168,7 +168,7 @@ cpufreq_procctl(ctl_table *ctl, int writ
+ {
+ 	char buf[16], *p;
+ 	int cpu = (int) ctl->extra1;
+-	int len, left = *lenp;
++	unsigned int len, left = *lenp;
+ 
+ 	if (!left || (filp->f_pos && !write) || !cpu_online(cpu)) {
+ 		*lenp = 0;
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0229-fb_copy_cmap.patch b/sys-kernel/mips-sources/files/CAN-2004-0229-fb_copy_cmap.patch
new file mode 100644
index 000000000000..2b6dfff88e25
--- /dev/null
+++ b/sys-kernel/mips-sources/files/CAN-2004-0229-fb_copy_cmap.patch
@@ -0,0 +1,11 @@
+--- linux-2.6.3/drivers/video/fbmem.c.zy67	2004-04-23 07:32:22.000000000 -0400
++++ linux-2.6.3/drivers/video/fbmem.c	2004-04-23 07:33:09.000000000 -0400
+@@ -1042,7 +1042,7 @@
+ 	case FBIOGETCMAP:
+ 		if (copy_from_user(&cmap, (void *) arg, sizeof(cmap)))
+ 			return -EFAULT;
+-		return (fb_copy_cmap(&info->cmap, &cmap, 0));
++		return (fb_copy_cmap(&info->cmap, &cmap, 2));
+ 	case FBIOPAN_DISPLAY:
+ 		if (copy_from_user(&var, (void *) arg, sizeof(var)))
+ 			return -EFAULT;
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0394-panic.patch b/sys-kernel/mips-sources/files/CAN-2004-0394-panic.patch
new file mode 100644
index 000000000000..273f1a52046f
--- /dev/null
+++ b/sys-kernel/mips-sources/files/CAN-2004-0394-panic.patch
@@ -0,0 +1,11 @@
+--- linux-2.4.22-oM3-orig/kernel/panic.c	Tue Mar 30 15:37:18 2004
++++ linux-2.4.22-oM3-mod/kernel/panic.c	Mon May 17 18:44:01 2004
+@@ -51,7 +51,7 @@
+ 
+ 	bust_spinlocks(1);
+ 	va_start(args, fmt);
+-	vsprintf(buf, fmt, args);
++	vsnprintf(buf, sizeof(buf), fmt, args);
+ 	va_end(args);
+ 	printk(KERN_EMERG "Kernel panic: %s\n",buf);
+ 	if (in_interrupt())
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0427-2.4-do_fork.patch b/sys-kernel/mips-sources/files/CAN-2004-0427-2.4-do_fork.patch
new file mode 100644
index 000000000000..ddc9610f67f8
--- /dev/null
+++ b/sys-kernel/mips-sources/files/CAN-2004-0427-2.4-do_fork.patch
@@ -0,0 +1,14 @@
+diff -Nar -U 4 linux-2.4.25/kernel/fork.c linux-2.4.25-new/kernel/fork.c
+--- linux-2.4.25/kernel/fork.c	2004-02-18 05:36:32.000000000 -0800
++++ linux-2.4.25-new/kernel/fork.c	2004-04-07 17:43:29.000000000 -0700
+@@ -825,8 +825,10 @@
+ bad_fork_cleanup_namespace:
+ 	exit_namespace(p);
+ bad_fork_cleanup_mm:
+ 	exit_mm(p);
++	if (p->active_mm)
++		mmdrop(p->active_mm);
+ bad_fork_cleanup_sighand:
+ 	exit_sighand(p);
+ bad_fork_cleanup_fs:
+ 	exit_fs(p); /* blocking */
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0427-2.6-do_fork.patch b/sys-kernel/mips-sources/files/CAN-2004-0427-2.6-do_fork.patch
new file mode 100644
index 000000000000..adadefd53db2
--- /dev/null
+++ b/sys-kernel/mips-sources/files/CAN-2004-0427-2.6-do_fork.patch
@@ -0,0 +1,11 @@
+--- linux-2.6.3/kernel/fork.c.zy64	2004-04-21 12:26:51.000000000 -0400
++++ linux-2.6.3/kernel/fork.c	2004-04-21 12:29:34.000000000 -0400
+@@ -1073,6 +1073,8 @@
+ 	exit_namespace(p);
+ bad_fork_cleanup_mm:
+ 	exit_mm(p);
++	if (p->active_mm)
++		mmdrop(p->active_mm);
+ bad_fork_cleanup_signal:
+ 	exit_signal(p);
+ bad_fork_cleanup_sighand:
diff --git a/sys-kernel/mips-sources/files/bigendian-byteorder-fix.patch b/sys-kernel/mips-sources/files/bigendian-byteorder-fix.patch
deleted file mode 100644
index bec279abce81..000000000000
--- a/sys-kernel/mips-sources/files/bigendian-byteorder-fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- linux/include/linux/byteorder/generic.h.orig	2003-08-10 18:15:07.000000000 -0700
-+++ linux/include/linux/byteorder/generic.h	2003-08-10 18:16:36.000000000 -0700
-@@ -122,7 +122,7 @@
- #define be16_to_cpus __be16_to_cpus
- #endif
- 
--
-+#if defined(__KERNEL__)
- /*
-  * Handle ntohl and suches. These have various compatibility
-  * issues - like we want to give the prototype even though we
-@@ -146,35 +146,26 @@
-  * Do the prototypes. Somebody might want to take the
-  * address or some such sick thing..
-  */
--#if defined(__KERNEL__) || (defined (__GLIBC__) && __GLIBC__ >= 2)
- extern __u32			ntohl(__u32);
- extern __u32			htonl(__u32);
--#else
--extern unsigned long int	ntohl(unsigned long int);
--extern unsigned long int	htonl(unsigned long int);
--#endif
- extern unsigned short int	ntohs(unsigned short int);
- extern unsigned short int	htons(unsigned short int);
- 
--
--#if defined(__GNUC__) && (__GNUC__ >= 2) && defined(__OPTIMIZE__) && !defined(__STRICT_ANSI__)
-+#if defined(__GNUC__) && defined(__OPTIMIZE__)
- 
- #define ___htonl(x) __cpu_to_be32(x)
- #define ___htons(x) __cpu_to_be16(x)
- #define ___ntohl(x) __be32_to_cpu(x)
- #define ___ntohs(x) __be16_to_cpu(x)
- 
--#if defined(__KERNEL__) || (defined (__GLIBC__) && __GLIBC__ >= 2)
- #define htonl(x) ___htonl(x)
- #define ntohl(x) ___ntohl(x)
--#else
--#define htonl(x) ((unsigned long)___htonl(x))
--#define ntohl(x) ((unsigned long)___ntohl(x))
--#endif
- #define htons(x) ___htons(x)
- #define ntohs(x) ___ntohs(x)
- 
- #endif /* OPTIMIZE */
- 
-+#endif /* KERNEL */
-+
- 
- #endif /* _LINUX_BYTEORDER_GENERIC_H */
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r9 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r9
deleted file mode 100644
index e4b6432b4fe2..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
-MD5 aea17fa0a6fc0bef9847b8713d4c3923 mipscvs-2.4.21-20030803.diff.bz2 1011871
-MD5 bd9732ff25e9a83fa1392111e3dfbe90 cobalt-patches-24xx-1.2.tar.bz2 6425
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r12 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r12
deleted file mode 100644
index 5609bcd9f6e0..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
-MD5 d82efc4684e5b4f1b64092d9adaac7e8 mipscvs-2.4.22-20031015.diff.bz2 239716
-MD5 bd9732ff25e9a83fa1392111e3dfbe90 cobalt-patches-24xx-1.2.tar.bz2 6425
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r8 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r8
deleted file mode 100644
index c4b788198c8b..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r8
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 642af5ab5e1fc63685fde85e9ae601e4 linux-2.4.23.tar.bz2 29832609
-MD5 6a0568d481238976d8c4cbc208492580 mipscvs-2.4.23-20031128.diff.bz2 286782
-MD5 b436247b06504364cad0ef214d2a8ccd cobalt-patches-24xx-1.3.tar.bz2 5609
-MD5 2230e5482efd34a9bae1cc05cd9d3b2c xfs-2.4.23-split-only.bz2 652627
-MD5 0723db65569d1eaa5de4584e5b10fe87 xfs-2.4.23-split-kernel.bz2 11561
-MD5 879b21c543189704146d9a3ff99af3c2 xfs-2.4.23-split-acl.bz2 2290
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r2 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r3
index bb37c137f1e2..bb37c137f1e2 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r2
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r3
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r2
index 6f818deaa2b8..6f818deaa2b8 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r1
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r2
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.3-r4 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.3-r4
deleted file mode 100644
index 5beb44a2464c..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.3-r4
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 6063a7e424355ec52e0cb559fb99034d linux-2.6.3.tar.bz2 34271622
-MD5 efdd8b6bfb00d1a1e7b6c71014460c89 mipscvs-2.6.3-20040305.diff.bz2 840150
-MD5 903eb25c173eb8e3dcd20c0dd66d152a cobalt-patches-26xx-1.3.tar.bz2 7341
-MD5 9f0061615a95c9e31f30b2b7dacd23ef ip32-iluxa-minpatchset-20040229.diff.bz2 1409
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r2 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r3
index 1a5fc819e2ad..1a5fc819e2ad 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r2
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r3
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.5-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.5-r2
index c1a0ce95b671..c1a0ce95b671 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.5-r1
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.5-r2
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r1
new file mode 100644
index 000000000000..c5dad420be76
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r1
@@ -0,0 +1,4 @@
+MD5 5218790bc3db41e77a7422969639a9ad linux-2.6.6.tar.bz2 34896138
+MD5 28229f4685c0109735f7eceb3ea78f31 mipscvs-2.6.6-20040604.diff.bz2 418820
+MD5 62fa5bbee1bcb8b93e41a73abede8132 cobalt-patches-26xx-1.4.tar.bz2 7596
+MD5 6a87b436cf02a3030a2b0a5b65115950 ip32-iluxa-minpatchset-20040519.diff.bz2 936
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.4.21-makefile-fix.patch b/sys-kernel/mips-sources/files/mipscvs-2.4.21-makefile-fix.patch
deleted file mode 100644
index 18bd1e135426..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.4.21-makefile-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- arch/mips/Makefile.orig	2003-08-03 18:24:17.000000000 -0400
-+++ arch/mips/Makefile	2003-08-03 18:25:59.000000000 -0400
-@@ -69,7 +69,7 @@ ifdef CONFIG_CPU_VR41XX
- GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
- endif
- ifdef CONFIG_CPU_R4X00
--GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
-+GCCFLAGS	+= -mips3 -mabi=32 -Wa,--trap
- endif
- ifdef CONFIG_CPU_TX49XX
- GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
-@@ -81,14 +81,14 @@ ifdef CONFIG_CPU_MIPS64
- GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
- endif
- ifdef CONFIG_CPU_R5000
--GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
-+GCCFLAGS	+= -mips4 -mabi=32 -Wa,--trap
- endif
- ifdef CONFIG_CPU_R5432
- GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
- endif
- ifdef CONFIG_CPU_NEVADA
- # Cannot use -mmad with currently recommended tools
--GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
-+GCCFLAGS	+= -mips4 -mabi=32 -Wa,--trap
- endif
- ifdef CONFIG_CPU_RM7000
- GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
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
deleted file mode 100644
index e3e539266ee0..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.4.21-no-page-align.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-makefile-fix.patch b/sys-kernel/mips-sources/files/mipscvs-2.4.22-makefile-fix.patch
deleted file mode 100644
index bf3acafad4df..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.4.22-makefile-fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- arch/mips/Makefile.orig	2003-08-25 22:50:20.000000000 -0400
-+++ arch/mips/Makefile	2003-08-25 22:50:57.000000000 -0400
-@@ -72,7 +72,7 @@ ifdef CONFIG_CPU_VR41XX
- GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
- endif
- ifdef CONFIG_CPU_R4X00
--GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
-+GCCFLAGS	+= -mips3 -Wa,--trap
- endif
- ifdef CONFIG_CPU_TX49XX
- GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
-@@ -84,14 +84,14 @@ ifdef CONFIG_CPU_MIPS64
- GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
- endif
- ifdef CONFIG_CPU_R5000
--GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
-+GCCFLAGS	+= -mips4 -Wa,--trap
- endif
- ifdef CONFIG_CPU_R5432
- GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
- endif
- ifdef CONFIG_CPU_NEVADA
- # Cannot use -mmad with currently recommended tools
--GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
-+GCCFLAGS	+= -mips4 -Wa,--trap
- endif
- ifdef CONFIG_CPU_RM7000
- GCCFLAGS	+= $(call check_gcc, -march=rm7000, -mcpu=r5000) \
---- arch/mips64/Makefile.orig	2003-08-25 22:52:01.000000000 -0400
-+++ arch/mips64/Makefile	2003-08-25 22:52:42.000000000 -0400
-@@ -55,10 +55,10 @@ ifdef CONFIG_CPU_R4300
- GCCFLAGS	+= -mcpu=r4300 -mips3
- endif
- ifdef CONFIG_CPU_R4X00
--GCCFLAGS	+= -mcpu=r4600 -mips3
-+GCCFLAGS	+= -mips3
- endif
- ifdef CONFIG_CPU_R5000
--GCCFLAGS	+= -mcpu=r8000 -mips4
-+GCCFLAGS	+= -mips4
- endif
- ifdef CONFIG_CPU_NEVADA
- GCCFLAGS	+= -mcpu=r8000 -mips3 -mmad
---- arch/mips64/Makefile.orig	2003-10-15 05:37:01.000000000 -0400
-+++ arch/mips64/Makefile	2003-10-15 05:37:44.000000000 -0400
-@@ -288,7 +288,7 @@ endif
- # convert to ECOFF using elf2ecoff.
- #
- ifdef CONFIG_BOOT_ELF32
--GCCFLAGS += -Wa,-32 $(shell if $(CC) -Wa,-mgp64 -c -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "-Wa,-mgp64"; fi)
-+GCCFLAGS += -Wa,-mabi=o64 $(shell if $(CC) -Wa,-mgp64 -c -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "-Wa,-mgp64"; fi)
- LINKFLAGS += -T arch/mips64/ld.script.elf32
- endif
- #
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
deleted file mode 100644
index 812d9c20e556..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.4.22-no-page-align.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-makefile-fix.patch b/sys-kernel/mips-sources/files/mipscvs-2.4.23-makefile-fix.patch
deleted file mode 100644
index 792a9bd00a3c..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.4.23-makefile-fix.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- arch/mips/Makefile.orig	2003-11-28 17:51:18.785694032 -0500
-+++ arch/mips/Makefile	2003-11-28 17:51:50.458878976 -0500
-@@ -73,7 +73,7 @@ ifdef CONFIG_CPU_VR41XX
- GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
- endif
- ifdef CONFIG_CPU_R4X00
--GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
-+GCCFLAGS	+= -mips3 -Wa,--trap
- endif
- ifdef CONFIG_CPU_TX49XX
- GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
-@@ -85,14 +85,14 @@ ifdef CONFIG_CPU_MIPS64
- GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
- endif
- ifdef CONFIG_CPU_R5000
--GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
-+GCCFLAGS	+= -mips4 -Wa,--trap
- endif
- ifdef CONFIG_CPU_R5432
- GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
- endif
- ifdef CONFIG_CPU_NEVADA
- # Cannot use -mmad with currently recommended tools
--GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
-+GCCFLAGS	+= -mips4 -Wa,--trap
- endif
- ifdef CONFIG_CPU_RM7000
- GCCFLAGS	+= $(call check_gcc, -march=rm7000, -mcpu=r5000) \
---- arch/mips64/Makefile.orig	2003-11-28 17:52:19.503463528 -0500
-+++ arch/mips64/Makefile	2003-11-28 17:53:09.394878880 -0500
-@@ -56,14 +56,14 @@ ifdef CONFIG_CPU_R4300
- GCCFLAGS	+= -mcpu=r4300 -mips3
- endif
- ifdef CONFIG_CPU_R4X00
--GCCFLAGS	+= -mcpu=r4600 -mips3
-+GCCFLAGS	+= -mips3
- endif
- ifdef CONFIG_CPU_R5000
--GCCFLAGS	+= -mcpu=r8000 -mips4
-+GCCFLAGS	+= -mips4
- endif
- ifdef CONFIG_CPU_NEVADA
- # Cannot use -mmad with currently recommended tools
--GCCFLAGS	+= -mcpu=r8000 -mips3
-+GCCFLAGS	+= -mips4
- endif
- ifdef CONFIG_CPU_RM7000
- GCCFLAGS	+= $(call check_gcc, -march=rm7000, -mcpu=r5000) \
-@@ -299,7 +299,7 @@ endif
- # convert to ECOFF using elf2ecoff.
- #
- ifdef CONFIG_BOOT_ELF32
--GCCFLAGS += -Wa,-32 $(shell if $(CC) -Wa,-mgp64 -c -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "-Wa,-mgp64"; fi)
-+GCCFLAGS += -Wa,-mabi=o64 $(shell if $(CC) -Wa,-mgp64 -c -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "-Wa,-mgp64"; fi)
- LINKFLAGS += -T arch/mips64/ld.script.elf32
- endif
- #
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.4.23-makefile-inlinelimit.patch b/sys-kernel/mips-sources/files/mipscvs-2.4.23-makefile-inlinelimit.patch
deleted file mode 100644
index 1519f803b994..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.4.23-makefile-inlinelimit.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- arch/mips/Makefile.orig	2004-02-09 23:36:46.057901728 -0500
-+++ arch/mips/Makefile	2004-02-09 23:38:33.666542728 -0500
-@@ -682,5 +682,6 @@ archmrproper:
- archdep:
- 	if [ ! -f $(TOPDIR)/include/asm-$(ARCH)/offset.h ]; then \
- 		touch $(TOPDIR)/include/asm-$(ARCH)/offset.h; \
-+		$(MAKE) -C arch/mips/tools clean; \
- 	fi;
- 	@$(MAKEBOOT) dep
---- arch/mips64/Makefile.orig	2004-02-09 23:36:51.882016328 -0500
-+++ arch/mips64/Makefile	2004-02-09 23:38:02.482283456 -0500
-@@ -24,6 +24,8 @@ ifdef CONFIG_CROSSCOMPILE
- CROSS_COMPILE	= $(tool-prefix)
- endif
- 
-+check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi)
-+
- #
- # The ELF GCC uses -G 0 -mabicalls -fpic as default.  We don't need PIC
- # code in the kernel since it only slows down the whole thing.  For the
-@@ -47,7 +49,6 @@ GCCFLAGS	+= -mno-sched-prolog -fno-omit-
- endif
- endif
- 
--check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi)
- 
- #
- # CPU-dependent compiler/assembler options for optimization.
-@@ -367,5 +368,6 @@ archmrproper:
- archdep:
- 	if [ ! -f $(TOPDIR)/include/asm-$(ARCH)/offset.h ]; then \
- 		touch $(TOPDIR)/include/asm-$(ARCH)/offset.h; \
-+		$(MAKE) -C arch/mips/tools clean; \
- 	fi;
- 	@$(MAKEBOOT) dep
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
deleted file mode 100644
index 189b30d1a640..000000000000
--- a/sys-kernel/mips-sources/files/mipscvs-2.4.23-no-page-align.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/rtc-fixes.patch b/sys-kernel/mips-sources/files/rtc-fixes.patch
deleted file mode 100644
index 78b11859fe26..000000000000
--- a/sys-kernel/mips-sources/files/rtc-fixes.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -urN linux-2.4.23/drivers/char/ds1286.c linux-2.4.24/drivers/char/ds1286.c
---- linux-2.4.23/drivers/char/ds1286.c	2003-08-25 04:44:41.000000000 -0700
-+++ linux-2.4.24/drivers/char/ds1286.c	2004-01-05 05:53:56.000000000 -0800
-@@ -173,7 +173,7 @@
- 		 * means "don't care" or "match all". Only the tm_hour,
- 		 * tm_min, and tm_sec values are filled in.
- 		 */
--
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		ds1286_get_alm_time(&wtime);
- 		break;
- 	}
-@@ -216,6 +216,7 @@
- 	}
- 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
- 	{
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		ds1286_get_time(&wtime);
- 		break;
- 	}
-diff -urN linux-2.4.23/drivers/char/ip27-rtc.c linux-2.4.24/drivers/char/ip27-rtc.c
---- linux-2.4.23/drivers/char/ip27-rtc.c	2003-08-25 04:44:41.000000000 -0700
-+++ linux-2.4.24/drivers/char/ip27-rtc.c	2004-01-05 05:53:56.000000000 -0800
-@@ -83,6 +83,7 @@
- 	switch (cmd) {
- 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
- 	{
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		get_rtc_time(&wtime);
- 		break;
- 	}
-diff -urN linux-2.4.23/drivers/char/mips_rtc.c linux-2.4.24/drivers/char/mips_rtc.c
---- linux-2.4.23/drivers/char/mips_rtc.c	2003-08-25 04:44:41.000000000 -0700
-+++ linux-2.4.24/drivers/char/mips_rtc.c	2004-01-05 05:53:56.000000000 -0800
-@@ -82,6 +82,7 @@
- 
- 	switch (cmd) {
- 	case RTC_RD_TIME:	/* Read the time/date from RTC  */
-+		memset(&rtc_tm, 0, sizeof(struct rtc_time));
- 		curr_time = rtc_get_time();
- 		to_tm(curr_time, &rtc_tm);
- 		rtc_tm.tm_year -= 1900;
-diff -urN linux-2.4.23/drivers/char/rtc.c linux-2.4.24/drivers/char/rtc.c
---- linux-2.4.23/drivers/char/rtc.c	2003-11-28 10:26:20.000000000 -0800
-+++ linux-2.4.24/drivers/char/rtc.c	2004-01-05 05:53:56.000000000 -0800
-@@ -362,7 +362,7 @@
- 		 * means "don't care" or "match all". Only the tm_hour,
- 		 * tm_min, and tm_sec values are filled in.
- 		 */
--
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		get_rtc_alm_time(&wtime);
- 		break; 
- 	}
-@@ -406,6 +406,7 @@
- 	}
- 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
- 	{
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		get_rtc_time(&wtime);
- 		break;
- 	}
-
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.21-r9.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.21-r9.ebuild
deleted file mode 100644
index 4f22bc77a5f4..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.4.21-r9.ebuild
+++ /dev/null
@@ -1,91 +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.4.21-r9.ebuild,v 1.1 2004/04/21 22:05:38 kumba Exp $
-
-
-# Version Data
-OKV=${PV/_/-}
-CVSDATE="20030803"
-EXTRAVERSION="-mipscvs-${CVSDATE}"
-KV="${OKV}${EXTRAVERSION}"
-COBALTPATCHVER="1.2"
-
-# 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 03 Aug 2003
-# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
-# 4) Fix for headers on big-endian machines
-# 5) do_brk fix
-# 6) mremap fix
-# 7) RTC fixes
-# 8) do_munmap fix
-# 9) ISO9660 Fix
-# 10) Patches for Cobalt support
-
-
-DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
-		mirror://gentoo/cobalt-patches-24xx-${COBALTPATCHVER}.tar.bz2"
-HOMEPAGE="http://www.linux-mips.org/"
-SLOT="${OKV}"
-PROVIDE="virtual/linux-sources"
-KEYWORDS="-* mips"
-
-
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${OKV}-${CVSDATE}
-	cd ${S}
-
-	# Update the vanilla sources with linux-mips CVS changes
-	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
-
-	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
-	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
-
-	# Big Endian Fix (Fix in headers for big-endian machines)
-	epatch ${FILESDIR}/bigendian-byteorder-fix.patch
-
-	# 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"
-		epatch ${FILESDIR}/CAN-2003-0961-do_brk.patch
-		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
-		epatch ${FILESDIR}/CAN-2004-0177-ext3_jbd.patch
-		epatch ${FILESDIR}/CAN-2004-0178-sbblaster.patch
-	eend
-
-	# Cobalt Patches
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
-		echo -e ""
-		einfo ">>> Patching kernel for Cobalt support ..."
-		for x in ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/*.patch; do
-			epatch ${x}
-		done
-		cp ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/cobalt-patches.txt ${S}
-		cd ${WORKDIR}
-		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt
-		S="${S}.cobalt"
-	fi
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.22-r12.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.22-r12.ebuild
deleted file mode 100644
index 4cc27a931cdf..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.4.22-r12.ebuild
+++ /dev/null
@@ -1,87 +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.4.22-r12.ebuild,v 1.1 2004/04/21 22:05:38 kumba Exp $
-
-
-# Version Data
-OKV=${PV/_/-}
-CVSDATE="20031015"
-EXTRAVERSION="-mipscvs-${CVSDATE}"
-KV="${OKV}${EXTRAVERSION}"
-COBALTPATCHVER="1.2"
-
-# Miscellaneous stuff
-S=${WORKDIR}/linux-${OKV}-${CVSDATE}
-IUSE=""
-
-# Eclass stuff
-ETYPE="sources"
-inherit kernel eutils
-
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 15 Oct 2003
-# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
-# 4) do_brk fix
-# 5) mremap fix
-# 6) RTC fixes
-# 7) iso9660 fix
-# 8) Patches for Cobalt support
-
-
-DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
-		mirror://gentoo/cobalt-patches-24xx-${COBALTPATCHVER}.tar.bz2"
-HOMEPAGE="http://www.linux-mips.org/"
-SLOT="${OKV}"
-PROVIDE="virtual/linux-sources"
-KEYWORDS="-* mips"
-
-
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${OKV}-${CVSDATE}
-	cd ${S}
-
-	# Update the vanilla sources with linux-mips CVS changes
-	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
-
-	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
-	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
-
-	# 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"
-		epatch ${FILESDIR}/CAN-2003-0961-do_brk.patch
-		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
-		epatch ${FILESDIR}/CAN-2004-0177-ext3_jbd.patch
-		epatch ${FILESDIR}/CAN-2004-0178-sbblaster.patch
-	eend
-
-	# Cobalt Patches
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
-		echo -e ""
-		einfo ">>> Patching kernel for Cobalt support ..."
-		for x in ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/*.patch; do
-			epatch ${x}
-		done
-		cp ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/cobalt-patches.txt ${S}
-		cd ${WORKDIR}
-		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt
-		S="${S}.cobalt"
-	fi
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.23-r8.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.23-r8.ebuild
deleted file mode 100644
index 5519824b8905..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.4.23-r8.ebuild
+++ /dev/null
@@ -1,103 +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.4.23-r8.ebuild,v 1.2 2004/05/03 07:41:37 kumba Exp $
-
-
-# Version Data
-OKV=${PV/_/-}
-CVSDATE="20031128"
-EXTRAVERSION="-mipscvs-${CVSDATE}"
-KV="${OKV}${EXTRAVERSION}"
-COBALTPATCHVER="1.3"
-
-# Miscellaneous stuff
-S=${WORKDIR}/linux-${OKV}-${CVSDATE}
-IUSE=""
-
-# Eclass stuff
-ETYPE="sources"
-inherit kernel eutils
-
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 28 Nov 2003
-# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
-# 4) XFS Patches for basic XFS support (with ACL, but no DMAPI)
-# 5) do_brk fix
-# 6) mremap fix
-# 7) RTC fixes
-# 8) iso9660 fix
-# 9) Patches for Cobalt support
-
-
-DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
-		mirror://gentoo/cobalt-patches-24xx-${COBALTPATCHVER}.tar.bz2
-		ftp://oss.sgi.com/projects/xfs/patches/2.4.23/xfs-2.4.23-split-only.bz2
-		ftp://oss.sgi.com/projects/xfs/patches/2.4.23/xfs-2.4.23-split-kernel.bz2
-		ftp://oss.sgi.com/projects/xfs/patches/2.4.23/xfs-2.4.23-split-acl.bz2"
-HOMEPAGE="http://www.linux-mips.org/"
-SLOT="${OKV}"
-PROVIDE="virtual/linux-sources"
-KEYWORDS="-* mips"
-
-
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${OKV}-${CVSDATE}
-	cd ${S}
-
-	# Update the vanilla sources with linux-mips CVS changes
-	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
-
-	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
-	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
-
-	# Patch to fix mips64 Makefile so that -finline-limit=10000 gets added to CFLAGS
-	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-inlinelimit.patch
-
-	# 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
-	echo -e ""
-	ebegin "Applying XFS Patchset"
-		cat ${WORKDIR}/xfs-${PV}-split-only | patch -p1 2>&1 >/dev/null
-		cat ${WORKDIR}/xfs-${PV}-split-kernel | patch -p1 2>&1 >/dev/null
-		cat ${WORKDIR}/xfs-${PV}-split-acl | patch -p1 2>&1 >/dev/null
-	eend
-
-	# Security Fixes
-	echo -e ""
-	ebegin "Applying Security Fixes"
-		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
-		epatch ${FILESDIR}/CAN-2004-0177-ext3_jbd.patch
-		epatch ${FILESDIR}/CAN-2004-0178-sbblaster.patch
-	eend
-
-	# Cobalt Patches
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
-		echo -e ""
-		einfo ">>> Patching kernel for Cobalt support ..."
-		for x in ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/*.patch; do
-			epatch ${x}
-		done
-		cp ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/cobalt-patches.txt ${S}
-		cd ${WORKDIR}
-		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt
-		S="${S}.cobalt"
-	fi
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.25-r2.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.25-r3.ebuild
index 507fafaed8eb..9e88799a0480 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.25-r2.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.25-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.4.25-r2.ebuild,v 1.2 2004/05/03 07:41:37 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.25-r3.ebuild,v 1.1 2004/06/04 09:32:17 kumba Exp $
 
 
 # Version Data
@@ -24,7 +24,7 @@ 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) iso9660 fix
+# 5) Security Fixes
 # 6) Patches for Cobalt support
 
 
@@ -58,10 +58,14 @@ src_unpack() {
 
 	# Security Fixes
 	echo -e ""
-		ebegin "Applying Security Fixes"
+	ebegin "Applying Security Fixes"
 		epatch ${FILESDIR}/CAN-2004-0109-2.4-iso9660.patch
+		epatch ${FILESDIR}/CAN-2004-0133-xfs_ext3.patch
 		epatch ${FILESDIR}/CAN-2004-0177-ext3_jbd.patch
 		epatch ${FILESDIR}/CAN-2004-0178-sbblaster.patch
+		epatch ${FILESDIR}/CAN-2004-0181-2.4-jfs_ext3.patch
+		epatch ${FILESDIR}/CAN-2004-0394-panic.patch
+		epatch ${FILESDIR}/CAN-2004-0427-2.4-do_fork.patch
 	eend
 
 	# Cobalt Patches
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.26-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.26-r2.ebuild
index 16d93530b406..46fc089390d8 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.26-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.26-r2.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.26-r1.ebuild,v 1.2 2004/04/28 09:29:59 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.26-r2.ebuild,v 1.1 2004/06/04 09:32:17 kumba Exp $
 
 
 # Version Data
@@ -35,7 +35,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"
 
 
 src_unpack() {
@@ -49,6 +49,12 @@ src_unpack() {
 	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
 	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
 
+	# Security Fixes
+	echo -e ""
+	ebegin "Applying Security Fixes"
+		epatch ${FILESDIR}/CAN-2004-0394-panic.patch
+	eend
+
 	# Cobalt Patches
 	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
 		echo -e ""
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.4-r2.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.4-r3.ebuild
index 35bd45114702..f8e6c200c03b 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.4-r2.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.4-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.4-r2.ebuild,v 1.2 2004/05/11 03:08:29 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.4-r3.ebuild,v 1.1 2004/06/04 09:32:17 kumba Exp $
 
 
 # Version Data
@@ -24,7 +24,7 @@ inherit kernel eutils
 # 2) linux-mips.org CVS snapshot diff from 11 Mar 2004
 # 3) Patch to tweak arch/mips/Makefile to build proper kernels under binutils-2.15.x
 # 4) Iluxa's minimal O2 patchset
-# 5) CAN-2004-0109: ISO9660 patch
+# 5) Security Fixes
 # 6) Patches for Cobalt support
 
 
@@ -78,7 +78,15 @@ src_unpack() {
 	epatch ${FILESDIR}/mipscvs-2.6.x-no-page-align.patch
 
 	# Security Fixes
-	epatch ${FILESDIR}/CAN-2004-0109-2.6-iso9660.patch
+	echo -e ""
+	ebegin "Applying Security Fixes"
+		epatch ${FILESDIR}/CAN-2004-0075-2.6-vicam_usb.patch
+		epatch ${FILESDIR}/CAN-2004-0109-2.6-iso9660.patch
+		epatch ${FILESDIR}/CAN-2004-0181-2.6-jfs_ext3.patch
+		epatch ${FILESDIR}/CAN-2004-0228-cpufreq.patch
+		epatch ${FILESDIR}/CAN-2004-0229-fb_copy_cmap.patch
+		epatch ${FILESDIR}/CAN-2004-0427-2.6-do_fork.patch
+	eend
 
 	# Cobalt Patches
 	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.5-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.5-r2.ebuild
index f3a595743f13..7981444046fc 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.5-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.5-r2.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.5-r1.ebuild,v 1.2 2004/05/11 03:08:29 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.5-r2.ebuild,v 1.1 2004/06/04 09:32:17 kumba Exp $
 
 
 # Version Data
@@ -25,7 +25,7 @@ inherit kernel eutils
 # 3) Patch to fix the Swap issue in 2.6.5+ (Credit: Peter Horton <cobalt@colonel-panic.org>
 # 4) Iluxa's minimal O2 patchset
 # 5) Patch to fix linking issue for initrd's
-# 6) CAN-2004-0109: ISO9660 patch
+# 6) Security Fixes
 # 7) Patches for Cobalt support
 
 
@@ -81,7 +81,14 @@ src_unpack() {
 	epatch ${FILESDIR}/mipscvs-${OKV}-unistd-linkage.patch
 
 	# Security Fixes
-	epatch ${FILESDIR}/CAN-2004-0109-2.6-iso9660.patch
+	echo -e ""
+	ebegin "Applying Security Fixes"
+		epatch ${FILESDIR}/CAN-2004-0075-2.6-vicam_usb.patch
+		epatch ${FILESDIR}/CAN-2004-0109-2.6-iso9660.patch
+		epatch ${FILESDIR}/CAN-2004-0228-cpufreq.patch
+		epatch ${FILESDIR}/CAN-2004-0229-fb_copy_cmap.patch
+		epatch ${FILESDIR}/CAN-2004-0427-2.6-do_fork.patch
+	eend
 
 	# Cobalt Patches
 	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.3-r4.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.6-r1.ebuild
index 53b7347d1b44..095d5a9a44be 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.3-r4.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.6-r1.ebuild
@@ -1,19 +1,16 @@
 # 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-r4.ebuild,v 1.2 2004/05/11 03:08:29 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.6-r1.ebuild,v 1.1 2004/06/04 09:32:17 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
-CVSDATE="20040305"
-COBALTPATCHVER="1.3"
-IP32DIFFDATE="20040229"
-[ "${USE_IP32}" = "yes" ] && EXTRAVERSION="-mipscvs-${CVSDATE}-ip32" || EXTRAVERSION="-mipscvs-${CVSDATE}"
+CVSDATE="20040604"
+COBALTPATCHVER="1.4"
+IP32DIFFDATE="20040519"
+EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 
-
-
-
 # Miscellaneous stuff
 S=${WORKDIR}/linux-${OKV}-${CVSDATE}
 
@@ -24,11 +21,10 @@ inherit kernel eutils
 
 # INCLUDED:
 # 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 05 Mar 2004
-# 3) Patch to tweak arch/mips/Makefile to build proper kernels under binutils-2.15.x
-# 4) Iluxa's minimal O2 patchset
-# 5) CAN-2004-0109: ISO9660 patch
-# 6) Patches for Cobalt support
+# 2) linux-mips.org CVS snapshot diff from 10 May 2004
+# 3) Patch to fix the Swap issue in 2.6.5+ (Credit: Peter Horton <cobalt@colonel-panic.org>
+# 4) Iluxa's minimal O2 Patchset
+# 5) Patches for Cobalt support
 
 
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
@@ -56,16 +52,6 @@ pkg_setup() {
 		einfo "installed and setup."
 		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() {
@@ -76,12 +62,12 @@ 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
+	# Bug in 2.6.6 that triggers a kernel oops when swap is activated
+	epatch ${FILESDIR}/mipscvs-2.6.5-swapbug-fix.patch
 
-	# Security Fixes
-	epatch ${FILESDIR}/CAN-2004-0109-2.6-iso9660.patch
+	echo -e ""
+	einfo ">>> Patching kernel with iluxa's minimal IP32 patchset ..."
+	epatch ${WORKDIR}/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff
 
 	# Cobalt Patches
 	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
@@ -96,16 +82,5 @@ 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
 }