Added a patch to fix a new kernel vunerability for 2.4.21, 2.4.22, and 2.4.23 and added a patch to fix a memory leak in MIPS-related RTC drivers (and the generic RTC driver, as cobalt uses this). Also removed older ebuilds lacking aforementioned patches.

13 files changed, 144 insertions, 97 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index f4d5b686a793..41956e7e09a0 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.20 2003/12/17 07:03:48 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.21 2004/01/06 01:53:15 kumba Exp $
+
+*mips-sources-2.4.21-r3 (05 Jan 2004)
+
+  05 Jan 2004; Joshua Kinard <kumba@gentoo.org> mips-sources-2.4.21-r2.ebuild,
+  mips-sources-2.4.21-r3.ebuild, mips-sources-2.4.22-r4.ebuild,
+  mips-sources-2.4.22-r5.ebuild, mips-sources-2.4.22-r6.ebuild,
+  mips-sources-2.4.23-r1.ebuild, mips-sources-2.4.23-r2.ebuild,
+  files/mremap-fix.patch, files/rtc-fixes.patch:
+  Added a patch to fix a new kernel vunerability for 2.4.21, 2.4.22, and 2.4.23
+  and added a patch to fix a memory leak in MIPS-related RTC drivers (and the 
+  generic RTC driver, as cobalt uses this). Also removed older ebuilds lacking 
+  aforementioned patches.
 
   17 Dec 2003; Joshua Kinard <kumba@gentoo.org> mips-sources-2.4.22-r1.ebuild,
   mips-sources-2.4.22-r2.ebuild, mips-sources-2.4.22-r3.ebuild,
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index c654d870ba50..e97c7c4c35cc 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,12 +1,12 @@
-MD5 47726b543033326133efdd7faee0a061 ChangeLog 6038
+MD5 8a042cd33cbce88036f7033d3f9c0c25 ChangeLog 6038
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 f9e4df726d3d56393b810243369a760d mips-sources-2.4.21-r3.ebuild 1551
-MD5 361d05639d6654bbd79a6557b482a9fb mips-sources-2.4.23-r2.ebuild 2202
-MD5 67c3b7f5f563b33f6318f063e2f403b8 mips-sources-2.4.22-r6.ebuild 1788
+MD5 fab7c51b60717c7154ba8aa18f746b60 mips-sources-2.4.21-r3.ebuild 1552
+MD5 70e3f22cbb1cc2b57a5262391cd02cc7 mips-sources-2.4.23-r2.ebuild 2205
+MD5 4f0eb829ea0cb4511d6eb4b72c3fe0f4 mips-sources-2.4.22-r6.ebuild 1788
+MD5 e2ef7cc30c0f2612fe8c76de9c372cca mips-sources-2.4.23.ebuild 1321
 MD5 05f3097edb6fd323d0ddf083fb25f838 files/mremap-fix.patch 414
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
 MD5 ea1908cecc8ab0d5ef958b4abc8b1da1 files/digest-mips-sources-2.4.23-r2 352
-MD5 b7b1f3cc3d41e54d5a23057bc0c83fb5 files/digest-mips-sources-2.4.23-r1 144
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
 MD5 054c3c8e9c8804a13c79d01ec52793ed files/mipscvs-2.4.21-makefile-fix.patch 915
 MD5 3ec0bd6b14384ef98b64cb997030f3cc files/mipscvs-2.4.22-makefile-fix.patch 1344
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r2 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r3
index 9e16838f5d98..9e16838f5d98 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r2
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r3
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r4 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r4
deleted file mode 100644
index d6bc27d26c18..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
-MD5 0db06b0c2fcc7cdcb9993cd0095e153e mipscvs-2.4.22-20030825.diff.bz2 132364
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r5 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r6
index 5276a20886f0..5276a20886f0 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r5
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r6
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23
deleted file mode 100644
index 36560e9f5f30..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 642af5ab5e1fc63685fde85e9ae601e4 linux-2.4.23.tar.bz2 29832609
-MD5 6a0568d481238976d8c4cbc208492580 mipscvs-2.4.23-20031128.diff.bz2 286782
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r2
index 4a3f52d1860d..f24578de6653 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r1
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r2
@@ -1,5 +1,5 @@
 MD5 642af5ab5e1fc63685fde85e9ae601e4 linux-2.4.23.tar.bz2 29832609
