New ebuilds: dropped 2.4.28 due to age and replaced it with 2.4.31 for IP22 systems only. revbumped 2.6.10 to plug some security holes (CAN-2005-1041, CAN-2005-1265, CAN-2005-1589, etc..), and added a new ebuild for 2.6.12-rc6.

(Portage version: 2.0.51.22-r1)

13 files changed, 108 insertions, 468 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 1367ff8856c4..39a3625ad6f0 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.76 2005/05/19 05:23:25 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.77 2005/06/11 20:50:28 kumba Exp $
+
+*mips-sources-2.4.31 (11 Jun 2005)
+
+  11 Jun 2005; Joshua Kinard <kumba@gentoo.org>
+  -mips-sources-2.4.28-r2.ebuild, +mips-sources-2.4.31.ebuild,
+  -mips-sources-2.6.10-r3.ebuild, +mips-sources-2.6.10-r4.ebuild,
+  -mips-sources-2.6.12_rc2-r2.ebuild, -mips-sources-2.6.12_rc3-r1.ebuild,
+  +mips-sources-2.6.12_rc6.ebuild:
+  New ebuilds: dropped 2.4.28 due to age and replaced it with 2.4.31 for IP22
+  systems only. revbumped 2.6.10 to plug some security holes (CAN-2005-1041,
+  CAN-2005-1265, CAN-2005-1589, etc..), and added a new ebuild for 2.6.12-rc6.
 
   19 May 2005; Joshua Kinard <kumba@gentoo.org> mips-sources-2.6.10-r3.ebuild,
   mips-sources-2.6.12_rc2-r2.ebuild, mips-sources-2.6.12_rc3-r1.ebuild:
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 8c29c76c1cd9..9ed632dc1114 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,10 +1,8 @@
-MD5 c42fe2f2df297da1706e5da92b1fe928 ChangeLog 33292
+MD5 6a7e50b2b273c394fcbdc4dba6f70769 ChangeLog 33849
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 db96b17a8b649cd8d5f339e9ca4f3442 mips-sources-2.6.10-r3.ebuild 12580
-MD5 ab0d8fcd1f7ca1c66e62e182717bbb80 mips-sources-2.4.28-r2.ebuild 3243
-MD5 54651ae445dd14603655bc4a7e3e2196 mips-sources-2.6.12_rc2-r2.ebuild 11180
-MD5 5ed46c21a401b08f327dd42c1db4777a mips-sources-2.6.12_rc3-r1.ebuild 11260
-MD5 7139f9eed523313727ab1d5496b3ae55 files/digest-mips-sources-2.4.28-r2 388
-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
+MD5 ef2fa64373b56147e2c1a6cbf494d4a5 mips-sources-2.4.31.ebuild 1915
+MD5 321fa9f93abf462daf00c3f86b21fca6 mips-sources-2.6.10-r4.ebuild 12779
+MD5 24ea37035b3a564d001792627baa5661 mips-sources-2.6.12_rc6.ebuild 11127
+MD5 8aa07663823de29a8abba4e176da6576 files/digest-mips-sources-2.4.31 316
+MD5 3e5274d4d23180cde5daf51b751d2cc5 files/digest-mips-sources-2.6.10-r4 316
+MD5 9eb17483112ba99e3d053bf600ff4498 files/digest-mips-sources-2.6.12_rc6 386
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.28-r2 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.28-r2
deleted file mode 100644
index 069822e60f2c..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.28-r2
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
-MD5 e5c0438a7e9c0677d6b8432e84bbb844 mipscvs-2.4.28-20050105.diff.bz2 246203
-MD5 d8dfbf26e81799b2c6c7354cda8deaee mips-sources-security_patches-1.12.tar.bz2 91589
-MD5 c32db0f5eed3cec32445eaf9d8ddea12 mips-sources-generic_patches-1.5.tar.bz2 84550
-MD5 18ad839cec259e123f743432dca994e3 cobalt-patches-24xx-1.4.tar.bz2 5809
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.31 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.31
new file mode 100644
index 000000000000..0b6ccfced207
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.31
@@ -0,0 +1,4 @@
+MD5 bf6e3843ca122e3ad9ad28b94f4b8ed5 linux-2.4.31.tar.bz2 31129841
+MD5 f168633caef6078fe0afbd7fc7e1d767 mipscvs-2.4.31-20050606.diff.bz2 139016
+MD5 25a82f3b1d2cfc5fbf7933c2e9ab3e55 mips-sources-security_patches-1.14.tar.bz2 94582
+MD5 463d4901c7f44a9922ab69179adc0b47 mips-sources-generic_patches-1.12.tar.bz2 178249
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-r4
index 727cc424a6f1..adcaafc91edb 100644
--- 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-r4
@@ -1,4 +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 25a82f3b1d2cfc5fbf7933c2e9ab3e55 mips-sources-security_patches-1.14.tar.bz2 94582
 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-r2 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc2-r2
