12 files changed, 45 insertions, 28 deletions
diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 123e285cbda8..24c03d7458f7 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,17 @@
 # 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.52 2004/08/06 04:48:59 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.53 2004/08/11 09:48:22 kumba Exp $
+
+*mips-sources-2.6.6-r8 (11 Aug 2004)
+
+  11 Aug 2004; Joshua Kinard <kumba@gentoo.org>
+  -mips-sources-2.4.25-r7.ebuild, +mips-sources-2.4.25-r8.ebuild,
+  -mips-sources-2.4.26-r7.ebuild, +mips-sources-2.4.26-r8.ebuild,
+  -mips-sources-2.6.4-r7.ebuild, +mips-sources-2.6.4-r8.ebuild,
+  -mips-sources-2.6.6-r5.ebuild, +mips-sources-2.6.6-r8.ebuild,
+  -mips-sources-2.6.7-r4.ebuild, +mips-sources-2.6.7-r5.ebuild:
+  Security updates (again) - CAN-2004-0685 for 2.4 only, and patches for the
+  security flaw described in Bug #59905.
 
 *mips-sources-2.6.7-r4 (06 Aug 2004)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index ebae82aad452..834f92f736bc 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,17 +1,17 @@
-MD5 a70a604818246f23c8f76cf776e12996 ChangeLog 20750
+MD5 1848d3fb6de1903e59f3f33b9e7fb2f6 ChangeLog 21279
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-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 a969d3b208605c4fcc0bfebc5f1cfab1 mips-sources-2.4.25-r8.ebuild 3258
+MD5 20cbc9c5e23616e2897221431a95953f mips-sources-2.4.26-r8.ebuild 2568
+MD5 28b2aceb7c41210cd53415d69eee873f mips-sources-2.6.4-r8.ebuild 4081
+MD5 5b4862c25987554fedc2d94b8fdce162 mips-sources-2.6.6-r8.ebuild 3715
+MD5 a96291ecd7be32eae94ee1ce2ce7e3ed mips-sources-2.6.7-r5.ebuild 3693
 MD5 005c705111f504798dfba298ad86e544 files/mipscvs-2.6.x-ip32-kern_entry-arcboot.patch 645
 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 784f11bea2f673b5f773f27b6a104aec files/digest-mips-sources-2.4.25-r8 302
+MD5 6c8cf0e72c9be329657b1a344636005d files/digest-mips-sources-2.4.26-r8 303
+MD5 10c17a7e31acda8bc6433570050b74a2 files/digest-mips-sources-2.6.4-r8 384
+MD5 5e58c3a100fcb48b74d9dac476cc818c files/digest-mips-sources-2.6.6-r8 384
+MD5 09a849bbe9c516658420632e9ddcbfc8 files/digest-mips-sources-2.6.7-r5 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-r7 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r8
index 8c1d6145fa4d..41e588b9aad9 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r7
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r8
@@ -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 dda2baf8721478bfeef0641cacedcad5 mips-sources-security_patches-1.1.tar.bz2 58811
+MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r7 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r8
index 129cd1003c2c..4185db52fb1b 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r7
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r8
@@ -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 dda2baf8721478bfeef0641cacedcad5 mips-sources-security_patches-1.1.tar.bz2 58811
+MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r7 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r8
index 0ec078857cf4..8e146ed5ba6a 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r7
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r8
@@ -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 dda2baf8721478bfeef0641cacedcad5 mips-sources-security_patches-1.1.tar.bz2 58811
+MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r5 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r8
index 50bf850486aa..7944aab46fdc 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r5
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.6-r8
@@ -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 dda2baf8721478bfeef0641cacedcad5 mips-sources-security_patches-1.1.tar.bz2 58811
+MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r4 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r5
index 8bdf1a6b443b..aa7c4a78f9da 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r4
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.7-r5
@@ -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 dda2baf8721478bfeef0641cacedcad5 mips-sources-security_patches-1.1.tar.bz2 58811
+MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.25-r7.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.25-r8.ebuild
index b3be9547d7a0..a5fb3c1762af 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.25-r7.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.25-r8.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-r7.ebuild,v 1.1 2004/08/06 04:48:59 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.25-r8.ebuild,v 1.1 2004/08/11 09:48:22 kumba Exp $
 
 
 # Version Data