-MD5 4d28439c08a6c76e8fd1bb6355dee7c4 mipscvs-2.4.23-20031214.diff.bz2 318135
+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/mremap-fix.patch b/sys-kernel/mips-sources/files/mremap-fix.patch
new file mode 100644
index 000000000000..eb1c9d26b3d5
--- /dev/null
+++ b/sys-kernel/mips-sources/files/mremap-fix.patch
@@ -0,0 +1,13 @@
+--- linux/mm/mremap.c.orig	2004-01-05 17:01:21.382104120 +0000
++++ linux/mm/mremap.c	2004-01-05 17:15:25.689749848 +0000
+@@ -270,6 +270,10 @@
+ 	old_len = PAGE_ALIGN(old_len);
+ 	new_len = PAGE_ALIGN(new_len);
+ 
++	/* Don't allow the degenerate cases */
++	if (!(old_len | new_len))
++		goto out;
++
+ 	/* new_addr is only valid if MREMAP_FIXED is specified */
+ 	if (flags & MREMAP_FIXED) {
+ 		if (new_addr & ~PAGE_MASK)
diff --git a/sys-kernel/mips-sources/files/rtc-fixes.patch b/sys-kernel/mips-sources/files/rtc-fixes.patch
new file mode 100644
index 000000000000..78b11859fe26
--- /dev/null
+++ b/sys-kernel/mips-sources/files/rtc-fixes.patch
@@ -0,0 +1,63 @@
+diff -urN linux-2.4.23/drivers/char/ds1286.c linux-2.4.24/drivers/char/ds1286.c
+--- linux-2.4.23/drivers/char/ds1286.c	2003-08-25 04:44:41.000000000 -0700
++++ linux-2.4.24/drivers/char/ds1286.c	2004-01-05 05:53:56.000000000 -0800
+@@ -173,7 +173,7 @@
+ 		 * means "don't care" or "match all". Only the tm_hour,
+ 		 * tm_min, and tm_sec values are filled in.
+ 		 */
+-
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		ds1286_get_alm_time(&wtime);
+ 		break;
+ 	}
+@@ -216,6 +216,7 @@
+ 	}
+ 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
+ 	{
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		ds1286_get_time(&wtime);
+ 		break;
+ 	}
+diff -urN linux-2.4.23/drivers/char/ip27-rtc.c linux-2.4.24/drivers/char/ip27-rtc.c
+--- linux-2.4.23/drivers/char/ip27-rtc.c	2003-08-25 04:44:41.000000000 -0700
++++ linux-2.4.24/drivers/char/ip27-rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -83,6 +83,7 @@
+ 	switch (cmd) {
+ 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
+ 	{
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		get_rtc_time(&wtime);
+ 		break;
+ 	}
+diff -urN linux-2.4.23/drivers/char/mips_rtc.c linux-2.4.24/drivers/char/mips_rtc.c
+--- linux-2.4.23/drivers/char/mips_rtc.c	2003-08-25 04:44:41.000000000 -0700
++++ linux-2.4.24/drivers/char/mips_rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -82,6 +82,7 @@
+ 
+ 	switch (cmd) {
+ 	case RTC_RD_TIME:	/* Read the time/date from RTC  */
++		memset(&rtc_tm, 0, sizeof(struct rtc_time));
+ 		curr_time = rtc_get_time();
+ 		to_tm(curr_time, &rtc_tm);
+ 		rtc_tm.tm_year -= 1900;
+diff -urN linux-2.4.23/drivers/char/rtc.c linux-2.4.24/drivers/char/rtc.c
+--- linux-2.4.23/drivers/char/rtc.c	2003-11-28 10:26:20.000000000 -0800
++++ linux-2.4.24/drivers/char/rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -362,7 +362,7 @@
+ 		 * means "don't care" or "match all". Only the tm_hour,
+ 		 * tm_min, and tm_sec values are filled in.
+ 		 */
+-
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		get_rtc_alm_time(&wtime);
+ 		break; 
+ 	}
+@@ -406,6 +406,7 @@
+ 	}
+ 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
+ 	{
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		get_rtc_time(&wtime);
+ 		break;
+ 	}
+
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.21-r2.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.21-r3.ebuild
index a32fc8f3c759..e64ec234af0e 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.21-r2.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.21-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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-r2.ebuild,v 1.6 2003/12/02 03:56:45 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.21-r3.ebuild,v 1.1 2004/01/06 01:53:15 kumba Exp $
 
 ETYPE="sources"
 inherit kernel
