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.

7 files changed, 20 insertions, 10 deletions

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;