Another kernel vuln, the patch for this one is a doozy, CAN-2004-0415. Also pulled 2.6.5 from the tree, but we're keeping 2.6.4 around because it's the last version that worked on Indigo2 systems. Also included is a patch to force mouse detection for IP22/IP32 (And possibly others) in 2.6.x.

15 files changed, 71 insertions, 151 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 7d6cee18492c..123e285cbda8 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,20 @@
 # 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.51 2004/08/02 06:57:17 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.52 2004/08/06 04:48:59 kumba Exp $
+
+*mips-sources-2.6.7-r4 (06 Aug 2004)
+
+  06 Aug 2004; Joshua Kinard <kumba@gentoo.org>
+  +files/misc-2.6-force_mouse_detection.patch, -mips-sources-2.4.25-r6.ebuild,
+  +mips-sources-2.4.25-r7.ebuild, -mips-sources-2.4.26-r6.ebuild,
+  +mips-sources-2.4.26-r7.ebuild, -mips-sources-2.6.4-r6.ebuild,
+  +mips-sources-2.6.4-r7.ebuild, -mips-sources-2.6.5-r5.ebuild,
+  -mips-sources-2.6.6-r4.ebuild, +mips-sources-2.6.6-r5.ebuild,
+  -mips-sources-2.6.7-r3.ebuild, +mips-sources-2.6.7-r4.ebuild:
+  Another kernel vuln, the patch for this one is a doozy, CAN-2004-0415. Also
+  pulled 2.6.5 from the tree, but we're keeping 2.6.4 around because it's the
+  last version that worked on Indigo2 systems. Also included is a patch to force
+  mouse detection for IP22/IP32 (And possibly others) in 2.6.x.
 
 *mips-sources-2.4.25-r6 (02 Aug 2004)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 61a823da2f53..ebae82aad452 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,18 +1,17 @@
-MD5 535bc721e274432a30beb6baa78f3e27 ChangeLog 19960
+MD5 a70a604818246f23c8f76cf776e12996 ChangeLog 20750
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 51528361d3212e22d025388ace4a8604 mips-sources-2.4.25-r6.ebuild 3059
-MD5 f4db0538e1d55f604c7d281b421557f3 mips-sources-2.4.26-r6.ebuild 2369
-MD5 08d6e0b650e0bc37696fd46a4cf66623 mips-sources-2.6.4-r6.ebuild 3901
-MD5 101150a2d418b7bc2dfba88446f77d30 mips-sources-2.6.5-r5.ebuild 3961
-MD5 7be361a547c5177f582350671937f7a9 mips-sources-2.6.6-r4.ebuild 3476
-MD5 efc986218cef24af3621286577e05b46 mips-sources-2.6.7-r3.ebuild 3454
+MD5 deade9854dc93938f18c78e4a6206ae0 mips-sources-2.4.25-r7.ebuild 3133
+MD5 8a077cd497d27845ef51993035e19143 mips-sources-2.4.26-r7.ebuild 2443
+MD5 2e5c7e6c9c78b8464bbda85463e3de13 mips-sources-2.6.4-r7.ebuild 4082
+MD5 fb53fad3c7b70bed554d7648a3f2d52f mips-sources-2.6.6-r5.ebuild 3657
+MD5 714a28e7182590a14ba6b97d7f9696d6 mips-sources-2.6.7-r4.ebuild 3635
 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 1a9b6f9118a7f6bf33b80a3b0341c160 files/misc-2.6-force_mouse_detection.patch 490
