Added a patch to fix a possible kernel vulnerability in do_munmap. Due to this requiring an ebuild bump, the old sources were all removed and the sources containing the cobalt patches were bumped up.

15 files changed, 70 insertions, 207 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index a6886df77328..62fab3ffcb68 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.24 2004/02/10 06:44:36 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.25 2004/02/18 21:41:17 kumba Exp $
+
+*mips-sources-2.4.23-r6 (18 Feb 2004)
+
+  18 Feb 2004; Joshua Kinard <kumba@gentoo.org> mips-sources-2.4.21-r4.ebuild,
+  mips-sources-2.4.21-r6.ebuild, mips-sources-2.4.21-r7.ebuild,
+  mips-sources-2.4.22-r10.ebuild, mips-sources-2.4.22-r7.ebuild,
+  mips-sources-2.4.22-r9.ebuild, mips-sources-2.4.23-r3.ebuild,
+  mips-sources-2.4.23-r5.ebuild, mips-sources-2.4.23-r6.ebuild,
+  files/do_munmap-fix.patch:
+  Added a patch to fix a possible kernel vulnerability in do_munmap. Due to this
+  requiring an ebuild bump, the old sources were all removed and the sources
+  containing the cobalt patches were bumped up.
 
 *mips-sources-2.4.23-r5 (10 Feb 2004)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 326ec71e068e..7532f4f1e996 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,22 +1,17 @@
-MD5 bbf074f259f5436ea8a40b07b1487334 ChangeLog 7303
+MD5 6fdff6930e3649eb153f8a4e79374ae2 ChangeLog 7914
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 23b912302aea43054894e182cec02a87 mips-sources-2.4.21-r4.ebuild 1557
-MD5 6844742a084bb81f04fc318bc9a87a3c mips-sources-2.4.21-r6.ebuild 2208
-MD5 5a31123b52f6c5449127eaed8033786e mips-sources-2.4.22-r7.ebuild 1793
-MD5 81a4b1eb78f2cd1241176bc1d9da1ecc mips-sources-2.4.22-r9.ebuild 2054
-MD5 f6dbc2ee8201ee63b6fbeb8eb3394374 mips-sources-2.4.23-r3.ebuild 2210
-MD5 aebeb23cb42bf117ccf31f2437bef054 mips-sources-2.4.23-r5.ebuild 2780
+MD5 2087ff981c9261ab5639bd1b5d403129 mips-sources-2.4.21-r7.ebuild 2309
+MD5 2da1b4c85f70a06de175ec4b06e1cff9 mips-sources-2.4.22-r10.ebuild 2137
+MD5 8ec3a0c75a0ef38412cd8c0e982e5087 mips-sources-2.4.23-r6.ebuild 2863
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
-MD5 76b0e72e1a0025451c3fcf8d00faaf0a files/digest-mips-sources-2.4.21-r4 145
-MD5 0a3a1be2517b274c5a0c0748a437b6bd files/digest-mips-sources-2.4.21-r6 219
-MD5 c111f35ab5bf4506b4974d7336eea3dc files/digest-mips-sources-2.4.22-r7 144
-MD5 93f8e3701539d6699921e4becaa72f2d files/digest-mips-sources-2.4.22-r9 218
-MD5 ea1908cecc8ab0d5ef958b4abc8b1da1 files/digest-mips-sources-2.4.23-r3 352
-MD5 5aa63a0a1f498866f08339bcbd33f8e3 files/digest-mips-sources-2.4.23-r5 426
+MD5 0a3a1be2517b274c5a0c0748a437b6bd files/digest-mips-sources-2.4.21-r7 219
+MD5 93f8e3701539d6699921e4becaa72f2d files/digest-mips-sources-2.4.22-r10 218
+MD5 5aa63a0a1f498866f08339bcbd33f8e3 files/digest-mips-sources-2.4.23-r6 426
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
 MD5 054c3c8e9c8804a13c79d01ec52793ed files/mipscvs-2.4.21-makefile-fix.patch 915
 MD5 1d8857f9bf884fc661beb87cc9d043d1 files/mipscvs-2.4.22-makefile-fix.patch 1873
 MD5 a361526659bf1585152b2c819e329941 files/mipscvs-2.4.23-makefile-inlinelimit-fix.patch 1314
