Version bump for the CAN-2004-0109 issue; bug #47881.

11 files changed, 191 insertions, 52 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index d810ca32ef34..0aa3a37da629 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.64 2004/04/12 16:36:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.65 2004/04/15 21:34:08 plasmaroo Exp $
+
+*gentoo-sources-2.4.20-r14 (15 Apr 2004)
+
+  15 Apr 2004; <plasmaroo@gentoo.org>
+  +files/gentoo-sources-2.4.CAN-2004-0109.patch,
+  -gentoo-sources-2.4.19-r11.ebuild, +gentoo-sources-2.4.19-r12.ebuild,
+  -gentoo-sources-2.4.20-r14.ebuild, +gentoo-sources-2.4.20-r15.ebuild,
+  +gentoo-sources-2.4.22-r8.ebuild, +gentoo-sources-2.4.25-r1.ebuild:
+  Version bump for the CAN-2004-0109 issue; bug #47881.
 
 *gentoo-sources-2.4.26_pre6 (26 Mar 2004)
 
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index ba8221b1e15f..58a6741c6ca7 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,50 +1,55 @@
-MD5 2f5b34d48f970c35408ce284343ec488 gentoo-sources-2.4.22-r3.ebuild 2275
-MD5 8f42aa39ba611520a1204c380b92e163 gentoo-sources-2.4.26_pre5.ebuild 1840
-MD5 7df466da51d9c506ccb1a9b1a640f2d8 gentoo-sources-2.4.22-r5.ebuild 1053
-MD5 5ed42dacc019ea162347050d075f0059 gentoo-sources-2.4.22-r7.ebuild 1096
+MD5 9b2180999c29e7d7f9b1723b3b988552 ChangeLog 16181
+MD5 5ec28e9a3eaae09f58496ede1a411f93 gentoo-sources-2.4.26_pre3.ebuild 1840
 MD5 af17640381fe454755d0a54e5bf85473 gentoo-sources-2.4.22-r4.ebuild 1966
-MD5 3d8ad6e27089077c302b968b621aaa00 gentoo-sources-2.4.19-r11.ebuild 2502
-MD5 b241384c9b554ea3ef9ed6d959c01681 gentoo-sources-2.4.20-r14.ebuild 5514
+MD5 bc9a86d8dc947e719386bc1a2edc2a95 gentoo-sources-2.4.20-r15.ebuild 5603
 MD5 c9bde63d1d668663a68e49e2fea8551f gentoo-sources-2.4.26_pre6.ebuild 2075
-MD5 64ca430a24fb90ed3f73067c824c25e7 ChangeLog 15776
 MD5 c39e44cdffc658550831af5b93b392d5 metadata.xml 289
-MD5 95fcdbd58c05a5297d15a5aa0c957bdd gentoo-sources-2.4.20-r7.ebuild 5390
-MD5 5ec28e9a3eaae09f58496ede1a411f93 gentoo-sources-2.4.26_pre3.ebuild 1840
 MD5 f971e3d19b32c5440a8e02b427e55ab4 gentoo-sources-2.4.25.ebuild 527
-MD5 2ac4fd77e067652901ccf234c9687bb1 files/i810_drm.patch 1247
-MD5 0f54abe62bc4311334eb74604dc39e52 files/digest-gentoo-sources-2.4.25 144
-MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 13455
+MD5 7df466da51d9c506ccb1a9b1a640f2d8 gentoo-sources-2.4.22-r5.ebuild 1053
+MD5 8f42aa39ba611520a1204c380b92e163 gentoo-sources-2.4.26_pre5.ebuild 1840
+MD5 2f5b34d48f970c35408ce284343ec488 gentoo-sources-2.4.22-r3.ebuild 2275
+MD5 3db2e328518c725f529e186971e0b5b4 gentoo-sources-2.4.25-r1.ebuild 573
+MD5 5ed42dacc019ea162347050d075f0059 gentoo-sources-2.4.22-r7.ebuild 1096
+MD5 95fcdbd58c05a5297d15a5aa0c957bdd gentoo-sources-2.4.20-r7.ebuild 5390
+MD5 aac2b202f4ddd49cd3d7fec14b89a7f2 gentoo-sources-2.4.22-r8.ebuild 1116
+MD5 458d37e3bc5a11b1e2338d7a4f10c5da gentoo-sources-2.4.19-r12.ebuild 2696
+MD5 34487f5dc39d4ce8178004ced591fa83 files/digest-gentoo-sources-2.4.20-r15 146
+MD5 6450fd1b19f30aa33866e5e467c0d828 files/gentoo-sources-2.4.20-cs46xx-gcc33.patch 374
+MD5 180cbe4b3ff8f173552bca65b345beaa files/digest-gentoo-sources-2.4.22-r7 147
+MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783
 MD5 2f4db0083c0ed762c0af63f26812a68b files/gentoo-sources-2.4.20-fix-proc-mm.patch 1300
