Version bumps for kernel attribute vulnerabilities, bug #56479.

15 files changed, 65 insertions, 45 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index c48aea3fe140..06b1fa20fcf1 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.77 2004/07/08 22:27:30 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.78 2004/07/09 15:03:35 plasmaroo Exp $
+
+*gentoo-sources-2.4.26-r4 (09 Jul 2004)
+
+  09 Jul 2004; <plasmaroo@gentoo.org> -gentoo-sources-2.4.19-r17.ebuild,
+  +gentoo-sources-2.4.19-r18.ebuild, -gentoo-sources-2.4.20-r20.ebuild,
+  +gentoo-sources-2.4.20-r21.ebuild, -gentoo-sources-2.4.22-r12.ebuild,
+  +gentoo-sources-2.4.22-r13.ebuild, -gentoo-sources-2.4.25-r5.ebuild,
+  +gentoo-sources-2.4.25-r6.ebuild, -gentoo-sources-2.4.26-r3.ebuild,
+  -gentoo-sources-2.4.26-r4.ebuild, +gentoo-sources-2.4.26-r5.ebuild,
+  +files/gentoo-sources-2.4.CAN-2004-0497.patch:
+  Version bumps for kernel attribute vulnerabilities, bug #56479.
 
   08 Jul 2004; <plasmaroo@gentoo.org> :
   Version bump - FreeS/WAN is now replaced with OpenS/WAN.
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 149775e67f02..cb4f51c2192e 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,16 +1,13 @@
-MD5 2d56b1b6ce6c87fb872c14fa8be9cac7 ChangeLog 19219
-MD5 a6ffa2cc1bdab97df185c8ba0946b416 gentoo-sources-2.4.26-r3.ebuild 703
+MD5 ec52d0c8ad2d852d4b33119c016f188e ChangeLog 19804
+MD5 3203e2356a8eb3699c85b0000893d98a gentoo-sources-2.4.19-r18.ebuild 3873
+MD5 e4dc77d78ba2eab964b96c54ae27c80d gentoo-sources-2.4.20-r21.ebuild 6673
 MD5 91ea2908f17a4069774ffce01264df0c metadata.xml 354
-MD5 34ee0c7589a4cd48af4e3b42292d8d5b gentoo-sources-2.4.22-r12.ebuild 1566
-MD5 14e7800e70f5591af7e521535141b482 gentoo-sources-2.4.25-r5.ebuild 960
-MD5 f625c9ac5bce5f151e32eb6802ab81ab gentoo-sources-2.4.26-r4.ebuild 693
-MD5 2c03947a6864764ec91fab15460292aa gentoo-sources-2.4.20-r20.ebuild 6574
-MD5 8f806e4cb7cf0170a3aac45a20ebb397 gentoo-sources-2.4.19-r17.ebuild 3774
+MD5 669ae96b27d690e520b67cc6a2e63519 gentoo-sources-2.4.25-r6.ebuild 1004
+MD5 cc37315455aa372598784413892e8f66 gentoo-sources-2.4.22-r13.ebuild 1610
+MD5 f80f159e83911a3894a735bbcd18921c gentoo-sources-2.4.26-r5.ebuild 747
 MD5 6450fd1b19f30aa33866e5e467c0d828 files/gentoo-sources-2.4.20-cs46xx-gcc33.patch 374
-MD5 180cbe4b3ff8f173552bca65b345beaa files/digest-gentoo-sources-2.4.22-r12 147
 MD5 c460ea130cb4ae84a5063ba044e3ce72 files/gentoo-sources-2.4.CAN-2004-0427.patch 460
 MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783
-MD5 fc288f24a93773f560020bd65344ae93 files/digest-gentoo-sources-2.4.26-r3 145
 MD5 2f4db0083c0ed762c0af63f26812a68b files/gentoo-sources-2.4.20-fix-proc-mm.patch 1300
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/gentoo-sources-2.4.CAN-2003-0985.patch 414
 MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 13455
@@ -18,23 +15,26 @@ MD5 174438d215b70cad5ffb00ca8123c062 files/gentoo-sources-2.4.munmap.patch 837
 MD5 032ff70c5895cc1a2dfbe2a58ebde1f7 files/gentoo-sources-2.4.19-munmap.patch 819
 MD5 df40eece807d039cba79f477e80ebda2 files/gentoo-sources-2.4.19-rtc_fix.patch 4974
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/gentoo-sources-2.4.CAN-2004-0178.patch 424
+MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/gentoo-sources-2.4.CAN-2004-0497.patch 707
 MD5 21ebf0ddc4b8ec4013470c4d243cd03b files/gentoo-sources-2.4.20-munmap.patch 826
 MD5 7b306c2be9db38aeb8e0dbfea6dea17a files/gentoo-sources-2.4.20-hpt372.patch 31675
 MD5 d4a740ae56c2049247083af387a22a85 files/gentoo-sources-2.4.CAN-2004-0394.patch 350
 MD5 9f412f3083cdd87db058dd2f5fbcd103 files/gentoo-sources-2.4.20-ipt-realm.patch 1028
 MD5 dc18e982f8149588a291956481885a8c files/gentoo-sources-2.4.CAN-2004-0495.patch 17549
 MD5 d96fe98630a0a160723a67e4ca93dcff files/gentoo-sources-2.4.20-grsec-datasize_fix.patch 1421