@@ -31,15 +31,22 @@ src_unpack() {
 	cd ${S}
 
 	# Update the vanilla sources with linux-mips CVS changes
-	cat ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff | patch -p1
+	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
 
-	# Big Endian Fix
-	cat ${FILESDIR}/bigendian-byteorder-fix.patch | patch -p1
+	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
+	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
 
-	# Patch arch/mips/Makefile for gcc
-	cat ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch | patch -p0
+	# Big Endian Fix (Fix in headers for big-endian machines)
+	epatch ${FILESDIR}/bigendian-byteorder-fix.patch
 
-	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+	# do_brk fix (Fixes exploit that hit several debian servers)
+	epatch ${FILESDIR}/do_brk_fix.patch
+
+	# mremap fix (Possibly Exploitable)
+	epatch ${FILESDIR}/mremap-fix.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.22-r4.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.22-r4.ebuild
deleted file mode 100644
index 3c6949b24eb9..000000000000
--- a/sys-kernel/mips-sources/mips-sources-2.4.22-r4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2003 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-r4.ebuild,v 1.1 2003/12/02 07:43:51 iggy Exp $
-
-ETYPE="sources"
-inherit kernel
-
-OKV=${PV/_/-}
-CVSDATE=20030825
-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 25 Aug 2003
-# 3) patch to fix arch/mips[64]/Makefile to pass appropriate CFLAGS
-# 4) patch to fix the SGI wd scsi driver (Broken in CVS)
-
-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
-	cat ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff | patch -p1
-
-	# Patch the SGI WD scsi driver so the kernel can boot
-	cat ${FILESDIR}/mipscvs-${OKV}-sgiwd-fix.patch | patch -p0
-
-	# Big Endian Fix (Fixed in 2.4.23)
-	cat ${FILESDIR}/bigendian-byteorder-fix.patch | patch -p1
-
-	# Patch arch/mips/Makefile for gcc
-	cat ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch | patch -p0
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.22-r5.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.22-r6.ebuild
index 8ba2d7f8ccfe..055be1542bdf 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.22-r5.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.22-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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-r5.ebuild,v 1.2 2003/12/17 07:03:48 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.22-r6.ebuild,v 1.1 2004/01/06 01:53:15 kumba Exp $
 
 ETYPE="sources"
 inherit kernel
@@ -17,7 +17,7 @@ inherit eutils
 
 # INCLUDED:
 # 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 25 Sep 2003
+# 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
 
@@ -38,22 +38,20 @@ src_unpack() {
 	# Update the vanilla sources with linux-mips CVS changes
 	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
 
-	# Patch arch/mips/Makefile for gcc
+	# 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
+	# Patch arch/mips64/Makefile to pass -Wa,mabi=o64 (Allows building of mips64 kernels)
 	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-mips64-tweak.patch
 
-	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+	# do_brk fix (Fixes exploit that hit several debian servers)
+	epatch ${FILESDIR}/do_brk_fix.patch
 
-	kernel_universal_unpack
-}
+	# mremap fix (Possibly Exploitable)
+	epatch ${FILESDIR}/mremap-fix.patch
 
-pkg_postinst() {
+	# MIPS RTC Fixes (Fixes memleaks, backport from 2.4.24)
+	epatch ${FILESDIR}/rtc-fixes.patch
 
-	# Do kernel postinst stuff
-	kernel_pkg_postinst
-
-	# Create /usr/src/linux symlink
-	ln -sf linux-${OKV}-${CVSDATE} ${ROOT}/usr/src/linux
+	kernel_universal_unpack
 }
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.23-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.23-r2.ebuild
index 693c0ddf810e..a8aa59f6870e 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.23-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.23-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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-r1.ebuild,v 1.1 2003/12/15 05:20:25 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.23-r2.ebuild,v 1.1 2004/01/06 01:53:15 kumba Exp $
 
 ETYPE="sources"
 inherit kernel
 
 OKV=${PV/_/-}
-CVSDATE=20031214
+CVSDATE=20031128
 S=${WORKDIR}/linux-${OKV}-${CVSDATE}
 EXTRAVERSION=-mipscvs-${CVSDATE}
 KV="${OKV}${EXTRAVERSION}"
@@ -19,16 +19,15 @@ inherit eutils
 # 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) SGI XFS patches for 2.4.23
-
+#	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/${OKV}/xfs-${OKV}-split-only.bz2
-		ftp://oss.sgi.com/projects/xfs/patches/${OKV}/xfs-${OKV}-split-kernel.bz2
-		ftp://oss.sgi.com/projects/xfs/patches/${OKV}/xfs-${OKV}-split-acl.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"
@@ -42,14 +41,22 @@ src_unpack() {
 	# Update the vanilla sources with linux-mips CVS changes
 	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
 
-	# Patch arch/mips/Makefile for gcc
+	# Patch arch/mips/Makefile for gcc (Pass -mips3/-mips4 for r4k/r5k cpus)
 	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
 
-	# Patch in XFS Support
-	ebegin "Applying XFS Patches"
-	cat ${WORKDIR}/xfs-${OKV}-split-only | patch -p1 2>&1 >/dev/null
-	cat ${WORKDIR}/xfs-${OKV}-split-kernel | patch -p1 2>&1 >/dev/null
-	cat ${WORKDIR}/xfs-${OKV}-split-acl | patch -p1 2>&1 >/dev/null
+	# mremap fix (Possibly Exploitable)
+	epatch ${FILESDIR}/mremap-fix.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