Update 2.6.20.7 to 2.6.20.10 to fix several new security issues. IP28 support has been enabled for this revission too, however it may be flakey. Problems should be filed at Bugzilla.

(Portage version: 2.1.2.5)

4 files changed, 26 insertions, 20 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 06b55fcc3ab9..84bbe5f0c253 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.106 2007/04/16 06:36:45 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.107 2007/04/30 02:47:17 kumba Exp $
+
+*mips-sources-2.6.20.10 (30 Apr 2007)
+
+  30 Apr 2007; Joshua Kinard <kumba@gentoo.org>
+  -mips-sources-2.6.20.7-r1.ebuild, +mips-sources-2.6.20.10.ebuild:
+  Update 2.6.20.7 to 2.6.20.10 to fix several new security issues. IP28
+  support has been enabled for this revission too, however it may be flakey.
+  Problems should be filed at Bugzilla.
 
 *mips-sources-2.6.20.7-r1 (16 Apr 2007)
 *mips-sources-2.6.17.14 (16 Apr 2007)
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.20.10 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.20.10
new file mode 100644
index 000000000000..6784448b712e
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.20.10
@@ -0,0 +1,12 @@
+MD5 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 43375937
+RMD160 14657ade7be4363143dbd5593f5710d21eda7a03 linux-2.6.20.tar.bz2 43375937
+SHA256 2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558 linux-2.6.20.tar.bz2 43375937
+MD5 b1d6a03db8666632baa8442867638f4d mips-sources-generic_patches-1.28.tar.bz2 735258
+RMD160 c1728be6a7926a0b354c1e58f28644a9c846fbbc mips-sources-generic_patches-1.28.tar.bz2 735258
+SHA256 cc74bdff161f1bbe697537b82c9e83f52118b47d74ee2fb8077983b654e7b42f mips-sources-generic_patches-1.28.tar.bz2 735258
+MD5 7ee74b19254021e32f5608580285413d mipsgit-2.6.20-20070415.diff.bz2 86454
+RMD160 cb754953afef92fe1e9bf2e30cbc213b952cb323 mipsgit-2.6.20-20070415.diff.bz2 86454
+SHA256 a634ffe60f7eb0217d5823339e4b2ba63e416eee3f6a812c782d8c5cdad065b4 mipsgit-2.6.20-20070415.diff.bz2 86454
+MD5 94effb474881455aa8947e45220a6d24 patch-2.6.20.10.bz2 80225
+RMD160 7eec7393dad204bc41b533315fda4dc9005e9461 patch-2.6.20.10.bz2 80225
+SHA256 eeeff38ed522911f7e2c05d2f8961177564ab44b80f1aec0f0c3282f467783bb patch-2.6.20.10.bz2 80225
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.20.7-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.20.7-r1
deleted file mode 100644
index e00cd21ca658..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.20.7-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 43375937
-RMD160 14657ade7be4363143dbd5593f5710d21eda7a03 linux-2.6.20.tar.bz2 43375937
-SHA256 2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558 linux-2.6.20.tar.bz2 43375937
-MD5 193b77de03b9e37cb389633e6e9c9006 mips-sources-generic_patches-1.27.tar.bz2 697624
-RMD160 60f2d340f286938a468dc31374535c1ba4861b44 mips-sources-generic_patches-1.27.tar.bz2 697624
-SHA256 0a7c1b79b8e95ff60e3cd8b58fed10b2425d79a64c3015730ca7ff55a313ae7a mips-sources-generic_patches-1.27.tar.bz2 697624
-MD5 7ee74b19254021e32f5608580285413d mipsgit-2.6.20-20070415.diff.bz2 86454
-RMD160 cb754953afef92fe1e9bf2e30cbc213b952cb323 mipsgit-2.6.20-20070415.diff.bz2 86454
-SHA256 a634ffe60f7eb0217d5823339e4b2ba63e416eee3f6a812c782d8c5cdad065b4 mipsgit-2.6.20-20070415.diff.bz2 86454
-MD5 d56fd9b25c86144f47c0b9df4fc1f534 patch-2.6.20.7.bz2 78480
-RMD160 df1276fe739fc0e5bdfadc8f6e6742d85e65c229 patch-2.6.20.7.bz2 78480
-SHA256 444e0ee1a2b68c3a6fbf3aae8a828118e16e77d878e60107c3514b7dc5c7a815 patch-2.6.20.7.bz2 78480
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.20.7-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.20.10.ebuild
index fea0a2a5108d..8abce39eb2d2 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.20.7-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.20.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.20.7-r1.ebuild,v 1.1 2007/04/16 06:36:45 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.20.10.ebuild,v 1.1 2007/04/30 02:47:17 kumba Exp $
 
 
 # INCLUDED:
@@ -21,7 +21,7 @@
 # Version Data
 OKV=${PV/_/-}
 GITDATE="20070415"			# Date of diff between kernel.org and lmo GIT
-GENPATCHVER="1.27"			# Tarball version for generic patches
+GENPATCHVER="1.28"			# Tarball version for generic patches
 EXTRAVERSION="-mipsgit-${GITDATE}"
 KV="${OKV}${EXTRAVERSION}"
 F_KV="${OKV}"				# Fetch KV, used to know what mipsgit diff to grab.
@@ -52,7 +52,7 @@ USE_PNT="yes"				# If set to "yes", then attempt to use a point-release (2.6.x.y
 # Machine Support Control Variables
 DO_IP22="yes"				# If "yes", enable IP22 support		(SGI Indy, Indigo2 R4x00)
 DO_IP27="yes"				# 		   IP27 support		(SGI Origin)
-DO_IP28="no"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
+DO_IP28="yes"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
 DO_IP30="yes"				# 		   IP30 support		(SGI Octane)
 DO_IP32="yes"				# 		   IP32 support		(SGI O2, R5000/RM5200 Only)
 DO_CBLT="yes"				# 		   Cobalt Support	(Cobalt Microsystems)
@@ -60,7 +60,7 @@ DO_CBLT="yes"				# 		   Cobalt Support	(Cobalt Microsystems)
 # Machine Stable Version Variables 
 SV_IP22=""				# If set && DO_IP22 == "no", indicates last "good" IP22 version
 SV_IP27=""				# 	    DO_IP27 == "no", 			   IP27
-SV_IP28="2.6.17.14"			# 	    DO_IP28 == "no", 			   IP28
+SV_IP28=""				# 	    DO_IP28 == "no", 			   IP28
 SV_IP30=""				# 	    DO_IP30 == "no", 			   IP30
 SV_IP32=""				# 	    DO_IP32 == "no", 			   IP32
 SV_CBLT=""				# 	    DO_CBLT == "no", 			   Cobalt
@@ -425,9 +425,7 @@ do_ip27_support() {
 do_ip28_support() {
 	echo -e ""
 	einfo ">>> Patching kernel for SGI Indigo2 Impact R10000 (IP28) support ..."
-	epatch ${MIPS_PATCHES}/misc-2.6.18-ip28-i2_impact-support.patch
-	epatch ${MIPS_PATCHES}/misc-2.6.17-ip28-impact-mmapfix.patch
-	epatch ${MIPS_PATCHES}/misc-2.6.17-ip28-wd93cac-tweak.patch
+	epatch ${MIPS_PATCHES}/misc-2.6.20-ip28-i2_impact-support.patch
 }