@@ -9,7 +9,7 @@ CVSDATE="20040222"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 COBALTPATCHVER="1.4"
-SECPATCHVER="1.1"
+SECPATCHVER="1.2"
 
 # Miscellaneous stuff
 S=${WORKDIR}/linux-${OKV}-${CVSDATE}
@@ -74,6 +74,8 @@ src_unpack() {
 		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
+		epatch ${WORKDIR}/security/CAN-2004-0685-2.4-conectiva_usb.patch
+		epatch ${WORKDIR}/security/security-2.4-proc_race.patch
 	eend
 
 	# Cobalt Patches
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.26-r7.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.26-r8.ebuild
index 79d137c8f2da..060c20ffaadb 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.26-r7.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.26-r8.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-r7.ebuild,v 1.1 2004/08/06 04:48:59 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.26-r8.ebuild,v 1.1 2004/08/11 09:48:22 kumba Exp $
 
 
 # Version Data
@@ -9,7 +9,7 @@ CVSDATE="20040712"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 COBALTPATCHVER="1.4"
-SECPATCHVER="1.1"
+SECPATCHVER="1.2"
 
 # Miscellaneous stuff
 S=${WORKDIR}/linux-${OKV}-${CVSDATE}
@@ -62,6 +62,8 @@ src_unpack() {
 		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
+		epatch ${WORKDIR}/security/CAN-2004-0685-2.4-conectiva_usb.patch
+		epatch ${WORKDIR}/security/security-2.4-proc_race.patch
 	eend
 
 	# Cobalt Patches
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.4-r7.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.4-r8.ebuild
index 2d9dbabf698f..6d6089388f5d 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.4-r7.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.4-r8.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-r7.ebuild,v 1.1 2004/08/06 04:48:59 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.4-r8.ebuild,v 1.1 2004/08/11 09:48:22 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20040311"
 COBALTPATCHVER="1.4"
-SECPATCHVER="1.1"
+SECPATCHVER="1.2"
 IP32DIFFDATE="20040229"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -98,7 +98,7 @@ src_unpack() {
 		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
+		epatch ${WORKDIR}/security/security-2.6-proc_race.patch
 	eend
 
 	# Cobalt Patches
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.6-r5.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.6-r8.ebuild
index 98400a649568..24ed3f5808d4 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.6-r5.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.6-r8.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-r5.ebuild,v 1.1 2004/08/06 04:48:59 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.6-r8.ebuild,v 1.1 2004/08/11 09:48:22 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20040604"
 COBALTPATCHVER="1.4"
-SECPATCHVER="1.1"
+SECPATCHVER="1.2"
 IP32DIFFDATE="20040402"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -92,6 +92,7 @@ src_unpack() {
 		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
+		epatch ${WORKDIR}/security/security-2.6-proc_race.patch
 	eend
 
 	# Cobalt Patches
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.7-r4.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.7-r5.ebuild
index 8f02bb4e61d7..b4bf5737809d 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.7-r4.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.7-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.7-r4.ebuild,v 1.1 2004/08/06 04:48:59 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.7-r5.ebuild,v 1.1 2004/08/11 09:48:22 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20040621"
 COBALTPATCHVER="1.5"
-SECPATCHVER="1.1"
+SECPATCHVER="1.2"
 IP32DIFFDATE="20040402"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -96,6 +96,7 @@ src_unpack() {
 		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
+		epatch ${WORKDIR}/security/security-2.6-proc_race.patch
 	eend