-MD5 1326d31d343f60512dfb1376bfe134a2 files/gentoo-sources-2.4.20-sched-interrupt.patch 400
+MD5 e77a93fdf26f06cf3ea5080b27211725 files/gentoo-sources-2.4.CAN-2003-0985.patch 414
+MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 13455
+MD5 180cbe4b3ff8f173552bca65b345beaa files/digest-gentoo-sources-2.4.22-r5 147
+MD5 174438d215b70cad5ffb00ca8123c062 files/gentoo-sources-2.4.munmap.patch 837
+MD5 7f67278a50f432fffc39ef8edce951c6 files/digest-gentoo-sources-2.4.26_pre6 221
 MD5 032ff70c5895cc1a2dfbe2a58ebde1f7 files/gentoo-sources-2.4.19-munmap.patch 819
+MD5 06ae5abba7a02c0c44f7f15c00fb682d files/digest-gentoo-sources-2.4.26_pre5 149
+MD5 21ebf0ddc4b8ec4013470c4d243cd03b files/gentoo-sources-2.4.20-munmap.patch 826
+MD5 180cbe4b3ff8f173552bca65b345beaa files/digest-gentoo-sources-2.4.22-r8 147
+MD5 6568ac20687149b643dbcc0f07101f2c files/digest-gentoo-sources-2.4.26_pre3 149
+MD5 8bc44a4c2cec1ebcfb4a08b4cc28a162 files/digest-gentoo-sources-2.4.22-r4 147
+MD5 7b306c2be9db38aeb8e0dbfea6dea17a files/gentoo-sources-2.4.20-hpt372.patch 31675
 MD5 9f412f3083cdd87db058dd2f5fbcd103 files/gentoo-sources-2.4.20-ipt-realm.patch 1028
 MD5 d96fe98630a0a160723a67e4ca93dcff files/gentoo-sources-2.4.20-grsec-datasize_fix.patch 1421
-MD5 174438d215b70cad5ffb00ca8123c062 files/gentoo-sources-2.4.munmap.patch 837
-MD5 394bae02a20af95fc9d320f6cea3834e files/gentoo-sources-2.4.22-kmsgdump.patch 887
-MD5 02b1f745c441693b1558b2b6d3f28c45 files/gentoo-sources-2.4.20-mdcount.patch 1345
-MD5 cbd2a33f15a8d2e7ab700a0b45fac377 files/gentoo-sources-2.4.20-grsec-disabled.patch 562
-MD5 7b306c2be9db38aeb8e0dbfea6dea17a files/gentoo-sources-2.4.20-hpt372.patch 31675
-MD5 3bf2f78421fe7eb5babc154d4ad4dbbd files/security.patch1 14328
 MD5 f308aef282ea75ea55d5c6035dafa100 files/security.patch2 4014
-MD5 0d1cdff97252338dc5acc37c5f84d7c6 files/security.patch3 3333
-MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783
-MD5 6bd1b3d66aca4f2ae0cfd964caa28cc9 files/gentoo-sources-2.4.20-devfs-snd-fix.patch 1973
-MD5 857ff623313f874e811763a2db96e831 files/lcall-DoS.patch 885
-MD5 a580e6b8c602c2e13fb5de7cc2de65a0 files/do_brk_fix.patch 242
-MD5 8c31359a134b927f7038539e7dd896d4 files/digest-gentoo-sources-2.4.19-r11 146
-MD5 34487f5dc39d4ce8178004ced591fa83 files/digest-gentoo-sources-2.4.20-r14 146
+MD5 1326d31d343f60512dfb1376bfe134a2 files/gentoo-sources-2.4.20-sched-interrupt.patch 400
 MD5 a61e57d5483a06f20da339d91f98fbb8 files/gentoo-sources-2.4.20-rtc_fix.patch 6769