+MD5 9a749ca8763bb8d485d2d449a4461890 files/digest-mips-sources-2.4.25-r7 302
+MD5 a78bd7f114504641f77386038e9430ea files/digest-mips-sources-2.4.26-r7 303
+MD5 c429dfd9dd3f71cb26fe77f5bc2d1be0 files/digest-mips-sources-2.6.4-r7 384
+MD5 ca6a0ebaed0b8f2c30b99d2a925b5322 files/digest-mips-sources-2.6.6-r5 384
+MD5 10df4b56f81cfb2400716a404dc8b302 files/digest-mips-sources-2.6.7-r4 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
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r6 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r7
index 50f7c40f0173..8c1d6145fa4d 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r6
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r7
@@ -1,4 +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
+MD5 dda2baf8721478bfeef0641cacedcad5 mips-sources-security_patches-1.1.tar.bz2 58811
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r6 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r7
index 9da00d1e6eed..129cd1003c2c 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r6
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r7
@@ -1,4 +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
+MD5 dda2baf8721478bfeef0641cacedcad5 mips-sources-security_patches-1.1.tar.bz2 58811
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r6 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r7
index 0a6a252cf6e0..0ec078857cf4 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r6
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r7
@@ -2,4 +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
+MD5 dda2baf8721478bfeef0641cacedcad5 mips-sources-security_patches-1.1.tar.bz2 58811
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.5-r5 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.5-r5
deleted file mode 100644
index 2b0f4d0bfee5..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.5-r5
+++ /dev/null
@@ -1,5 +0,0 @@
-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-r4 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r5
index 1ec29c199101..50bf850486aa 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r4
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r5
@@ -2,4 +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
+MD5 dda2baf8721478bfeef0641cacedcad5 mips-sources-security_patches-1.1.tar.bz2 58811
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r3 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r4
index dedc987c8619..8bdf1a6b443b 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r3
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r4
@@ -2,4 +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
+MD5 dda2baf8721478bfeef0641cacedcad5 mips-sources-security_patches-1.1.tar.bz2 58811
diff --git a/sys-kernel/mips-sources/files/misc-2.6-force_mouse_detection.patch b/sys-kernel/mips-sources/files/misc-2.6-force_mouse_detection.patch
new file mode 100644
index 000000000000..28a832b38f3c
--- /dev/null
+++ b/sys-kernel/mips-sources/files/misc-2.6-force_mouse_detection.patch
@@ -0,0 +1,15 @@
+--- drivers/input/mouse/psmouse-base.c.ori	2004-01-10 05:59:52.000000000 +0100
++++ drivers/input/mouse/psmouse-base.c	2004-04-09 17:36:01.000000000 +0200
+@@ -416,8 +416,10 @@
+ 
+ 	param[0] = param[1] = 0xa5;
+ 
+-	if (psmouse_command(psmouse, param, PSMOUSE_CMD_GETID))
+-		return -1;
++	if (psmouse_command(psmouse, param, PSMOUSE_CMD_GETID)) {
++		printk(KERN_ERR "recognition forced !\n"); 
++		/*return -1;*/
++	}
+ 
+ 	if (param[0] != 0x00 && param[0] != 0x03 && param[0] != 0x04)
+ 		return -1;
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.25-r6.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.25-r7.ebuild
index 993dce3bc583..b3be9547d7a0 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.25-r6.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.25-r7.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-r6.ebuild,v 1.1 2004/08/02 06:57:17 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.25-r7.ebuild,v 1.1 2004/08/06 04:48:59 kumba Exp $
 
 
 # Version Data
@@ -9,7 +9,7 @@ CVSDATE="20040222"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 COBALTPATCHVER="1.4"
-SECPATCHVER="1.0"
+SECPATCHVER="1.1"
 
 # Miscellaneous stuff
 S=${WORKDIR}/linux-${OKV}-${CVSDATE}