-MD5 173483399b1085c13c80332579f333d0 files/digest-gentoo-sources-2.4.26-r4 145
+MD5 0f54abe62bc4311334eb74604dc39e52 files/digest-gentoo-sources-2.4.25-r6 144
 MD5 de75cfa969ed092578d9ddda6c5be334 files/gentoo-sources-2.4.CAN-2004-0181.patch 1233
 MD5 f308aef282ea75ea55d5c6035dafa100 files/security.patch2 4014
+MD5 180cbe4b3ff8f173552bca65b345beaa files/digest-gentoo-sources-2.4.22-r13 147
 MD5 1326d31d343f60512dfb1376bfe134a2 files/gentoo-sources-2.4.20-sched-interrupt.patch 400
 MD5 39af009b63a2f2042ac251fa801044d9 files/gentoo-sources-2.4.19-CAN-2004-0181.patch 1180
 MD5 a61e57d5483a06f20da339d91f98fbb8 files/gentoo-sources-2.4.20-rtc_fix.patch 6769
 MD5 147fec50180ad91b6260fc7201dcb90f files/gentoo-sources-2.4.CAN-2004-0010.patch 6050
 MD5 6bd1b3d66aca4f2ae0cfd964caa28cc9 files/gentoo-sources-2.4.20-devfs-snd-fix.patch 1973
+MD5 173483399b1085c13c80332579f333d0 files/digest-gentoo-sources-2.4.26-r5 145
 MD5 152e60bd6e74485e08c4f0bd8f98250a files/gentoo-sources-2.4.19-gcc33.patch 8526
-MD5 0f54abe62bc4311334eb74604dc39e52 files/digest-gentoo-sources-2.4.25-r5 144
-MD5 8c31359a134b927f7038539e7dd896d4 files/digest-gentoo-sources-2.4.19-r17 146
+MD5 8c31359a134b927f7038539e7dd896d4 files/digest-gentoo-sources-2.4.19-r18 146
+MD5 34487f5dc39d4ce8178004ced591fa83 files/digest-gentoo-sources-2.4.20-r21 146
 MD5 5bf9836a632a861728d33f9736bb7431 files/gentoo-sources-2.4.CAN-2004-0133.patch 427
 MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/gentoo-sources-2.4.22-rtc_fix.patch 7073
 MD5 0f66013f643c79c97fda489618a4e2fd files/gentoo-sources-2.4.CAN-2004-0535.patch 476
@@ -47,7 +47,6 @@ MD5 cbd2a33f15a8d2e7ab700a0b45fac377 files/gentoo-sources-2.4.20-grsec-disabled.
 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 34487f5dc39d4ce8178004ced591fa83 files/digest-gentoo-sources-2.4.20-r20 146
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/gentoo-sources-2.4.CAN-2004-0177.patch 384
 MD5 9c816c892d6e3d3f0b7b77d3d503ab10 files/gentoo-sources-2.4.22-CAN-2004-0075.patch 634
 MD5 a580e6b8c602c2e13fb5de7cc2de65a0 files/do_brk_fix.patch 242
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r17 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r18
index 19d991259834..19d991259834 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r17
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r18
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r20 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r21
index 0d9abd01d13b..0d9abd01d13b 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r20
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r21
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r12 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r13
index a564b8210a40..a564b8210a40 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r12
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r13
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r5 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r6
index b1beb984fb40..b1beb984fb40 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r5
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r6
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r3 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r3
deleted file mode 100644
index 7e8d028df131..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
-MD5 dc3fb1d8458682de8496a27b74e2859a gentoo-sources-2.4.26-r1.tar.bz2 1110843
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r4 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r5
index 9d4b3b51e408..9d4b3b51e408 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r4
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r5
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0497.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0497.patch
new file mode 100644
index 000000000000..9503e9efe57b
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0497.patch
@@ -0,0 +1,23 @@
+# ChangeSet
+#
+# fs/attr.c
+#   2004/07/03 18:28:30-03:00 marcelo@logos.cnet +1 -0
+#   Thomas Biege: Fix missing DAC check on sys_chown
+# 
+# fs/attr.c
+#   2004/07/03 19:28:29-03:00 marcelo@logos.cnet +1 -1
+#   Add missing bracket to inode_change_ok() fix
+# 
+diff -Nru a/fs/attr.c b.plasmaroo/fs/attr.c
+--- a/fs/attr.c	2004-07-08 17:05:20 -07:00
++++ b.plasmaroo/fs/attr.c	2004-07-08 17:05:20 -07:00
+@@ -35,7 +35,8 @@
+ 
+ 	/* Make sure caller can chgrp. */
+ 	if ((ia_valid & ATTR_GID) &&
+-	    (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid) &&
++	    (current->fsuid != inode->i_uid ||
++	    (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid)) &&
+ 	    !capable(CAP_CHOWN))
+ 		goto error;
+ 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r17.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r18.ebuild
index 59618fd0b51e..4927790fd168 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r17.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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-r17.ebuild,v 1.2 2004/06/24 22:56:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r18.ebuild,v 1.1 2004/07/09 15:03:35 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/17/10}.tar.bz2"
+	 http://gentoo.lostlogicx.com/patches-${KV/18/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/17/10}
+	cd ${KV/18/10}
 	# Kill patches we aren't suppposed to use, don't worry about 
 	# failures, if they aren't there that is a good thing!
 
