First, was wrong to put compressed files into the tree, thus all security-related patches have been moved to a patchball on the mirrors, and 2.6 has a newer patch for a /proc issue added in as well. Second, a patch for 2.6.x ebuilds was added to tweak the kernel entry addr for IP32 kernels so that the arcboot bootloader will actually boot the things.

34 files changed, 187 insertions, 580 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 09955aa9dfd9..7d6cee18492c 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.50 2004/08/01 08:11:29 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.51 2004/08/02 06:57:17 kumba Exp $
+
+*mips-sources-2.4.25-r6 (02 Aug 2004)
+
+  02 Aug 2004; Joshua Kinard <kumba@gentoo.org>
+  -files/CAN-2004-0075-2.6-vicam_usb.patch,
+  -files/CAN-2004-0109-2.4-iso9660.patch,
+  -files/CAN-2004-0109-2.6-iso9660.patch, -files/CAN-2004-0133-xfs_ext3.patch,
+  -files/CAN-2004-0177-ext3_jbd.patch, -files/CAN-2004-0178-sbblaster.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/CAN-2004-0495-2.4-sparse.patch.bz2,
+  -files/CAN-2004-0495_0496-2.6-sparse.patch.bz2,
+  -files/CAN-2004-0497-attr_gid.patch, -files/CAN-2004-0535-2.4-e1000.patch,
+  -files/CAN-2004-0596-2.6-eql.patch, -files/CAN-2004-0626-death_packet.patch,
+  +files/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch,
+  -mips-sources-2.4.25-r5.ebuild, +mips-sources-2.4.25-r6.ebuild,
+  -mips-sources-2.4.26-r5.ebuild, +mips-sources-2.4.26-r6.ebuild,
+  -mips-sources-2.6.4-r5.ebuild, +mips-sources-2.6.4-r6.ebuild,
+  -mips-sources-2.6.5-r4.ebuild, +mips-sources-2.6.5-r5.ebuild,
+  -mips-sources-2.6.6-r3.ebuild, +mips-sources-2.6.6-r4.ebuild,
+  -mips-sources-2.6.7-r2.ebuild, +mips-sources-2.6.7-r3.ebuild:
+  First, was wrong to put compressed files into the tree, thus all
+  security-related patches have been moved to a patchball on the mirrors, and
+  2.6 has a newer patch for a /proc issue added in as well. Second, a patch for
+  2.6.x ebuilds was added to tweak the kernel entry addr for IP32 kernels so
+  that the arcboot bootloader will actually boot the things.
 
 *mips-sources-2.4.25-r5 (01 Aug 2004)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 3391b26e2a2c..6c9ea5e2bdfd 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,29 +1,18 @@
