Patch the 2.6 sources up a little bit. Add in a patch to finally nail that annoying gbefb typo that kills IP32 builds, a couple security patches (CAN-2005-1263/1264/1368), and a new CVS diff for 2.6.12-rc3.

(Portage version: 2.0.51.21)

10 files changed, 49 insertions, 29 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 6e840dcdb54f..53a9c4c9f347 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.74 2005/05/01 19:27:48 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.75 2005/05/18 05:15:09 kumba Exp $
+
+*mips-sources-2.6.12_rc2-r2 (18 May 2005)
+
+  18 May 2005; Joshua Kinard <kumba@gentoo.org>
+  -mips-sources-2.6.10-r2.ebuild, +mips-sources-2.6.10-r3.ebuild,
+  -mips-sources-2.6.12_rc2-r1.ebuild, +mips-sources-2.6.12_rc2-r2.ebuild,
+  +mips-sources-2.6.12_rc3-r1.ebuild, -mips-sources-2.6.12_rc3.ebuild:
+  Patch the 2.6 sources up a little bit. Add in a patch to finally nail that
+  annoying gbefb typo that kills IP32 builds, a couple security patches
+  (CAN-2005-1263/1264/1368), and a new CVS diff for 2.6.12-rc3.
 
 *mips-sources-2.6.12_rc3 (01 May 2005)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index f6c4cde3bd6d..011ab8aa33dc 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,10 +1,10 @@
-MD5 3f26c8f7a202f36a09ef08110a7f0302 ChangeLog 32583
+MD5 2f59a8366d390a4f2b8cdd56fb9bd71f ChangeLog 33099
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 9575d43356e3e9432cacc00e339838f4 mips-sources-2.6.12_rc3.ebuild 11041
+MD5 67db5846f121f55188d68936c925ffc7 mips-sources-2.6.10-r3.ebuild 12567
 MD5 ab0d8fcd1f7ca1c66e62e182717bbb80 mips-sources-2.4.28-r2.ebuild 3243
-MD5 a7e3a069f437b9e065238f1fb15818da mips-sources-2.6.10-r2.ebuild 12293
-MD5 1462ecf60e2a1553ca82dfb715f16bb2 mips-sources-2.6.12_rc2-r1.ebuild 10963
+MD5 6ad3010d997ff6499c8be72c8e96ea4a mips-sources-2.6.12_rc2-r2.ebuild 11167
+MD5 95daafc9796298add0cf122b3f4faa6b mips-sources-2.6.12_rc3-r1.ebuild 11244
 MD5 7139f9eed523313727ab1d5496b3ae55 files/digest-mips-sources-2.4.28-r2 388
-MD5 29d01362fffa6786332aa871bfae02f5 files/digest-mips-sources-2.6.10-r2 315
-MD5 f03bb1605807c2f7f6deb2687c8822f9 files/digest-mips-sources-2.6.12_rc3 386
-MD5 1dfadb3e4f5be1ef7184b96b534ff4db files/digest-mips-sources-2.6.12_rc2-r1 385
+MD5 c50857dbca590bd9a7e55c4decf00e05 files/digest-mips-sources-2.6.12_rc3-r1 386
+MD5 885ec86276cddbcc91efb736381bd764 files/digest-mips-sources-2.6.10-r3 316
+MD5 59f9286868d67749b49068e27547abcc files/digest-mips-sources-2.6.12_rc2-r2 386
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.10-r2 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.10-r2
deleted file mode 100644
index 6917aa4cc4c2..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.10-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 cffcd2919d9c8ef793ce1ac07a440eda linux-2.6.10.tar.bz2 36533484
-MD5 bfa5c9bb9e1b95327baae53a9a6c2d35 mipscvs-2.6.10-20050115.diff.bz2 351205
-MD5 eb0f0be59d9e0ade30abe68eec2d7426 mips-sources-security_patches-1.12.tar.bz2 91315
-MD5 2934d4df4615a6195dfa1dc446d33db2 mips-sources-generic_patches-1.8.tar.bz2 172240
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.10-r3 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.10-r3
new file mode 100644
index 000000000000..727cc424a6f1
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.10-r3
@@ -0,0 +1,4 @@
+MD5 cffcd2919d9c8ef793ce1ac07a440eda linux-2.6.10.tar.bz2 36533484
+MD5 bfa5c9bb9e1b95327baae53a9a6c2d35 mipscvs-2.6.10-20050115.diff.bz2 351205
+MD5 aaf53b8c6dc1b3a3720f0ff74d748da3 mips-sources-security_patches-1.13.tar.bz2 93100
+MD5 d5063a377e2d9c58f358a537c4251d8b mips-sources-generic_patches-1.11.tar.bz2 173016
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc2-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc2-r2
index 85a015fdb86f..b6f09613ac2e 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc2-r1
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc2-r2
@@ -1,5 +1,5 @@
 MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
 MD5 7c30cae6bd4a38305410d4320f237b15 mipscvs-2.6.12-rc2-20050423.diff.bz2 299094