@@ -78,5 +78,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
 }
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r20.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r21.ebuild
index 0fe027eea215..f91b758584d0 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r20.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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-r20.ebuild,v 1.2 2004/06/24 22:56:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r21.ebuild,v 1.1 2004/07/09 15:03:35 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/r20/r14}.tar.bz2"
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/r21/r14}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
 KEYWORDS="x86 -ppc -sparc -alpha -hppa -mips"
@@ -40,7 +40,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
 
-	cd ${WORKDIR}/${KV/r20/r14}
+	cd ${WORKDIR}/${KV/r21/r14}
 
 	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
 	if ! use aavm; then
@@ -137,6 +137,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.I2C_Limits.patch || die "Failed to patch the I2C i2cdev_ioctl() kmalloc() bug!"
 	epatch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r13.ebuild
index f5d9edffd8e8..9b04a8887ae4 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r12.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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-r12.ebuild,v 1.2 2004/06/24 22:56:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r13.ebuild,v 1.1 2004/07/09 15:03:35 plasmaroo Exp $
 
 ETYPE="sources"
 UNIPATCH_LIST="
@@ -16,9 +16,10 @@ UNIPATCH_LIST="
 	${FILESDIR}/${PN}-2.4.CAN-2004-0394.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0427.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0497.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch
 	${FILESDIR}/${PN}-2.4.FPULockup-53804.patch
-	${DISTDIR}/gentoo-sources-${PVR/12/5}.patch.bz2"
+	${DISTDIR}/gentoo-sources-${PVR/13/5}.patch.bz2"
 
 inherit kernel-2
 detect_version
@@ -27,7 +28,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/~iggy/gentoo-sources-${PVR/12/5}.patch.bz2"
+	http://dev.gentoo.org/~iggy/gentoo-sources-${PVR/13/5}.patch.bz2"
 KEYWORDS="x86 -*"
 SLOT="${KV}"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r6.ebuild
index 568f68dc2192..61c2588ab92b 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r5.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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-r5.ebuild,v 1.2 2004/06/24 22:56:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r6.ebuild,v 1.1 2004/07/09 15:03:35 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -16,6 +16,7 @@ UNIPATCH_LIST="
 	${FILESDIR}/${PN}-2.4.CAN-2004-0394.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0427.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0497.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch
 	${FILESDIR}/${PN}-2.4.FPULockup-53804.patch
 	${DISTDIR}/${P}.patch.bz2"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r4.ebuild
deleted file mode 100644
index 1015ab06be39..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r4.ebuild,v 1.1 2004/07/08 22:27:30 plasmaroo Exp $
-
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-KEYWORDS="~x86"
-UNIPATCH_LIST="${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch
-	${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch
-	${FILESDIR}/${PN}-2.4.FPULockup-53804.patch
-	${DISTDIR}/${P}-${PR}.tar.bz2"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${P}-${PR}.tar.bz2"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r5.ebuild
index 7ae3e284080c..5e89b09b52ef 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r3.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r3.ebuild,v 1.3 2004/06/25 15:23:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r5.ebuild,v 1.1 2004/07/09 15:03:35 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -8,9 +8,10 @@ detect_version
 
 KEYWORDS="x86"
 UNIPATCH_LIST="${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0497.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch
 	${FILESDIR}/${PN}-2.4.FPULockup-53804.patch
-	${DISTDIR}/${P}-${PR/r3/r1}.tar.bz2"
+	${DISTDIR}/${P}-${PR/r5/r4}.tar.bz2"
 
 DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${P}-${PR/r3/r1}.tar.bz2"
+SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${P}-${PR/r5/r4}.tar.bz2"