-MD5 ed4970fcfc66e691f99ff8f14a6b49b8 ChangeLog 18291
+MD5 20cf1c7f07182846189e9dc62a3b5eb7 ChangeLog 19960
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 74aea50be14303771c3a1c8d5ab68d5b mips-sources-2.4.26-r5.ebuild 2213
-MD5 fa2957c0e2444fb312690c6d863ae04b mips-sources-2.6.4-r5.ebuild 3463
-MD5 c42e2ab5d8e6d16a8648242c88330634 mips-sources-2.6.5-r4.ebuild 3531
-MD5 aed2eb71c8d42c0855f0896a5ad78655 mips-sources-2.6.6-r3.ebuild 3086
-MD5 428e383272960bc8ae9f174fe85b648b mips-sources-2.6.7-r2.ebuild 3066
-MD5 e98c343ccec67af6df1ebb74046ed1a7 mips-sources-2.4.25-r5.ebuild 2856
-MD5 6f4bba5dda7a99d77b1564f5489fef6e files/CAN-2004-0075-2.6-vicam_usb.patch 1129
-MD5 21f3a4f186017d925067335e24db36a1 files/CAN-2004-0109-2.4-iso9660.patch 1877
-MD5 31ec7b4310dd7be3e34aab0204f9b1e8 files/CAN-2004-0109-2.6-iso9660.patch 2072
-MD5 5bf9836a632a861728d33f9736bb7431 files/CAN-2004-0133-xfs_ext3.patch 427
-MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/CAN-2004-0177-ext3_jbd.patch 384
-MD5 ac42024b6e6ee1e2165914db4b22a61c files/CAN-2004-0178-sbblaster.patch 424
-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 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-r5 217
-MD5 1e86c5a6d88da0ee787ddda716a86502 files/digest-mips-sources-2.4.26-r5 218
-MD5 15a4113e4036cf81a9ff7e0ccedbccd8 files/CAN-2004-0495-2.4-sparse.patch.bz2 4392
-MD5 8204afea1d572b49a4a80d8da4eef0c9 files/CAN-2004-0596-2.6-eql.patch 1033
-MD5 497365345d8a39da49a8bd2495a17d8c files/digest-mips-sources-2.6.4-r5 299
+MD5 b765eaa5e57af713ed6d892c8d9c3706 mips-sources-2.4.25-r6.ebuild 3059
+MD5 fc9864d540cb4a1c525a7192d249db8a mips-sources-2.4.26-r6.ebuild 2369
+MD5 e3c66dfc50e9fbab194e000e4112c27c mips-sources-2.6.4-r6.ebuild 3901
+MD5 bcce1f5ffabf5e8dd23fffe6df71dad4 mips-sources-2.6.5-r5.ebuild 3961
+MD5 1120f6e2bcc6bf2e89cba71817d29558 mips-sources-2.6.6-r4.ebuild 3476
+MD5 30daf9c4c38ebf38f55834d364f698cc mips-sources-2.6.7-r3.ebuild 3454
+MD5 005c705111f504798dfba298ad86e544 files/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch 645
+MD5 1e8328fab29b3bf01893ff2214a4c73f files/digest-mips-sources-2.4.25-r6 302
+MD5 191cb31a384893b46c6130fff561aca2 files/digest-mips-sources-2.4.26-r6 303
+MD5 b7c0770a02ed5593a8d6426a63e1575c files/digest-mips-sources-2.6.4-r6 384
+MD5 8d87d4e782f71384bc1fa268f59f4b0a files/digest-mips-sources-2.6.5-r5 384
+MD5 32570900b6c125b77bead8b29c967595 files/digest-mips-sources-2.6.6-r4 384
+MD5 02a6e345952e1403b2540dbb1628a2ba files/digest-mips-sources-2.6.7-r3 384
 MD5 fbb6766828584e454bf053286aad6207 files/mipscvs-2.4.25-makefile-fix.patch 428
 MD5 95ba3093147f4188db0ea4949e4317cf files/mipscvs-2.4.25-makefile-inlinelimit.patch 1588
 MD5 764740b749fd1f81313aa941c55000ac files/mipscvs-2.4.25-no-page-align.patch 1013
@@ -33,10 +22,3 @@ MD5 db1aaa77e691906f3857e54e363c4ff4 files/mipscvs-2.6.5-unistd-linkage.patch 51
 MD5 2802496e6b2dcc4e5ff19fac6826c7f7 files/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch 339
 MD5 c65ca9f967d25e79aadfe387f7ce6fa3 files/mipscvs-2.6.x-no-page-align.patch 483
 MD5 fd5b99bc2a9e4c7f9825c9aab6a76b52 files/misc-2.6-iptables_headers.patch 1786