+MD5 174438d215b70cad5ffb00ca8123c062 files/do_munmap-fix.patch 837
 MD5 6ff178aa1398ac2347921194944376f8 files/mipscvs-2.4.23-makefile-fix.patch 1906
 MD5 5e4b24d4c540af721c5bc7e3ad77f40b files/mremap-fix-try2.patch 414
 MD5 1f646066ee81f7aea1f79a79e38a252d files/rtc-fixes.patch 2125
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r4 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r4
deleted file mode 100644
index 9e16838f5d98..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
-MD5 aea17fa0a6fc0bef9847b8713d4c3923 mipscvs-2.4.21-20030803.diff.bz2 1011871
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r6 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r7
index 3f39217453fa..3f39217453fa 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r6
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r7
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r9 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r10
index 3183414cbd71..3183414cbd71 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r9
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r10
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r7 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r7
deleted file mode 100644
index 5276a20886f0..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
-MD5 d82efc4684e5b4f1b64092d9adaac7e8 mipscvs-2.4.22-20031015.diff.bz2 239716
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r3 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r3
deleted file mode 100644
index f24578de6653..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r3
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 642af5ab5e1fc63685fde85e9ae601e4 linux-2.4.23.tar.bz2 29832609
-MD5 6a0568d481238976d8c4cbc208492580 mipscvs-2.4.23-20031128.diff.bz2 286782
-MD5 2230e5482efd34a9bae1cc05cd9d3b2c xfs-2.4.23-split-only.bz2 652627
-MD5 0723db65569d1eaa5de4584e5b10fe87 xfs-2.4.23-split-kernel.bz2 11561
-MD5 879b21c543189704146d9a3ff99af3c2 xfs-2.4.23-split-acl.bz2 2290
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r5 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r6
index 57d39098851a..57d39098851a 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r5
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r6
diff --git a/sys-kernel/mips-sources/files/do_munmap-fix.patch b/sys-kernel/mips-sources/files/do_munmap-fix.patch
new file mode 100644
index 000000000000..e120b35b7adb
--- /dev/null
+++ b/sys-kernel/mips-sources/files/do_munmap-fix.patch
@@ -0,0 +1,27 @@
+diff -ur linux-2.4.25-rc3/mm/mremap.c linux-2.4.25-rc4/mm/mremap.c
+--- linux-2.4.25-rc3/mm/mremap.c	2004-02-18 13:56:01.000000000 +0000
++++ linux-2.4.25-rc4/mm/mremap.c	2004-02-18 13:49:08.000000000 +0000
+@@ -258,16 +258,20 @@
+ 		if ((addr <= new_addr) && (addr+old_len) > new_addr)
+ 			goto out;
+ 
+-		do_munmap(current->mm, new_addr, new_len);
++		ret = do_munmap(current->mm, new_addr, new_len);
++		if (ret && new_len)
++			goto out;
+ 	}
+ 
+ 	/*
+ 	 * Always allow a shrinking remap: that just unmaps
+ 	 * the unnecessary pages..
+ 	 */
+-	ret = addr;
+ 	if (old_len >= new_len) {
+-		do_munmap(current->mm, addr+new_len, old_len - new_len);
++		ret = do_munmap(current->mm, addr+new_len, old_len - new_len);
++		if (ret && old_len != new_len)
++			goto out;
++		ret = addr;
+ 		if (!(flags & MREMAP_FIXED) || (new_addr == addr))
+ 			goto out;
+ 	}
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.21-r4.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.21-r4.ebuild
deleted file mode 100644
index abed9a251918..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.4.21-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.21-r4.ebuild,v 1.1 2004/01/19 08:29:44 kumba Exp $
-
-ETYPE="sources"
-inherit kernel
-
-OKV=${PV/_/-}
-CVSDATE=20030803
-S=${WORKDIR}/linux-${OKV}
-EXTRAVERSION=-mipscvs-${CVSDATE}
-KV="${OKV}${EXTRAVERSION}"
-
-# What's in this kernel?
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 03 Aug 2003
-# 3) patch to fix arch/mips/Makefile to pass appropriate CFLAGS
-
-DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2"
-HOMEPAGE="http://www.linux-mips.org/"
-SLOT="${OKV}"
-PROVIDE="virtual/linux-sources"
-KEYWORDS="-* mips"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Update the vanilla sources with linux-mips CVS changes
-	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
-
-	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
-	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
-
-	# Big Endian Fix (Fix in headers for big-endian machines)
-	epatch ${FILESDIR}/bigendian-byteorder-fix.patch
-
-	# do_brk fix (Fixes exploit that hit several debian servers)
-	epatch ${FILESDIR}/do_brk_fix.patch
-
-	# mremap fix (Possibly Exploitable)
-	epatch ${FILESDIR}/mremap-fix-try2.patch
-
-	# MIPS RTC Fixes (Fixes memleaks, backport from 2.4.24)
-	epatch ${FILESDIR}/rtc-fixes.patch
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.21-r6.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.21-r7.ebuild
index c3e7be8f096b..2e80c15d1ecb 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.21-r6.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.21-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.21-r6.ebuild,v 1.1 2004/02/10 06:44:36 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.21-r7.ebuild,v 1.1 2004/02/18 21:41:17 kumba Exp $
 
 
 # Version Data