-MD5 d8dfbf26e81799b2c6c7354cda8deaee mips-sources-security_patches-1.12.tar.bz2 91589
-MD5 b632b2cae61421bd87aad3413e74011f mips-sources-generic_patches-1.9.tar.bz2 171798
+MD5 aaf53b8c6dc1b3a3720f0ff74d748da3 mips-sources-security_patches-1.13.tar.bz2 93100
+MD5 d5063a377e2d9c58f358a537c4251d8b mips-sources-generic_patches-1.11.tar.bz2 173016
 MD5 32cbdc71085177bf867bfcbe41bb349b patch-2.6.12-rc2.bz2 3403237
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc3 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc3
deleted file mode 100644
index ba76e5f40083..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc3
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
-MD5 3473197f8e00c73871fb393a00eb5465 mipscvs-2.6.12-rc3-20050430.diff.bz2 301126
-MD5 d8dfbf26e81799b2c6c7354cda8deaee mips-sources-security_patches-1.12.tar.bz2 91589
-MD5 01b907f88dec6526719c511fe8da5baf mips-sources-generic_patches-1.10.tar.bz2 172666
-MD5 b1239da73e865e18a52a6d15be3cdbd2 patch-2.6.12-rc3.bz2 3706330
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc3-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc3-r1
new file mode 100644
index 000000000000..f0b2518ad6b4
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc3-r1
@@ -0,0 +1,5 @@
+MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
+MD5 52d773f9c0baea76acebcd2285e3e976 mipscvs-2.6.12-rc3-20050517.diff.bz2 305135
+MD5 aaf53b8c6dc1b3a3720f0ff74d748da3 mips-sources-security_patches-1.13.tar.bz2 93100
+MD5 d5063a377e2d9c58f358a537c4251d8b mips-sources-generic_patches-1.11.tar.bz2 173016
+MD5 b1239da73e865e18a52a6d15be3cdbd2 patch-2.6.12-rc3.bz2 3706330
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.10-r2.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.10-r3.ebuild
index bb89932979a7..28e5a9af546b 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.10-r2.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.10-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.10-r2.ebuild,v 1.1 2005/04/24 03:00:45 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.10-r3.ebuild,v 1.1 2005/05/18 05:15:09 kumba Exp $
 
 
 # INCLUDED:
@@ -21,8 +21,8 @@
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20050115"			# Date of diff between kernel.org and lmo CVS
-SECPATCHVER="1.12"			# Tarball version for security patches
-GENPATCHVER="1.8"			# Tarball version for generic patches
+SECPATCHVER="1.13"			# Tarball version for security patches
+GENPATCHVER="1.11"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 USERC="no"				# If set to "yes", then it will attempt to use an RC kernel
@@ -178,6 +178,7 @@ do_generic_patches() {
 		epatch ${MIPS_PATCHES}/misc-2.6.10-ip32-tweak-makefile.patch
 		epatch ${MIPS_PATCHES}/misc-2.6.10-ths-mips-tweaks.patch
 		epatch ${MIPS_PATCHES}/misc-2.6.12-pdh-mips-tweaks.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.12-ip32-stupid-gbefb-typo.patch
 
 		# Generic
 		epatch ${MIPS_PATCHES}/misc-2.6-fix-prologue-error.patch
@@ -230,6 +231,9 @@ do_security_patches() {
 		epatch ${MIPS_SECURITY}/CAN-2005-0867-2.6-sysfs_write_file-int-ovrflw.patch
 		epatch ${MIPS_SECURITY}/CAN-2005-0916-2.6-is_hugepage_only_range.patch
 		epatch ${MIPS_SECURITY}/CAN-2005-0937-2.6-futex-deadlock.patch
+		epatch ${MIPS_SECURITY}/CAN-2005-1263-2.6-elf-core-dump.patch
+		epatch ${MIPS_SECURITY}/CAN-2005-1264-2.6-raw-pktcdvd-local-priv.patch
+		epatch ${MIPS_SECURITY}/CAN-2005-1368-2.6-key_user_lookup-dos.patch
 		epatch ${MIPS_SECURITY}/security-2.6.10-lsm-local_priv_elevate_flaw.patch
 		epatch ${MIPS_SECURITY}/security-2.6-local-dos-tmpfs.patch
 		epatch ${MIPS_SECURITY}/security-2.6.10-rose-scsi_tape-vulns.patch
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.12_rc2-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.12_rc2-r2.ebuild
index ccc75a4d436e..f67250a8153c 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.12_rc2-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.12_rc2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.12_rc2-r1.ebuild,v 1.1 2005/04/25 05:07:36 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.12_rc2-r2.ebuild,v 1.1 2005/05/18 05:15:09 kumba Exp $
 
 
 # INCLUDED:
@@ -20,8 +20,8 @@
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20050423"			# Date of diff between kernel.org and lmo CVS
-SECPATCHVER="1.12"			# Tarball version for security patches
-GENPATCHVER="1.9"			# Tarball version for generic patches
+SECPATCHVER="1.13"			# Tarball version for security patches
+GENPATCHVER="1.11"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 USERC="yes"				# If set to "yes", then attempt to use an RC kernel
@@ -193,6 +193,7 @@ do_generic_patches() {
 		epatch ${MIPS_PATCHES}/misc-2.6.12-ip32-onion2-gbefb-fixes.patch
 		epatch ${MIPS_PATCHES}/misc-2.6.10-ip32-tweak-makefile.patch
 		epatch ${MIPS_PATCHES}/misc-2.6.11-ip32-mace-is-always-eth0.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.12-ip32-stupid-gbefb-typo.patch
 
 		# Cobalt Patches (Safe for non-Cobalt use)
 		epatch ${MIPS_PATCHES}/misc-2.6.12-cobalt-bits.patch
@@ -228,6 +229,8 @@ do_sekret_patches() {
 do_security_patches() {
 	echo -e ""
 	ebegin ">>> Applying Security Fixes"
+		epatch ${MIPS_SECURITY}/CAN-2005-1263-2.6-elf-core-dump.patch
+		epatch ${MIPS_SECURITY}/CAN-2005-1264-2.6-raw-pktcdvd-local-priv.patch
 		epatch ${MIPS_SECURITY}/security-2.6-nfsacl-remote-nfs.patch
 	eend
 }
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.12_rc3.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.12_rc3-r1.ebuild
index 330e0ee88f60..1b1116aae447 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.12_rc3.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.12_rc3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.12_rc3.ebuild,v 1.1 2005/05/01 19:27:48 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.12_rc3-r1.ebuild,v 1.1 2005/05/18 05:15:09 kumba Exp $
 
 
 # INCLUDED:
@@ -19,9 +19,9 @@
 
 # Version Data
 OKV=${PV/_/-}
-CVSDATE="20050430"			# Date of diff between kernel.org and lmo CVS
-SECPATCHVER="1.12"			# Tarball version for security patches
-GENPATCHVER="1.10"			# Tarball version for generic patches
+CVSDATE="20050517"			# Date of diff between kernel.org and lmo CVS
+SECPATCHVER="1.13"			# Tarball version for security patches
+GENPATCHVER="1.11"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 USERC="yes"				# If set to "yes", then attempt to use an RC kernel
@@ -193,6 +193,7 @@ do_generic_patches() {
 		epatch ${MIPS_PATCHES}/misc-2.6.12-ip32-onion2-gbefb-fixes.patch
 		epatch ${MIPS_PATCHES}/misc-2.6.10-ip32-tweak-makefile.patch
 		epatch ${MIPS_PATCHES}/misc-2.6.11-ip32-mace-is-always-eth0.patch
+		epatch ${MIPS_PATCHES}/misc-2.6.12-ip32-stupid-gbefb-typo.patch
 
 		# Cobalt Patches (Safe for non-Cobalt use)
 		epatch ${MIPS_PATCHES}/misc-2.6.12-cobalt-bits.patch
@@ -229,6 +230,8 @@ do_sekret_patches() {
 do_security_patches() {
 	echo -e ""
 	ebegin ">>> Applying Security Fixes"
+		epatch ${MIPS_SECURITY}/CAN-2005-1263-2.6-elf-core-dump.patch
+		epatch ${MIPS_SECURITY}/CAN-2005-1264-2.6-raw-pktcdvd-local-priv.patch
 		epatch ${MIPS_SECURITY}/security-2.6-nfsacl-remote-nfs.patch
 	eend
 }