-MD5 bf2b609e8cab6460d220b1267db09826 files/gentoo-sources-2.4.CAN-2004-0001.patch 982
-MD5 21ebf0ddc4b8ec4013470c4d243cd03b files/gentoo-sources-2.4.20-munmap.patch 826
+MD5 6bd1b3d66aca4f2ae0cfd964caa28cc9 files/gentoo-sources-2.4.20-devfs-snd-fix.patch 1973
+MD5 0f54abe62bc4311334eb74604dc39e52 files/digest-gentoo-sources-2.4.25-r1 144
 MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r7 145
+MD5 8c31359a134b927f7038539e7dd896d4 files/digest-gentoo-sources-2.4.19-r12 146
+MD5 0f54abe62bc4311334eb74604dc39e52 files/digest-gentoo-sources-2.4.25 144
 MD5 e06e41c29580142ad40709e369084b22 files/digest-gentoo-sources-2.4.22-r3 147
-MD5 8bc44a4c2cec1ebcfb4a08b4cc28a162 files/digest-gentoo-sources-2.4.22-r4 147
-MD5 180cbe4b3ff8f173552bca65b345beaa files/digest-gentoo-sources-2.4.22-r5 147
-MD5 180cbe4b3ff8f173552bca65b345beaa files/digest-gentoo-sources-2.4.22-r7 147
-MD5 6450fd1b19f30aa33866e5e467c0d828 files/gentoo-sources-2.4.20-cs46xx-gcc33.patch 374
-MD5 012e8ba5d18dbb8d508ac4955e143e3a files/gentoo-sources-2.4.20-ipt-route.patch 13307
-MD5 6568ac20687149b643dbcc0f07101f2c files/digest-gentoo-sources-2.4.26_pre3 149
-MD5 06ae5abba7a02c0c44f7f15c00fb682d files/digest-gentoo-sources-2.4.26_pre5 149
-MD5 7f67278a50f432fffc39ef8edce951c6 files/digest-gentoo-sources-2.4.26_pre6 221
 MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/gentoo-sources-2.4.22-rtc_fix.patch 7073