-MD5 95708646470a95668e8789cd415844ed files/CAN-2004-0497-attr_gid.patch 846
-MD5 0f66013f643c79c97fda489618a4e2fd files/CAN-2004-0535-2.4-e1000.patch 476
-MD5 c91330cc5b4044b6f59696095c2dc0fb files/CAN-2004-0626-death_packet.patch 423
-MD5 eb9f26d678449f22ce5b7c00762eeb91 files/digest-mips-sources-2.6.5-r4 299
-MD5 ff47ec7e8b4282773743aa192d3a73b6 files/digest-mips-sources-2.6.6-r3 299
-MD5 5b7a4b7f8c4baea56b4cd1332cb0948b files/digest-mips-sources-2.6.7-r2 299
-MD5 301454f4e1998328b60ca75b5fb7b773 files/CAN-2004-0495_0496-2.6-sparse.patch.bz2 5880
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
deleted file mode 100644
index e131c957cb0a..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0075-2.6-vicam_usb.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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-0109-2.4-iso9660.patch b/sys-kernel/mips-sources/files/CAN-2004-0109-2.4-iso9660.patch
deleted file mode 100644
index d02b51c57fc6..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0109-2.4-iso9660.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- 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
deleted file mode 100644
index d7726c2e5aaf..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0109-2.6-iso9660.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- 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 <linux/buffer_head.h>
-+#include <asm/page.h>
- 
- #include "rock.h"
-@@ -419,7 +420,7 @@ int parse_rock_ridge_inode_internal(stru
-   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 @@ static char *get_symlink_chunk(char *rpn
- 		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 @@ static char *get_symlink_chunk(char *rpn
- 			 * 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 @@ static int rock_ridge_symlink_readpage(s
- 			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-0133-xfs_ext3.patch b/sys-kernel/mips-sources/files/CAN-2004-0133-xfs_ext3.patch
deleted file mode 100644
index c756bc328bf2..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0133-xfs_ext3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-0177-ext3_jbd.patch b/sys-kernel/mips-sources/files/CAN-2004-0177-ext3_jbd.patch
deleted file mode 100644
index da6b7e190685..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0177-ext3_jbd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- linux-2.4.26-pre3/fs/jbd/journal.c	2004-02-18 05:36:31.000000000 -0800
-+++ linux-2.4.26-pre4/fs/jbd/journal.c	2004-03-16 09:59:36.000000000 -0800
-@@ -671,6 +671,7 @@
- 
- 	bh = getblk(journal->j_dev, blocknr, journal->j_blocksize);
- 	lock_buffer(bh);
-+	memset(bh->b_data, 0, journal->j_blocksize);
- 	BUFFER_TRACE(bh, "return this buffer");
- 	return journal_add_journal_head(bh);
- }
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0178-sbblaster.patch b/sys-kernel/mips-sources/files/CAN-2004-0178-sbblaster.patch
deleted file mode 100644
index 19e57268c2fa..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0178-sbblaster.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.4.26-pre2/drivers/sound/sb_audio.c	2002-02-25 11:38:06.000000000 -0800
-+++ linux-2.4.26-pre3/drivers/sound/sb_audio.c	2004-03-13 07:43:23.000000000 -0800
-@@ -879,7 +879,7 @@
- 			c -= locallen; p += locallen;
- 		}
- 		/* used = ( samples * 16 bits size ) */
--		*used = len << 1;
-+		*used =  max_in  > ( max_out << 1) ? (max_out << 1) : max_in;
- 		/* returned = ( samples * 8 bits size ) */
- 		*returned = len;
- 	}
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
deleted file mode 100644
index 5f7f1441b268..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0181-2.4-jfs_ext3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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
deleted file mode 100644
index 4f4742b992f0..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0181-2.6-jfs_ext3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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
deleted file mode 100644
index 746ade9ab1c0..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0228-cpufreq.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 2b6dfff88e25..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0229-fb_copy_cmap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 273f1a52046f..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0394-panic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index ddc9610f67f8..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0427-2.4-do_fork.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index adadefd53db2..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0427-2.6-do_fork.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/CAN-2004-0495-2.4-sparse.patch.bz2 b/sys-kernel/mips-sources/files/CAN-2004-0495-2.4-sparse.patch.bz2
deleted file mode 100644
index df95ea20ecbe..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0495-2.4-sparse.patch.bz2
+++ /dev/null
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0495_0496-2.6-sparse.patch.bz2 b/sys-kernel/mips-sources/files/CAN-2004-0495_0496-2.6-sparse.patch.bz2
deleted file mode 100644
index b626020ec6af..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0495_0496-2.6-sparse.patch.bz2
+++ /dev/null
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0497-attr_gid.patch b/sys-kernel/mips-sources/files/CAN-2004-0497-attr_gid.patch
deleted file mode 100644
index 41b3196f84ea..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0497-attr_gid.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-#   2004/07/02 20:55:04-07:00 chrisw@osdl.org 
-#   [PATCH] chown permission check fix for ATTR_GID
-#   
-#   SuSE discovered this problem with chown and ATTR_GID.  Make sure user
-#   is authorized to change the group, CAN-2004-0497.
-# 
-# fs/attr.c
-#   2004/07/02 09:07:32-07:00 chrisw@osdl.org +2 -1
-#   chown permission check fix for ATTR_GID
-# 
-diff -Nru a/fs/attr.c b/fs/attr.c
---- a/fs/attr.c	2004-07-08 16:35:57 -07:00
-+++ b/fs/attr.c	2004-07-08 16:35:57 -07:00
-@@ -35,7 +35,8 @@
- 
- 	/* Make sure caller can chgrp. */
- 	if ((ia_valid & ATTR_GID) &&
--	    (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid) &&
-+	    (current->fsuid != inode->i_uid ||
-+	    (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid)) &&
- 	    !capable(CAP_CHOWN))
- 		goto error;
- 
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0535-2.4-e1000.patch b/sys-kernel/mips-sources/files/CAN-2004-0535-2.4-e1000.patch
deleted file mode 100644
index 669fc5fd32fb..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0535-2.4-e1000.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- drivers/net/e1000/e1000_ethtool.c	2003-06-13 15:51:34.000000000 +0100
-+++ drivers/net/e1000/e1000_ethtool.c.plasmaroo	2004-06-24 11:23:32.524963976 +0100
-@@ -468,6 +468,9 @@
- 
- 		if(copy_from_user(&regs, addr, sizeof(regs)))
- 			return -EFAULT;
-+		memset(regs_buff, 0, sizeof(regs_buff));
-+		if (regs.len > E1000_REGS_LEN)
-+			regs.len = E1000_REGS_LEN;
- 		e1000_ethtool_gregs(adapter, &regs, regs_buff);
- 		if(copy_to_user(addr, &regs, sizeof(regs)))
- 			return -EFAULT;
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0596-2.6-eql.patch b/sys-kernel/mips-sources/files/CAN-2004-0596-2.6-eql.patch
deleted file mode 100644
index 3e20a2e41372..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0596-2.6-eql.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- 1.13/drivers/net/eql.c	2004-07-21 03:13:40 -07:00
-+++ 1.14/drivers/net/eql.c	2004-07-21 03:13:40 -07:00
-@@ -495,6 +495,8 @@
- 		return -EFAULT;
- 
- 	slave_dev = dev_get_by_name(sc.slave_name);
-+	if (!slave_dev)
-+		return -ENODEV;
- 
- 	ret = -EINVAL;
- 
-@@ -527,11 +529,13 @@
- 	if (copy_from_user(&sc, scp, sizeof (slave_config_t)))
- 		return -EFAULT;
- 
--	eql = dev->priv;
- 	slave_dev = dev_get_by_name(sc.slave_name);
-+	if (!slave_dev)
-+		return -ENODEV;
- 
- 	ret = -EINVAL;
- 
-+	eql = dev->priv;
- 	spin_lock_bh(&eql->queue.lock);
- 	if (eql_is_slave(slave_dev)) {
- 		slave = __eql_find_slave_dev(&eql->queue, slave_dev);
---- 1.14/drivers/net/eql.c	2004-07-21 03:13:33 -07:00
-+++ 1.15/drivers/net/eql.c	2004-07-21 03:13:33 -07:00
-@@ -499,6 +499,8 @@
- 		return -ENODEV;
- 
- 	ret = -EINVAL;
-+	if (!slave_dev)
-+		return ret;
- 
- 	spin_lock_bh(&eql->queue.lock);
- 	if (eql_is_slave(slave_dev)) {
-@@ -534,6 +536,8 @@
- 		return -ENODEV;
- 
- 	ret = -EINVAL;
-+	if (!slave_dev)
-+		return ret;
- 
- 	eql = dev->priv;
- 	spin_lock_bh(&eql->queue.lock);
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0626-death_packet.patch b/sys-kernel/mips-sources/files/CAN-2004-0626-death_packet.patch
deleted file mode 100644
index f6eafac10930..000000000000
--- a/sys-kernel/mips-sources/files/CAN-2004-0626-death_packet.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- net/ipv4/netfilter/ip_tables.c.orig	2004-06-30 18:19:22.957763360 -0400
-+++ net/ipv4/netfilter/ip_tables.c	2004-06-30 18:19:51.516421784 -0400
-@@ -1458,7 +1458,7 @@ tcp_find_option(u_int8_t option,
- 		int *hotdrop)
- {
- 	/* tcp.doff is only 4 bits, ie. max 15 * 4 bytes */
--	char opt[60 - sizeof(struct tcphdr)];
-+	u_int8_t opt[60 - sizeof(struct tcphdr)];
- 	unsigned int i;
- 
- 	duprintf("tcp_match: finding option\n");
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r5 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r6
index bb37c137f1e2..50f7c40f0173 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r5
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r6
@@ -1,3 +1,4 @@
 MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
 MD5 10b3bc2866a95e483f19093c980d9786 mipscvs-2.4.25-20040222.diff.bz2 89680
 MD5 18ad839cec259e123f743432dca994e3 cobalt-patches-24xx-1.4.tar.bz2 5809
+MD5 cb5d8a8ea7c792ce16f9f5548e4c8942 mips-sources-security_patches-1.0.tar.bz2 11948
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r5 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r6
index da6d2d913f2f..9da00d1e6eed 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r5
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r6
@@ -1,3 +1,4 @@
 MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
 MD5 36be1f4dfebd34b9ad7b69dab9add812 mipscvs-2.4.26-20040712.diff.bz2 343699
 MD5 18ad839cec259e123f743432dca994e3 cobalt-patches-24xx-1.4.tar.bz2 5809
+MD5 cb5d8a8ea7c792ce16f9f5548e4c8942 mips-sources-security_patches-1.0.tar.bz2 11948
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r5 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r6
index 1a5fc819e2ad..0a6a252cf6e0 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r5
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r6
@@ -2,3 +2,4 @@ MD5 335f06eba1e5372ba38a0d2b253629bd linux-2.6.4.tar.bz2 34386912
 MD5 99f597693cc1ea2f3fe162600405f32f mipscvs-2.6.4-20040311.diff.bz2 437306
 MD5 62fa5bbee1bcb8b93e41a73abede8132 cobalt-patches-26xx-1.4.tar.bz2 7596
 MD5 9f0061615a95c9e31f30b2b7dacd23ef ip32-iluxa-minpatchset-20040229.diff.bz2 1409
+MD5 cb5d8a8ea7c792ce16f9f5548e4c8942 mips-sources-security_patches-1.0.tar.bz2 11948
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.5-r4 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.5-r5
index c1a0ce95b671..2b0f4d0bfee5 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.5-r4
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.5-r5
@@ -2,3 +2,4 @@ MD5 9a76bf64c1151369b250f967d83077aa linux-2.6.5.tar.bz2 34684611
 MD5 f40e319434975c7b46258f97c3eb1264 mipscvs-2.6.5-20040412.diff.bz2 498372
 MD5 62fa5bbee1bcb8b93e41a73abede8132 cobalt-patches-26xx-1.4.tar.bz2 7596
 MD5 99ae243d80acc8692115f58ab2210c25 ip32-iluxa-minpatchset-20040402.diff.bz2 2260
+MD5 cb5d8a8ea7c792ce16f9f5548e4c8942 mips-sources-security_patches-1.0.tar.bz2 11948
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r3 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r4
index bc73ffb0e7fa..1ec29c199101 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r3
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r4
@@ -2,3 +2,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 99ae243d80acc8692115f58ab2210c25 ip32-iluxa-minpatchset-20040402.diff.bz2 2260
+MD5 cb5d8a8ea7c792ce16f9f5548e4c8942 mips-sources-security_patches-1.0.tar.bz2 11948
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r2 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r3
index 0b0e6e5494a9..dedc987c8619 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r2
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r3
@@ -2,3 +2,4 @@ MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
 MD5 4d59f1ecb42edff3d704bb7c22c42305 mipscvs-2.6.7-20040621.diff.bz2 385542
 MD5 c66fffb69cbe68549df23066e95684d6 cobalt-patches-26xx-1.5.tar.bz2 7842
 MD5 99ae243d80acc8692115f58ab2210c25 ip32-iluxa-minpatchset-20040402.diff.bz2 2260
+MD5 cb5d8a8ea7c792ce16f9f5548e4c8942 mips-sources-security_patches-1.0.tar.bz2 11948
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch b/sys-kernel/mips-sources/files/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch
new file mode 100644
index 000000000000..30d3246023e8
--- /dev/null
+++ b/sys-kernel/mips-sources/files/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch
@@ -0,0 +1,19 @@
+--- arch/mips/Makefile.orig	2004-08-02 01:14:02.612198384 -0400
++++ arch/mips/Makefile	2004-08-02 01:14:46.300556744 -0400
+@@ -688,10 +688,16 @@ vmlinux.64: vmlinux
+ 	$(OBJCOPY) -O $(64bit-bfd) --remove-section=.reginfo \
+ 		--change-addresses=0xc000000080000000 $< $@
+ else
++ifdef CONFIG_SGI_IP32
++vmlinux.64: vmlinux
++	$(OBJCOPY) -O $(64bit-bfd) --remove-section=.reginfo \
++		--change-addresses=0x9800000080000000 $< $@
++else
+ vmlinux.64: vmlinux
+ 	$(OBJCOPY) -O $(64bit-bfd) --remove-section=.reginfo \
+ 		--change-addresses=0xa800000080000000 $< $@
+ endif
++endif
+ 
+ makeboot =$(Q)$(MAKE) -f scripts/Makefile.build obj=arch/mips/boot $(1)
+ 
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.25-r5.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.25-r6.ebuild
index 911fa91093bb..993dce3bc583 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.25-r5.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.25-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.25-r5.ebuild,v 1.1 2004/08/01 08:11:29 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.25-r6.ebuild,v 1.1 2004/08/02 06:57:17 kumba Exp $
 
 
 # Version Data
@@ -9,6 +9,7 @@ CVSDATE="20040222"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 COBALTPATCHVER="1.4"
+SECPATCHVER="1.0"
 
 # Miscellaneous stuff
 S=${WORKDIR}/linux-${OKV}-${CVSDATE}
@@ -31,7 +32,8 @@ inherit kernel eutils
 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"
+		mirror://gentoo/cobalt-patches-24xx-${COBALTPATCHVER}.tar.bz2
+		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2"
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
@@ -47,6 +49,8 @@ src_unpack() {
 	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
 
 	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
+	echo -e ""
+	einfo ">>> Generic Patches"
 	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
 
 	# Patch to fix mips64 Makefile so that -finline-limit=10000 gets added to CFLAGS
@@ -58,17 +62,17 @@ src_unpack() {
 
 	# Security Fixes
 	echo -e ""
-	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
-		epatch ${FILESDIR}/CAN-2004-0495-2.4-sparse.patch.bz2
-		epatch ${FILESDIR}/CAN-2004-0497-attr_gid.patch
-		epatch ${FILESDIR}/CAN-2004-0535-2.4-e1000.patch
+	ebegin ">>> Applying Security Fixes"
+		epatch ${WORKDIR}/security/CAN-2004-0109-2.4-iso9660.patch
+		epatch ${WORKDIR}/security/CAN-2004-0133-xfs_ext3.patch
+		epatch ${WORKDIR}/security/CAN-2004-0177-ext3_jbd.patch
+		epatch ${WORKDIR}/security/CAN-2004-0178-sbblaster.patch
+		epatch ${WORKDIR}/security/CAN-2004-0181-2.4-jfs_ext3.patch
+		epatch ${WORKDIR}/security/CAN-2004-0394-panic.patch
+		epatch ${WORKDIR}/security/CAN-2004-0427-2.4-do_fork.patch
+		epatch ${WORKDIR}/security/CAN-2004-0495-2.4-sparse.patch
+		epatch ${WORKDIR}/security/CAN-2004-0497-attr_gid.patch
+		epatch ${WORKDIR}/security/CAN-2004-0535-2.4-e1000.patch
 	eend
 
 	# Cobalt Patches
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.26-r5.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.26-r6.ebuild
index a1c306e62655..032d1eacf766 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.26-r5.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.26-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.26-r5.ebuild,v 1.1 2004/08/01 08:11:29 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.26-r6.ebuild,v 1.1 2004/08/02 06:57:17 kumba Exp $
 
 
 # Version Data
@@ -9,6 +9,7 @@ CVSDATE="20040712"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 COBALTPATCHVER="1.4"
+SECPATCHVER="1.0"
 
 # Miscellaneous stuff
 S=${WORKDIR}/linux-${OKV}-${CVSDATE}
@@ -31,7 +32,9 @@ inherit kernel eutils
 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"
+		mirror://gentoo/cobalt-patches-24xx-${COBALTPATCHVER}.tar.bz2
+		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2"
+
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
@@ -47,15 +50,17 @@ src_unpack() {
 	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
 
 	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
+	echo -e ""
+	einfo ">>> Generic Patches"
 	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
 
 	# Security Fixes
 	echo -e ""
-	ebegin "Applying Security Fixes"
-		epatch ${FILESDIR}/CAN-2004-0394-panic.patch
-		epatch ${FILESDIR}/CAN-2004-0495-2.4-sparse.patch.bz2
-		epatch ${FILESDIR}/CAN-2004-0497-attr_gid.patch
-		epatch ${FILESDIR}/CAN-2004-0535-2.4-e1000.patch
+	ebegin ">>> Applying Security Fixes"
+		epatch ${WORKDIR}/security/CAN-2004-0394-panic.patch
+		epatch ${WORKDIR}/security/CAN-2004-0495-2.4-sparse.patch
+		epatch ${WORKDIR}/security/CAN-2004-0497-attr_gid.patch
+		epatch ${WORKDIR}/security/CAN-2004-0535-2.4-e1000.patch
 	eend
 
 	# Cobalt Patches
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.4-r5.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.4-r6.ebuild
index 368c290756d8..6d04429314af 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.4-r5.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.4-r6.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.4-r5.ebuild,v 1.2 2004/08/01 08:11:29 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.4-r6.ebuild,v 1.1 2004/08/02 06:57:17 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20040311"
 COBALTPATCHVER="1.4"
+SECPATCHVER="1.0"
 IP32DIFFDATE="20040229"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -32,7 +33,8 @@ 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/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff.bz2"
+		mirror://gentoo/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff.bz2
+		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2"
 
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
@@ -64,28 +66,35 @@ src_unpack() {
 	# Update the vanilla sources with linux-mips CVS changes
 	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
 
+	# Binutils-2.14.90.0.8 and up does some magic with page alignment
+	# that prevents the kernel from booting.  This patch fixes it.
+	echo -e ""
+	einfo ">>> Generic Patches"
+	epatch ${FILESDIR}/mipscvs-2.6.x-no-page-align.patch
+
+	# In order to use arcboot on IP32, the kernel entry address needs to be
+	# set to 0x98000000, not 0xa8000000.
+	epatch ${FILESDIR}/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch
+
 	# iluxa's minpatchset for SGI O2
 	echo -e ""
 	einfo ">>> Patching kernel with iluxa's minimal IP32 patchset ..."
 	epatch ${WORKDIR}/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff
 
-	# Binutils-2.14.90.0.8 and up 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
 	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
-		epatch ${FILESDIR}/CAN-2004-0495_0496-2.6-sparse.patch.bz2
-		epatch ${FILESDIR}/CAN-2004-0497-attr_gid.patch
-		epatch ${FILESDIR}/CAN-2004-0596-2.6-eql.patch
-		epatch ${FILESDIR}/CAN-2004-0626-death_packet.patch
+	ebegin ">>> Applying Security Fixes"
+		epatch ${WORKDIR}/security/CAN-2004-0075-2.6-vicam_usb.patch
+		epatch ${WORKDIR}/security/CAN-2004-0109-2.6-iso9660.patch
+		epatch ${WORKDIR}/security/CAN-2004-0181-2.6-jfs_ext3.patch
+		epatch ${WORKDIR}/security/CAN-2004-0228-cpufreq.patch
+		epatch ${WORKDIR}/security/CAN-2004-0229-fb_copy_cmap.patch
+		epatch ${WORKDIR}/security/CAN-2004-0427-2.6-do_fork.patch
+		epatch ${WORKDIR}/security/CAN-2004-0495_0496-2.6-sparse.patch
+		epatch ${WORKDIR}/security/CAN-2004-0497-attr_gid.patch
+		epatch ${WORKDIR}/security/CAN-2004-0596-2.6-eql.patch
+		epatch ${WORKDIR}/security/CAN-2004-0626-death_packet.patch
+		epatch ${WORKDIR}/security/security-2.6-attr_check.patch
 	eend
 
 	# Cobalt Patches
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.5-r4.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.5-r5.ebuild
index 60eaa19fedf5..e371f45e16b0 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.5-r4.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.5-r5.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.5-r4.ebuild,v 1.2 2004/08/01 08:11:29 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.5-r5.ebuild,v 1.1 2004/08/02 06:57:17 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20040412"
 COBALTPATCHVER="1.4"
+SECPATCHVER="1.0"
 IP32DIFFDATE="20040402"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -33,7 +34,8 @@ 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/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff.bz2"
+		mirror://gentoo/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff.bz2
+		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2"
 
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
@@ -65,29 +67,36 @@ src_unpack() {
 	# Update the vanilla sources with linux-mips CVS changes
 	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
 
-	# iluxa's minpatchset for SGI O2
-	echo -e ""
-	einfo ">>> Patching kernel with iluxa's minimal IP32 patchset ..."
-	epatch ${WORKDIR}/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff
-
 	# Bug in 2.6.5 that triggers a kernel oops when swap is activated
+	echo -e ""
+	einfo ">>> Generic Patches"
 	epatch ${FILESDIR}/mipscvs-${OKV}-swapbug-fix.patch
 
 	# Bug in 2.6.5 in which an include was left out of unistd.h (breaks initrd)
 	epatch ${FILESDIR}/mipscvs-${OKV}-unistd-linkage.patch
 
+	# In order to use arcboot on IP32, the kernel entry address needs to be
+	# set to 0x98000000, not 0xa8000000.
+	epatch ${FILESDIR}/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch
+
+	# iluxa's minpatchset for SGI O2
+	echo -e ""
+	einfo ">>> Patching kernel with iluxa's minimal IP32 patchset ..."
+	epatch ${WORKDIR}/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff
+
 	# Security Fixes
 	echo -e ""
-	ebegin "Applying Security Fixes"
-		epatch ${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
-		epatch ${FILESDIR}/CAN-2004-0495_0496-2.6-sparse.patch.bz2
-		epatch ${FILESDIR}/CAN-2004-0497-attr_gid.patch
-		epatch ${FILESDIR}/CAN-2004-0596-2.6-eql.patch
-		epatch ${FILESDIR}/CAN-2004-0626-death_packet.patch
+	ebegin ">>> Applying Security Fixes"
+		epatch ${WORKDIR}/security/CAN-2004-0075-2.6-vicam_usb.patch
+		epatch ${WORKDIR}/security/CAN-2004-0109-2.6-iso9660.patch
+		epatch ${WORKDIR}/security/CAN-2004-0228-cpufreq.patch
+		epatch ${WORKDIR}/security/CAN-2004-0229-fb_copy_cmap.patch
+		epatch ${WORKDIR}/security/CAN-2004-0427-2.6-do_fork.patch
+		epatch ${WORKDIR}/security/CAN-2004-0495_0496-2.6-sparse.patch
+		epatch ${WORKDIR}/security/CAN-2004-0497-attr_gid.patch
+		epatch ${WORKDIR}/security/CAN-2004-0596-2.6-eql.patch
+		epatch ${WORKDIR}/security/CAN-2004-0626-death_packet.patch
+		epatch ${WORKDIR}/security/security-2.6-attr_check.patch
 	eend
 
 
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.6-r3.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.6-r4.ebuild
index edaaf9c29961..8da66dd17de8 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.6-r3.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.6-r4.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.6-r3.ebuild,v 1.2 2004/08/01 08:11:29 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.6-r4.ebuild,v 1.1 2004/08/02 06:57:17 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20040604"
 COBALTPATCHVER="1.4"
+SECPATCHVER="1.0"
 IP32DIFFDATE="20040402"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -32,7 +33,8 @@ 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/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff.bz2"
+		mirror://gentoo/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff.bz2
+		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2"
 
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
@@ -65,8 +67,14 @@ src_unpack() {
 	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
 
 	# Bug in 2.6.6 that triggers a kernel oops when swap is activated
+	echo -e ""
+	einfo ">>> Generic Patches"
 	epatch ${FILESDIR}/mipscvs-2.6.5-swapbug-fix.patch
 
+	# In order to use arcboot on IP32, the kernel entry address needs to be
+	# set to 0x98000000, not 0xa8000000.
+	epatch ${FILESDIR}/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch
+
 	# iluxa's minpatchset for SGI O2
 	echo -e ""
 	einfo ">>> Patching kernel with iluxa's minimal IP32 patchset ..."
@@ -74,11 +82,12 @@ src_unpack() {
 
 	# Security Fixes
 	echo -e ""
-	ebegin "Applying Security Fixes"
-		epatch ${FILESDIR}/CAN-2004-0495_0496-2.6-sparse.patch.bz2
-		epatch ${FILESDIR}/CAN-2004-0497-attr_gid.patch
-		epatch ${FILESDIR}/CAN-2004-0596-2.6-eql.patch
-		epatch ${FILESDIR}/CAN-2004-0626-death_packet.patch
+	ebegin ">>> Applying Security Fixes"
+		epatch ${WORKDIR}/security/CAN-2004-0495_0496-2.6-sparse.patch
+		epatch ${WORKDIR}/security/CAN-2004-0497-attr_gid.patch
+		epatch ${WORKDIR}/security/CAN-2004-0596-2.6-eql.patch
+		epatch ${WORKDIR}/security/CAN-2004-0626-death_packet.patch
+		epatch ${WORKDIR}/security/security-2.6-attr_check.patch
 	eend
 
 	# Cobalt Patches
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.7-r2.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.7-r3.ebuild
index d6f8f82b6e39..6e3515f37bbc 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.7-r2.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.7-r3.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.7-r2.ebuild,v 1.2 2004/08/01 08:11:29 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.7-r3.ebuild,v 1.1 2004/08/02 06:57:17 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20040621"
 COBALTPATCHVER="1.5"
+SECPATCHVER="1.0"
 IP32DIFFDATE="20040402"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -33,7 +34,8 @@ 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/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff.bz2"
+		mirror://gentoo/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff.bz2
+		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2"
 
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
@@ -65,24 +67,33 @@ src_unpack() {
 	# Update the vanilla sources with linux-mips CVS changes
 	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
 
+	# Fix a compile glitch for SGI O2/IP32
+	echo -e ""
+	einfo ">>> Generic Patches"
+	epatch ${FILESDIR}/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch
+
+	# In order to use arcboot on IP32, the kernel entry address needs to be
+	# set to 0x98000000, not 0xa8000000.
+	epatch ${FILESDIR}/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch
+
+	# Misc Fixes
+	epatch ${FILESDIR}/misc-2.6-iptables_headers.patch
+
 	# iluxa's minpatchset for SGI O2
 	echo -e ""
 	einfo ">>> Patching kernel with iluxa's minimal IP32 patchset ..."
 	epatch ${WORKDIR}/ip32-iluxa-minpatchset-${IP32DIFFDATE}.diff
 
-	# Fix a compile glitch for SGI O2/IP32
-	epatch ${FILESDIR}/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch
 
 	# Security Fixes
 	echo -e ""
-	ebegin "Applying Security Fixes"
-		epatch ${FILESDIR}/CAN-2004-0497-attr_gid.patch
-		epatch ${FILESDIR}/CAN-2004-0596-2.6-eql.patch
-		epatch ${FILESDIR}/CAN-2004-0626-death_packet.patch
+	ebegin ">>> Applying Security Fixes"
+		epatch ${WORKDIR}/security/CAN-2004-0497-attr_gid.patch
+		epatch ${WORKDIR}/security/CAN-2004-0596-2.6-eql.patch
+		epatch ${WORKDIR}/security/CAN-2004-0626-death_packet.patch
+		epatch ${WORKDIR}/security/security-2.6-attr_check.patch
 	eend
 
-	# Misc Fixes
-	epatch ${FILESDIR}/misc-2.6-iptables_headers.patch
 
 	# Cobalt Patches
 	if [ "${PROFILE_ARCH}" = "cobalt" ]; then