@@ -69,6 +69,7 @@ src_unpack() {
 		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-0415-2.4-file_offset_pointers.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
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.26-r6.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.26-r7.ebuild
index 032d1eacf766..79d137c8f2da 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.26-r6.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.26-r7.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-r6.ebuild,v 1.1 2004/08/02 06:57:17 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.26-r7.ebuild,v 1.1 2004/08/06 04:48:59 kumba Exp $
 
 
 # Version Data
@@ -9,7 +9,7 @@ CVSDATE="20040712"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 COBALTPATCHVER="1.4"
-SECPATCHVER="1.0"
+SECPATCHVER="1.1"
 
 # Miscellaneous stuff
 S=${WORKDIR}/linux-${OKV}-${CVSDATE}
@@ -58,6 +58,7 @@ src_unpack() {
 	echo -e ""
 	ebegin ">>> Applying Security Fixes"
 		epatch ${WORKDIR}/security/CAN-2004-0394-panic.patch
+		epatch ${WORKDIR}/security/CAN-2004-0415-2.4-file_offset_pointers.patch
 		epatch ${WORKDIR}/security/CAN-2004-0495-2.4-sparse.patch
 		epatch ${WORKDIR}/security/CAN-2004-0497-attr_gid.patch
 		epatch ${WORKDIR}/security/CAN-2004-0535-2.4-e1000.patch
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.4-r6.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.4-r7.ebuild
index 6d04429314af..2d9dbabf698f 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.4-r6.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.4-r7.ebuild
@@ -1,13 +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-r6.ebuild,v 1.1 2004/08/02 06:57:17 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.4-r7.ebuild,v 1.1 2004/08/06 04:48:59 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20040311"
 COBALTPATCHVER="1.4"
-SECPATCHVER="1.0"
+SECPATCHVER="1.1"
 IP32DIFFDATE="20040229"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -76,6 +76,9 @@ src_unpack() {
 	# set to 0x98000000, not 0xa8000000.
 	epatch ${FILESDIR}/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch
 
+	# Force detection of PS/2 mice on SGI Systems
+	epatch ${FILESDIR}/misc-2.6-force_mouse_detection.patch
+
 	# iluxa's minpatchset for SGI O2
 	echo -e ""
 	einfo ">>> Patching kernel with iluxa's minimal IP32 patchset ..."
@@ -89,6 +92,7 @@ src_unpack() {
 		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-0415-2.6.4-file_offset_pointers.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
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.5-r5.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.5-r5.ebuild
deleted file mode 100644
index e371f45e16b0..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.6.5-r5.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.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}"
-
-# 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 12 Apr 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) Patch to fix linking issue for initrd's
-# 6) Security Fixes
-# 7) Patches for Cobalt support
-
-
-DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
-		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
-		mirror://gentoo/cobalt-patches-26xx-${COBALTPATCHVER}.tar.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}"
-PROVIDE="virtual/linux-sources"
-KEYWORDS="-*"
-IUSE=""
-
-
-pkg_setup() {
-	# See if we're on a cobalt system (must use the cobalt-mips profile)
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
-		echo -e ""
-		einfo "Please keep in mind that the 2.6 kernel will NOT boot on Cobalt"
-		einfo "systems that are still using the old Cobalt bootloader.  In"
-		einfo "order to boot a 2.6 kernel on Cobalt systems, you must be using"
-		einfo "Peter Horton's new bootloader, which does not have the kernel"
-		einfo "size limitation that the older bootloader has.  If you want"
-		einfo "to use the newer bootloader, make sure you have sys-boot/colo"
-		einfo "installed and setup."
-		echo -e ""
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${OKV}-${CVSDATE}
-	cd ${S}
-
-	# Update the vanilla sources with linux-mips CVS changes
-	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
-
-	# 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 ${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
-
-
-	# Cobalt Patches
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
-		echo -e ""
-		einfo ">>> Patching kernel for Cobalt support ..."
-		for x in ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/*.patch; do
-			epatch ${x}
-		done
-		cp ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/cobalt-patches.txt ${S}
-		cd ${WORKDIR}
-		mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt
-		S="${S}.cobalt"
-	fi
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.6-r4.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.6-r5.ebuild
index 8da66dd17de8..98400a649568 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.6-r4.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.6-r5.ebuild
@@ -1,13 +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-r4.ebuild,v 1.1 2004/08/02 06:57:17 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.6-r5.ebuild,v 1.1 2004/08/06 04:48:59 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20040604"
 COBALTPATCHVER="1.4"
-SECPATCHVER="1.0"
+SECPATCHVER="1.1"
 IP32DIFFDATE="20040402"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -75,6 +75,9 @@ src_unpack() {
 	# set to 0x98000000, not 0xa8000000.
 	epatch ${FILESDIR}/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch
 
+	# Force detection of PS/2 mice on SGI Systems
+	epatch ${FILESDIR}/misc-2.6-force_mouse_detection.patch
+
 	# iluxa's minpatchset for SGI O2
 	echo -e ""
 	einfo ">>> Patching kernel with iluxa's minimal IP32 patchset ..."
@@ -83,6 +86,7 @@ src_unpack() {
 	# Security Fixes
 	echo -e ""
 	ebegin ">>> Applying Security Fixes"
+		epatch ${WORKDIR}/security/CAN-2004-0415-2.6.6-file_offset_pointers.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
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.7-r3.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.7-r4.ebuild
index 6e3515f37bbc..8f02bb4e61d7 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.7-r3.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.7-r4.ebuild
@@ -1,13 +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-r3.ebuild,v 1.1 2004/08/02 06:57:17 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.7-r4.ebuild,v 1.1 2004/08/06 04:48:59 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20040621"
 COBALTPATCHVER="1.5"
-SECPATCHVER="1.0"
+SECPATCHVER="1.1"
 IP32DIFFDATE="20040402"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -79,6 +79,9 @@ src_unpack() {
 	# Misc Fixes
 	epatch ${FILESDIR}/misc-2.6-iptables_headers.patch
 
+	# Force detection of PS/2 mice on SGI Systems
+	epatch ${FILESDIR}/misc-2.6-force_mouse_detection.patch
+
 	# iluxa's minpatchset for SGI O2
 	echo -e ""
 	einfo ">>> Patching kernel with iluxa's minimal IP32 patchset ..."
@@ -88,6 +91,7 @@ src_unpack() {
 	# Security Fixes
 	echo -e ""
 	ebegin ">>> Applying Security Fixes"
+		epatch ${WORKDIR}/security/CAN-2004-0415-2.6.7-file_offset_pointers.patch
 		epatch ${WORKDIR}/security/CAN-2004-0497-attr_gid.patch
 		epatch ${WORKDIR}/security/CAN-2004-0596-2.6-eql.patch
 		epatch ${WORKDIR}/security/CAN-2004-0626-death_packet.patch