-MD5 e77a93fdf26f06cf3ea5080b27211725 files/gentoo-sources-2.4.CAN-2003-0985.patch 414
+MD5 3bf2f78421fe7eb5babc154d4ad4dbbd files/security.patch1 14328
+MD5 857ff623313f874e811763a2db96e831 files/lcall-DoS.patch 885
+MD5 012e8ba5d18dbb8d508ac4955e143e3a files/gentoo-sources-2.4.20-ipt-route.patch 13307
+MD5 cbd2a33f15a8d2e7ab700a0b45fac377 files/gentoo-sources-2.4.20-grsec-disabled.patch 562
+MD5 2ac4fd77e067652901ccf234c9687bb1 files/i810_drm.patch 1247
+MD5 0d1cdff97252338dc5acc37c5f84d7c6 files/security.patch3 3333
+MD5 394bae02a20af95fc9d320f6cea3834e files/gentoo-sources-2.4.22-kmsgdump.patch 887
+MD5 a580e6b8c602c2e13fb5de7cc2de65a0 files/do_brk_fix.patch 242
+MD5 bf2b609e8cab6460d220b1267db09826 files/gentoo-sources-2.4.CAN-2004-0001.patch 982
+MD5 02b1f745c441693b1558b2b6d3f28c45 files/gentoo-sources-2.4.20-mdcount.patch 1345
+MD5 21f3a4f186017d925067335e24db36a1 files/gentoo-sources-2.4.CAN-2004-0109.patch 1877
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r11 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r12
index 19d991259834..19d991259834 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r11
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r12
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r14 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r15
index 0d9abd01d13b..0d9abd01d13b 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r14
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r15
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r8 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r8
new file mode 100644
index 000000000000..a564b8210a40
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r8
@@ -0,0 +1,2 @@
+MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
+MD5 7f4a97d9c29f7dfc959a7a7efb077e29 gentoo-sources-2.4.22-r5.patch.bz2 3766950
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r1 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r1
new file mode 100644
index 000000000000..b1beb984fb40
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r1
@@ -0,0 +1,2 @@
+MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
+MD5 221b18b5bcc2ede8a1d3616fda8e7ace gentoo-sources-2.4.25.patch.bz2 1617350
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0109.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0109.patch
new file mode 100644
index 000000000000..d02b51c57fc6
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0109.patch
@@ -0,0 +1,87 @@
+--- linux/fs/isofs/rock.c.orig
++++ linux/fs/isofs/rock.c
+@@ -14,6 +14,7 @@
+ #include <linux/slab.h>
+ #include <linux/pagemap.h>
+ #include <linux/smp_lock.h>
++#include <asm/page.h>
+ 
+ #include "rock.h"
+ 
+@@ -419,7 +420,7 @@
+   return 0;
+ }
+ 
+-static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr)
++static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr, char *plimit)
+ {
+ 	int slen;
+ 	int rootflag;
+@@ -431,16 +432,25 @@
+ 		rootflag = 0;
+ 		switch (slp->flags & ~1) {
+ 		case 0:
++			if (slp->len > plimit - rpnt)
++				return NULL;
+ 			memcpy(rpnt, slp->text, slp->len);
+ 			rpnt+=slp->len;
+ 			break;
++		case 2:
++			if (rpnt >= plimit)
++				return NULL;
++			*rpnt++='.';
++			break;
+ 		case 4:
++			if (2 > plimit - rpnt)
++				return NULL;
+ 			*rpnt++='.';
+-			/* fallthru */
+-		case 2:
+ 			*rpnt++='.';
+ 			break;
+ 		case 8:
++			if (rpnt >= plimit)
++				return NULL;
+ 			rootflag = 1;
+ 			*rpnt++='/';
+ 			break;
+@@ -457,17 +467,23 @@
+ 			 * If there is another SL record, and this component
+ 			 * record isn't continued, then add a slash.
+ 			 */
+-			if ((!rootflag) && (rr->u.SL.flags & 1) && !(oldslp->flags & 1))
++			if ((!rootflag) && (rr->u.SL.flags & 1) &&
++			    !(oldslp->flags & 1)) {
++				if (rpnt >= plimit)
++					return NULL;
+ 				*rpnt++='/';
++			}
+ 			break;
+ 		}
+ 
+ 		/*
+ 		 * If this component record isn't continued, then append a '/'.
+ 		 */
+-		if (!rootflag && !(oldslp->flags & 1))
++		if (!rootflag && !(oldslp->flags & 1)) {
++			if (rpnt >= plimit)
++				return NULL;
+ 			*rpnt++='/';
+-
++		}
+ 	}
+ return rpnt;
+ }
+@@ -548,7 +564,10 @@
+ 			CHECK_SP(goto out);
+ 			break;
+ 		case SIG('S', 'L'):
+-			rpnt = get_symlink_chunk(rpnt, rr);
++			rpnt = get_symlink_chunk(rpnt, rr,
++						 link + (PAGE_SIZE - 1));
++			if (rpnt == NULL)
++				goto out;
+ 			break;
+ 		case SIG('C', 'E'):
+ 			/* This tells is if there is a continuation record */
+
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r11.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r12.ebuild
index 11f65803bd45..b6b4c7914990 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r11.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r12.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/gentoo-sources/gentoo-sources-2.4.19-r11.ebuild,v 1.2 2004/02/24 20:37:26 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r12.ebuild,v 1.1 2004/04/15 21:34:08 plasmaroo Exp $
 
 IUSE="build crypt xfs acpi4linux"
 
@@ -35,7 +35,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://gentoo.lostlogicx.com/patches-${KV/11/10}.tar.bz2"
+	 http://gentoo.lostlogicx.com/patches-${KV/12/10}.tar.bz2"
 KEYWORDS="x86 -ppc -sparc -amd64 -ia64"
 SLOT="${KV}"
 
@@ -43,7 +43,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die
 
-	cd ${KV/11/10}
+	cd ${KV/12/10}
 	# Kill patches we aren't suppposed to use, don't worry about 
 	# failures, if they aren't there that is a good thing!
 