deleted file mode 100644
index b6f09613ac2e..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc2-r2
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
-MD5 7c30cae6bd4a38305410d4320f237b15 mipscvs-2.6.12-rc2-20050423.diff.bz2 299094
-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-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc3-r1
deleted file mode 100644
index f0b2518ad6b4..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc3-r1
+++ /dev/null
@@ -1,5 +0,0 @@
-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/files/digest-mips-sources-2.6.12_rc6 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc6
new file mode 100644
index 000000000000..936e2592be88
--- /dev/null
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.12_rc6
@@ -0,0 +1,5 @@
+MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
+MD5 e281c80774e433e19ea1c1d52340f417 mipscvs-2.6.12-rc6-20050610.diff.bz2 329828
+MD5 25a82f3b1d2cfc5fbf7933c2e9ab3e55 mips-sources-security_patches-1.14.tar.bz2 94582
+MD5 463d4901c7f44a9922ab69179adc0b47 mips-sources-generic_patches-1.12.tar.bz2 178249
+MD5 a83e0f80a3fb8561e47ff208bb9207d9 patch-2.6.12-rc6.bz2 4659982
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.28-r2.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.28-r2.ebuild
deleted file mode 100644
index a964a56310a6..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.4.28-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.4.28-r2.ebuild,v 1.1 2005/04/24 03:00:45 kumba Exp $
-
-
-# Version Data
-OKV=${PV/_/-}
-CVSDATE="20050105"			# Date of diff between kernel.org and lmo CVS
-COBALTPATCHVER="1.4"			# Tarball version for cobalt patches
-SECPATCHVER="1.12"			# Tarball version for security patches
-GENPATCHVER="1.5"			# Tarball version for generic patches
-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 Jul 2004
-# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
-# 4) patch to fix the mips64 Makefile to allow building of mips64 kernels
-# 5) iso9660 fix
-# 6) Patches for Cobalt support
-
-
-DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
-		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2
-		mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2
-		cobalt? ( mirror://gentoo/cobalt-patches-24xx-${COBALTPATCHVER}.tar.bz2 )"
-
-HOMEPAGE="http://www.linux-mips.org/"
-SLOT="${OKV}"
-PROVIDE="virtual/linux-sources"
-KEYWORDS="-* mips"
-IUSE="cobalt"
-
-
-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
-
-	# Security Fixes
-	echo -e ""
-	ebegin ">>> Applying Security Fixes"
-		epatch ${WORKDIR}/security/CAN-2004-0814-2.4.28-tty_race_conditions.patch
-		epatch ${WORKDIR}/security/CAN-2004-1016-dos-scm_send.patch
-		epatch ${WORKDIR}/security/CAN-2004-1056-2.4-dos_drm.patch
-		epatch ${WORKDIR}/security/CAN-2004-1074-2.4-kernel_dos_aout.patch
-		epatch ${WORKDIR}/security/CAN-2004-1074-2.4.28-kernel_dos_vma.patch
-		epatch ${WORKDIR}/security/CAN-2004-1137-igmp_vuln.patch
-		epatch ${WORKDIR}/security/CAN-2004-1235-2.4.28-uselib_priv_escalation-nopax.patch
-		epatch ${WORKDIR}/security/CAN-2005-0001-2.4-i386_smp_page_fault_handler.patch
-		epatch ${WORKDIR}/security/CAN-2005-0384-2.4-ppp-dos.patch
-		epatch ${WORKDIR}/security/CAN-2004-1333-2.4-local-dos-vc_resize.patch
-		epatch ${WORKDIR}/security/CAN-2004-1335-mem-leak-via-ip_options_get.patch
-		epatch ${WORKDIR}/security/security-2.4-proc_race.patch
-		epatch ${WORKDIR}/security/security-2.4-grsec_mult_kern_adv.patch
-		epatch ${WORKDIR}/security/security-2.4-vfs-range-chk.patch
-		epatch ${WORKDIR}/security/security-2.4-firewall-bypasses.patch
-	eend
-
-
-	# Cobalt Patches
-	if use cobalt; then
-		echo -e ""
-		einfo ">>> Patching kernel for Cobalt support ..."
-		for x in ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/*.patch; do
-			epatch ${x}
-		done
-		cp ${WORKDIR}/cobalt-patches-24xx-${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.4.31.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.31.ebuild
new file mode 100644
index 000000000000..d5b6ad0a2c3a
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-2.4.31.ebuild
@@ -0,0 +1,67 @@
+# 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.4.31.ebuild,v 1.1 2005/06/11 20:50:28 kumba Exp $
+
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20050606"			# Date of diff between kernel.org and lmo CVS
+SECPATCHVER="1.14"			# Tarball version for security patches
+GENPATCHVER="1.12"			# Tarball version for generic patches
+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 Jul 2004
+# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
+# 4) patch to fix the mips64 Makefile to allow building of mips64 kernels
+# 5) iso9660 fix
+
+
+DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
+		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2
+		mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2"
+
+HOMEPAGE="http://www.linux-mips.org/"
+SLOT="${OKV}"
+PROVIDE="virtual/linux-sources"
+KEYWORDS="-* mips"
+IUSE=""
+
+
+src_unpack() {
+	unpack ${A}
+
+	echo -e ""
+	einfo "Ignore warnings about using the 'linux-info' eclass."
+	echo -e ""
+
+	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
+
+	# gcc-3.4.x compatibility patches
+	epatch ${WORKDIR}/mips-patches/misc-2.4-gcc-3.4.x-strcpy-fix.patch
+	epatch ${WORKDIR}/mips-patches/misc-2.4-gcc-3.4.x-stop-dead-code-elim.patch
+
+
+	# Security Fixes
+#	echo -e ""
+#	ebegin ">>> Applying Security Fixes"
+#	eend
+
+	kernel_universal_unpack
+}
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.10-r3.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.10-r4.ebuild
index d8176a806423..00f9b71473f7 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.10-r3.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.10-r4.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-r3.ebuild,v 1.2 2005/05/19 05:23:25 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.10-r4.ebuild,v 1.1 2005/06/11 20:50:28 kumba Exp $
 
 
 # INCLUDED:
@@ -21,7 +21,7 @@
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20050115"			# Date of diff between kernel.org and lmo CVS
-SECPATCHVER="1.13"			# Tarball version for security patches
+SECPATCHVER="1.14"			# Tarball version for security patches
 GENPATCHVER="1.11"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -40,7 +40,7 @@ inherit kernel eutils
 HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources virtual/alsa"
-KEYWORDS="-* ~mips"
+KEYWORDS="-* mips"
 IUSE="cobalt ip28 ip30 livecd"
 
 
@@ -231,9 +231,12 @@ 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-1041-fib_seq_start-dos.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-1265-local-dos-via-mmap.patch
 		epatch ${MIPS_SECURITY}/CAN-2005-1368-2.6-key_user_lookup-dos.patch
+		epatch ${MIPS_SECURITY}/CAN-2005-1589-pkt_ioctl-local-priv-esc.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-r2.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.12_rc2-r2.ebuild
deleted file mode 100644
index 36eda15bb37d..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.6.12_rc2-r2.ebuild
+++ /dev/null
@@ -1,342 +0,0 @@
-# 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-r2.ebuild,v 1.2 2005/05/19 05:23:25 kumba Exp $
-
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 23 Apr 2005
-# 3) Generic Fixes
-# 4) Security fixes
-# 5) Patch for IP30 Octane Support		(http://helios.et.put.poznan.pl/~sskowron/ip30/)
-# 6) Patch for Remaining Cobalt Bits		(http://www.colonel-panic.org/cobalt-mips/)
-# 7) Experimental patches
-
-
-#//------------------------------------------------------------------------------
-
-
-
-# Version Data
-OKV=${PV/_/-}
-CVSDATE="20050423"			# 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
-
-# Directories
-S="${WORKDIR}/linux-${OKV}-${CVSDATE}"
-MIPS_PATCHES="${WORKDIR}/mips-patches"
-MIPS_SECURITY="${WORKDIR}/security"
-
-# Inherit Eclasses
-ETYPE="sources"
-inherit kernel eutils
-
-# Portage Vars
-HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/"
-SLOT="${OKV}"
-PROVIDE="virtual/linux-sources virtual/alsa"
-KEYWORDS="-* ~mips"
-IUSE="cobalt ip27 ip28 ip30 livecd"
-
-
-# If USERC == "yes", use a release candidate kernel (2.6.X-rcY)
-if [ "${USERC}" = "yes" ]; then
-	KVMjMn="${OKV%.*}"				# Kernel Major/Minor
-	KVREV="${OKV%%-*}"				# Kernel Revision Pt. 1
-	KVREV="${KVREV##*.}"				# Kernel Revision Pt. 2
-	KVRC="${OKV#*-}"				# Kernel RC
-	STABLEVER="${KVMjMn}.$((${KVREV} - 1))"		# Last stable Kernel version (Revision - 1)
-	PATCHVER="mirror://kernel/linux/kernel/v2.6/testing/patch-${OKV}.bz2"
-	EXTRAVERSION="-${KVRC}-mipscvs-${CVSDATE}"
-	KV="${OKV}-${EXTRAVERSION}"
-else
-	STABLEVER="${OKV}"
-	PATCHVER=""
-fi
-
-
-DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${STABLEVER}.tar.bz2
-		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
-		mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2
-		mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2
-		${PATCHVER}"
-
-
-
-#//------------------------------------------------------------------------------
-
-
-
-# Error message 
-err_only_one_arch_allowed() {
-	echo -e ""
-	eerror "A patchset for a specific machine-type has already been selected."
-	eerror "No other patches for machines-types are permitted.  You will need a"
-	eerror "separate copy of the kernel sources for each different machine-type"
-	eerror "you want to build a kernel for."
-	die "Only one machine-type patchset allowed"
-}
-
-
-# Check our USE flags for machine-specific flags and give appropriate warnings.
-# Hope the user isn't crazy enough to try using combinations of these flags.
-# Only use one machine-specific flag at a time for each type of desired machine-support.
-#
-# Affected machines:	ip27 ip28 ip30
-# Not Affected:		cobalt ip22 ip32
-pkg_setup() {
-	local arch_is_selected="no"
-
-	# See if we're using IP27 (Origin)
-	if use ip27; then
-		if [ "${arch_is_selected}" = "no" ]; then
-			echo -e ""
-			einfo "IP27 support can be considered a game of Russian Roulette.  It'll work"
-			einfo "great for some but not for others.  It also uses some rather horrible"
-			einfo "hacks to get going -- hopefully these will be repaired in the future."
-			echo -e ""
-			ewarn "Please keep all kittens and any other small, cute, and fluffy creatures"
-			ewarn "away from an IP27 Box running these sources.  Failure to do so may cause"
-			ewarn "the IP27 to consume the hapless creature.  Consider this your only"
-			ewarn "warning regarding the experimental nature of this particular machine."
-			echo -e ""
-			arch_is_selected="yes"
-		else
-			err_only_one_arch_allowed
-		fi
-	fi
-
-
-	# See if we're using IP28 (Indigo2 Impact R10000)
-	if use ip28; then
-		if [ "${arch_is_selected}" = "no" ]; then
-			echo -e ""
-			einfo "Support for the Indigo2 Impact R10000 is probably even more experimental"
-			einfo "than Octane support.  If you seriously do not have a clue in the world about"
-			einfo "what you are doing, what an IP28 is, what a mips is, or even what gentoo is,"
-			einfo "then stop now, and return to regularly scheduled x86 programming.  Consider"
-			einfo "this the warning that you are about to venture into no-man's land with a"
-			einfo "machine that is barely supported, likely very unstable, and may very well"
-			einfo "eat your grandmother's pet cat Fluffy."
-			echo -e ""
-			ewarn "That said, support for this system REQUIRES that you use the ip28 cascade"
-			ewarn "profile (default-linux/mips/mips64/ip28/XXXX.Y), because a very special"
-			ewarn "patch is used on the system gcc, kernel-gcc (gcc-mips64) and the kernel"
-			ewarn "itself in order to support this machine.  These patches will only be applied"
-			ewarn "if \"ip28\" is defined in USE, which the profile sets.  Other things to keep"
-			ewarn "in mind are that this system can only be netbooted (no arcboot support),"
-			ewarn "requires a full 64-bit kernel, serial-console only (Impact graphics not"
-			ewarn "supported yet), and _nothing_ is guaranteed to work smoothly."
-			echo -e ""
-			arch_is_selected="yes"
-		else
-			err_only_one_arch_allowed
-		fi
-	fi
-
-
-	# See if we're using IP30 (Octane)
-	if use ip30; then
-		if [ "${arch_is_selected}" = "no" ]; then
-			echo -e ""
-			einfo "Octane support is still considered experimental, but runs reasonably"
-			einfo "well.  There is still the limitation of using only one SCSI disk (two"
-			einfo "or more will panic the kernel), serial is still limited to 96008N1, and"
-			einfo "there is no X support as of this release.  Framebuffer Console only"
-			einfo "works on ImpactSR, no VPro support yet, and Octane can only be netbooted"
-			einfo "for the time being."
-			echo -e ""
-			einfo "SMP on Octane is also available with this release, however it is still"
-			einfo "in testing and thus should be considered very experimental."
-			echo -e ""
-			arch_is_selected="yes"
-		else
-			err_only_one_arch_allowed
-		fi
-	fi
-
-
-	# See if we're on a cobalt system (must use the cobalt-mips profile)
-	if use 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 ""
-		arch_is_selected="yes"
-	fi
-}
-
-
-
-#//------------------------------------------------------------------------------
-
-
-
-# Generic Patches - Safe to use globally
-do_generic_patches() {
-	echo -e ""
-	ebegin ">>> Generic Patches"
-		# IP22 Patches
-		epatch ${MIPS_PATCHES}/misc-2.6.11-ip22-chk-consoleout-is-serial.patch
-
-		# IP32 Patches (Safe for non-IP32 use)
-		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
-
-		# Generic
-		epatch ${MIPS_PATCHES}/misc-2.6.11-ths-mips-tweaks.patch
-		epatch ${MIPS_PATCHES}/misc-2.6.12-pdh-mips-tweaks.patch
-		epatch ${MIPS_PATCHES}/misc-2.6.12-add-ramdisk-back.patch
-		epatch ${MIPS_PATCHES}/misc-2.6-mips-iomap-functions.patch
-		epatch ${MIPS_PATCHES}/misc-2.6.12-seccomp-no-default.patch
-		epatch ${MIPS_PATCHES}/misc-2.6.11-add-byteorder-to-proc.patch
-
-		# Ugly Hacks (Long Story, ask about it on IRC if you really want to know)
-		if ! use ip30 && ! use ip28; then
-			epatch ${MIPS_PATCHES}/misc-2.6.11-ugly-wrong-kphysaddr-hack.patch
-		fi
-	eend
-}
-
-
-# NOT safe for production systems
-# Use at own risk, do _not_ file bugs on effects of these patches
-do_sekret_patches() {
-	# /* EXPERIMENTAL - DO NOT USE IN PRODUCTION KERNELS */
-	# Patches used in building LiveCDs
-	if use livecd; then
-		epatch ${MIPS_PATCHES}/misc-2.6-livecd-partitioned-cdroms.patch
-	fi
-	# /* EXPERIMENTAL - DO NOT USE IN PRODUCTION KERNELS */
-}
-
-
-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
-}
-
-
-
-#//------------------------------------------------------------------------------
-
-
-
-# These patches are separate from generic patches for a good reason - namely because it is
-# possible (but untested) that patches for one machine-type may conflict with patches from
-# another machine type and therefore produce unwanted side-effects.  We therefore enforce 
-# this by checking if an arch patch has already been applied, and if so, error out.
-
-# SGI Origin (IP27)
-do_ip27_support() {
-	echo -e ""
-	einfo ">>> Patching kernel for SGI Origin (IP27) support ..."
-	epatch ${MIPS_PATCHES}/misc-2.6.11-ip27-horrible-hacks_may-eat-kittens.patch
-}
-
-# SGI Indigo2 Impact R10000 (IP28)
-do_ip28_support() {
-	echo -e ""
-	einfo ">>> Patching kernel for SGI Indigo2 Impact R10000 (IP28) support ..."
-	epatch ${MIPS_PATCHES}/misc-2.6.12-rc2-ip28-i2_impact-support.patch
-}
-
-
-# SGI Octane 'Speedracer' (IP30)
-do_ip30_support() {
-	echo -e ""
-	einfo ">>> Patching kernel for SGI Octane (IP30) support ..."
-	epatch ${MIPS_PATCHES}/misc-2.6.12-rc2-ip30-octane-support.patch
-}
-
-
-
-#//------------------------------------------------------------------------------
-
-
-
-# Renames source trees for the few machines that we have separate patches for
-rename_source_tree() {
-	if [ ! -z "${1}" ]; then
-		if use ${1}; then
-			mv ${S} ${S}.${1}
-			S="${S}.${1}"
-		fi
-	fi
-}
-
-
-
-#//------------------------------------------------------------------------------
-
-
-
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/linux-${STABLEVER} ${WORKDIR}/linux-${OKV}-${CVSDATE}
-	cd ${S}
-
-
-	# If USERC == "yes", use a release candidate kernel (2.6.x-rcy)
-	if [ "${USERC}" = "yes" ]; then
-		echo -e ""
-		einfo ">>> linux-${STABLEVER} --> linux-${OKV} ..."
-		epatch ${WORKDIR}/patch-${OKV}
-	fi
-
-
-	# Update the vanilla sources with linux-mips CVS changes
-	echo -e ""
-	einfo ">>> linux-${OKV} --> linux-${OKV}-${CVSDATE} patch ..."
-	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
-
-	# Generic patches we always include
-	do_generic_patches
-
-	# Machine-specific patches
-	use ip27	&& do_ip27_support
-	use ip28	&& do_ip28_support
-	use ip30	&& do_ip30_support
-
-	# Patches for experimental use
-	do_sekret_patches
-
-	# Security Fixes
-	do_security_patches
-
-
-	# All done, resume normal portage work
-	kernel_universal_unpack
-}
-
-
-src_install() {
-	use ip27	&& rename_source_tree ip27
-	use ip28	&& rename_source_tree ip28
-	use ip30	&& rename_source_tree ip30
-
-	kernel_src_install
-}
-
-
-
-#//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.12_rc3-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.12_rc6.ebuild
index fb8ea03e9872..05b7fcfdd781 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.12_rc3-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.12_rc6.ebuild
@@ -1,11 +1,11 @@
 # 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-r1.ebuild,v 1.2 2005/05/19 05:23:25 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.12_rc6.ebuild,v 1.1 2005/06/11 20:50:28 kumba Exp $
 
 
 # INCLUDED:
 # 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 30 Apr 2005
+# 2) linux-mips.org CVS snapshot diff from 29 May 2005
 # 3) Generic Fixes
 # 4) Security fixes
 # 5) Patch for IP30 Octane Support		(http://helios.et.put.poznan.pl/~sskowron/ip30/)
@@ -19,9 +19,9 @@
 
 # Version Data
 OKV=${PV/_/-}
-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
+CVSDATE="20050610"			# Date of diff between kernel.org and lmo CVS
+SECPATCHVER="1.14"			# Tarball version for security patches
+GENPATCHVER="1.12"			# Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 USERC="yes"				# If set to "yes", then attempt to use an RC kernel
@@ -196,7 +196,7 @@ do_generic_patches() {
 		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
+		epatch ${MIPS_PATCHES}/misc-2.6.12-rc6-cobalt-bits.patch
 
 		# Generic
 		epatch ${MIPS_PATCHES}/misc-2.6.12-ths-mips-tweaks.patch
@@ -230,8 +230,6 @@ 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
 }