@@ -26,7 +26,8 @@ inherit kernel eutils
 # 5) do_brk fix
 # 6) mremap fix
 # 7) RTC fixes
-# 8) Patches for Cobalt support
+# 8) do_munmap fix
+# 9) Patches for Cobalt support
 
 
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
@@ -36,7 +37,7 @@ SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
-KEYWORDS="-* ~mips"
+KEYWORDS="-* mips"
 
 
 src_unpack() {
@@ -62,15 +63,18 @@ src_unpack() {
 	# MIPS RTC Fixes (Fixes memleaks, backport from 2.4.24)
 	epatch ${FILESDIR}/rtc-fixes.patch
 
+	# do_munmap fix (Possibly Exploitable)
+	epatch ${FILESDIR}/do_munmap-fix.patch
+
 	# Cobalt Patches
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
+#	if [ "${PROFILE_ARCH}" = "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}
-	fi
+#	fi
 
 	kernel_universal_unpack
 }
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.22-r9.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.22-r10.ebuild
index 3cf6c1bace19..95e80654f895 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.22-r9.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.22-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.22-r9.ebuild,v 1.1 2004/02/10 06:44:36 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.22-r10.ebuild,v 1.1 2004/02/18 21:41:17 kumba Exp $
 
 
 # Version Data
@@ -35,7 +35,7 @@ SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
-KEYWORDS="-* ~mips"
+KEYWORDS="-* mips"
 
 
 src_unpack() {
@@ -58,15 +58,18 @@ src_unpack() {
 	# MIPS RTC Fixes (Fixes memleaks, backport from 2.4.24)
 	epatch ${FILESDIR}/rtc-fixes.patch
 
+	# do_munmap fix (Possibly Exploitable)
+	epatch ${FILESDIR}/do_munmap-fix.patch
+
 	# Cobalt Patches
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
+#	if [ "${PROFILE_ARCH}" = "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}
-	fi
+#	fi
 
 	kernel_universal_unpack
 }
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.22-r7.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.22-r7.ebuild
deleted file mode 100644
index 61beb383623d..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.4.22-r7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.22-r7.ebuild,v 1.1 2004/01/19 08:29:44 kumba Exp $
-
-ETYPE="sources"
-inherit kernel
-
-OKV=${PV/_/-}
-CVSDATE=20031015
-S=${WORKDIR}/linux-${OKV}-${CVSDATE}
-EXTRAVERSION=-mipscvs-${CVSDATE}
-KV="${OKV}${EXTRAVERSION}"
-
-inherit eutils
-
-# What's in this kernel?
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 15 Oct 2003
-# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
-# 4) patch to tweak arch/mips64/Makefile to pass -Wa,-mabi=o64 instead of -Wa,-32
-
-
-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"
-HOMEPAGE="http://www.linux-mips.org/"
-SLOT="${OKV}"
-PROVIDE="virtual/linux-sources"
-KEYWORDS="-* mips"
-
-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
-
-	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
-	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
-
-	# Patch arch/mips64/Makefile to pass -Wa,mabi=o64 (Allows building of mips64 kernels)
-	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-mips64-tweak.patch
-
-	# do_brk fix (Fixes exploit that hit several debian servers)
-	epatch ${FILESDIR}/do_brk_fix.patch
-
-	# mremap fix (Possibly Exploitable)
-	epatch ${FILESDIR}/mremap-fix-try2.patch
-
-	# MIPS RTC Fixes (Fixes memleaks, backport from 2.4.24)
-	epatch ${FILESDIR}/rtc-fixes.patch
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.23-r3.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.23-r3.ebuild
deleted file mode 100644
index 8fdb2dfaf0c7..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.4.23-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.23-r3.ebuild,v 1.1 2004/01/19 08:29:44 kumba Exp $
-
-ETYPE="sources"
-inherit kernel
-
-OKV=${PV/_/-}
-CVSDATE=20031128
-S=${WORKDIR}/linux-${OKV}-${CVSDATE}
-EXTRAVERSION=-mipscvs-${CVSDATE}
-KV="${OKV}${EXTRAVERSION}"
-
-inherit eutils
-
-# What's in this kernel?
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 28 Nov 2003
-# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS and 
-#	tweaks arch/mips64/Makefile to pass -Wa,-mabi=o64 instead of -Wa,-32
-# 4) XFS Patches for basic XFS support (with ACL, but no DMAPI)
-
-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
-		ftp://oss.sgi.com/projects/xfs/patches/2.4.23/xfs-2.4.23-split-only.bz2
-		ftp://oss.sgi.com/projects/xfs/patches/2.4.23/xfs-2.4.23-split-kernel.bz2
-		ftp://oss.sgi.com/projects/xfs/patches/2.4.23/xfs-2.4.23-split-acl.bz2"
-HOMEPAGE="http://www.linux-mips.org/"
-SLOT="${OKV}"
-PROVIDE="virtual/linux-sources"
-KEYWORDS="-* ~mips"
-
-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
-
-	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
-	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
-
-	# mremap fix (Possibly Exploitable)
-	epatch ${FILESDIR}/mremap-fix-try2.patch
-
-	# MIPS RTC Fixes (Fixes memleaks, backport from 2.4.24)
-	epatch ${FILESDIR}/rtc-fixes.patch
-
-	# XFS Patches
-	# We don't use epatch here because something funny is messed up in the XFS patches,
-	# thus while they apply, they don't apply properly
-	ebegin "Applying XFS Patchset"
-	cat ${WORKDIR}/xfs-${PV}-split-only | patch -p1 2>&1 >/dev/null
-	cat ${WORKDIR}/xfs-${PV}-split-kernel | patch -p1 2>&1 >/dev/null
-	cat ${WORKDIR}/xfs-${PV}-split-acl | patch -p1 2>&1 >/dev/null
-	eend
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.23-r5.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.23-r6.ebuild
index 37b0a4c16ac9..4fba0b0ded6a 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.23-r5.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.23-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.23-r5.ebuild,v 1.1 2004/02/10 06:44:36 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.23-r6.ebuild,v 1.1 2004/02/18 21:41:17 kumba Exp $
 
 
 # Version Data
@@ -62,6 +62,9 @@ src_unpack() {
 	# MIPS RTC Fixes (Fixes memleaks, backport from 2.4.24)
 	epatch ${FILESDIR}/rtc-fixes.patch
 
+	# do_munmap fix (Possibly Exploitable)
+	epatch ${FILESDIR}/do_munmap-fix.patch
+
 	# XFS Patches
 	# We don't use epatch here because something funny is messed up in the XFS patches,
 	# thus while they apply, they don't apply properly
@@ -72,14 +75,14 @@ src_unpack() {
 	eend
 
 	# Cobalt Patches
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
+#	if [ "${PROFILE_ARCH}" = "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}
-	fi
+#	fi
 
 	kernel_universal_unpack
 }