@@ -59,10 +59,11 @@ src_unpack() {
 
 	kernel_src_unpack
 
-	cd linux-${KV}
+	cd ${S}
 	patch -p1 < ${FILESDIR}/lcall-DoS.patch || die "lcall-DoS patch failed"
 	patch -p1 < ${FILESDIR}/i810_drm.patch || die "i810_drm patch failed"
 	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to apply do_brk() patch!"
 	epatch ${FILESDIR}/${P}-munmap.patch || die "Failed to apply munmap patch!"
-	cd ..
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2003-0985.patch || die "Failed to patch CAN-2003-0985 vulnerability!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
 }
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r14.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r15.ebuild
index e7e1c9f131a3..cc51c2cfde0b 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r14.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r15.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/gentoo-sources/gentoo-sources-2.4.20-r14.ebuild,v 1.1 2004/03/07 23:27:58 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r15.ebuild,v 1.1 2004/04/15 21:34:08 plasmaroo Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -30,7 +30,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Kernel."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV}.tar.bz2"
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/15/14}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
 KEYWORDS="x86 -ppc -sparc -alpha -hppa -mips "
@@ -41,7 +41,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
 
-	cd ${WORKDIR}/${KV}
+	cd ${WORKDIR}/${KV/15/14}
 
 	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
 	if [ -z "`use aavm`" ]; then
@@ -125,18 +125,16 @@ src_unpack() {
 	epatch ${FILESDIR}/security.patch4
 
 	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to apply do_brk() fix!"
-	epatch ${FILESDIR}/gentoo-sources-2.4.CAN-2003-0985.patch || die "Failed to apply mremap() fix!"
-	epatch ${FILESDIR}/gentoo-sources-2.4.CAN-2004-0001.patch || die "Failed to apply AMD64 ptrace patch!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2003-0985.patch || die "Failed to apply mremap() fix!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0001.patch || die "Failed to apply AMD64 ptrace patch!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
 	epatch ${FILESDIR}/${P}-rtc_fix.patch || die "Failed to apply RTC fix!"
 	epatch ${FILESDIR}/${P}-munmap.patch || die "Failed to apply munmap patch!"
-
 }
 
 pkg_postinst() {
-
 	kernel_pkg_postinst
 
-	echo
 	ewarn "There is no xfs support in this kernel."
 	ewarn "If you need xfs support, emerge xfs-sources."
 	echo
@@ -156,5 +154,4 @@ pkg_postinst() {
 	echo
 	einfo "Please read the ChangeLog and associated docs for more information."
 	echo
-
 }
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r8.ebuild
new file mode 100644
index 000000000000..edc01bc60454
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r8.ebuild,v 1.1 2004/04/15 21:34:08 plasmaroo Exp $
+
+UNIPATCH_LIST="${FILESDIR}/gentoo-sources-2.4.CAN-2004-0001.patch ${DISTDIR}/gentoo-sources-${PVR/8/5}.patch.bz2 ${FILESDIR}/gentoo-sources-2.4.munmap.patch ${FILESDIR}/${PN}-2.4.CAN-2004-0109.patch"
+ETYPE="sources"
+
+inherit kernel-2
+detect_version
+
+S=${WORKDIR}/linux-${KV}
+
+DESCRIPTION="Full sources for the Gentoo Kernel."
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+	http://dev.gentoo.org/~iggy/gentoo-sources-${PVR/8/5}.patch.bz2"
+KEYWORDS="x86 -*"
+SLOT="${KV}"
+
+K_EXTRAEINFO="If there are issues with this kernel, search http://bugs.gentoo.org/ for an
+existing bug. Only create a new bug if you have not found one that matches
+your issue. It is best to do an advanced search as the initial search has a
+very low yield. Please assign your bugs to x86-kernel@gentoo.org.
+Please read the ChangeLog and associated docs for more information."
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r1.ebuild
new file mode 100644
index 000000000000..09ccba449822
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r1.ebuild,v 1.1 2004/04/15 21:34:08 plasmaroo Exp $
+
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+KEYWORDS="x86"
+UNIPATCH_LIST="${DISTDIR}/${P}.patch.bz2 ${FILESDIR}/${PN}-2.4.CAN-2004-0109.patch"
+
+DESCRIPTION="Full sources including the gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~livewire/${P}.patch.bz2"