Added patches for the CAN-2004-0133, CAN-2004-0181, CAN-2004-0394, and CAN-2004-0427 vulnerabilities. Bug #47881. Old versions of sources removed.

25 files changed, 165 insertions, 555 deletions

diff --git a/sys-kernel/xfs-sources/ChangeLog b/sys-kernel/xfs-sources/ChangeLog
index 7047af79f6d8..4d0fcdfde534 100644
--- a/sys-kernel/xfs-sources/ChangeLog
+++ b/sys-kernel/xfs-sources/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-kernel/xfs-sources
 # Copyright 1999-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.46 2004/04/27 22:13:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.47 2004/06/04 15:54:18 plasmaroo Exp $
+
+*xfs-sources-2.4.24-r6 (04 Jun 2004)
+
+  04 Jun 2004; <plasmaroo@gentoo.org> -xfs-sources-2.4.19-r3.ebuild,
+  -xfs-sources-2.4.20-r1.ebuild, -xfs-sources-2.4.20-r2.ebuild,
+  -xfs-sources-2.4.20-r3.ebuild, -xfs-sources-2.4.20-r4.ebuild,
+  -xfs-sources-2.4.20-r5.ebuild, -xfs-sources-2.4.20.ebuild,
+  -xfs-sources-2.4.23-r1.ebuild, +xfs-sources-2.4.24-r6.ebuild,
+  +files/xfs-sources.CAN-2004-...patch:
+  Added patches for the CAN-2004-0075, CAN-2004-0133, CAN-2004-0181,
+  CAN-2004-0394, and CAN-2004-0427 vulnerabilities. Bug #47881. Old versions of
+  sources removed.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
   xfs-sources-2.4.19-r3.ebuild, xfs-sources-2.4.20-r1.ebuild,
@@ -8,7 +20,7 @@
   xfs-sources-2.4.20-r4.ebuild, xfs-sources-2.4.20-r5.ebuild,
   xfs-sources-2.4.20.ebuild, xfs-sources-2.4.23-r1.ebuild,
   xfs-sources-2.4.24-r2.ebuild:
-  Add inherit eutils
+  Add inherit eutils.
 
 *xfs-sources-2.4.24-r5 (17 Apr 2004)
 
diff --git a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.19-r3 b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.19-r3
deleted file mode 100644
index d791ee61576a..000000000000
--- a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.19-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2bb60b7594a416f2c593923ce446160b linux-2.4.19.tar.bz2 26042494
-MD5 eb93e496ea32cc6f1a90313bfbe20e67 patches-2.4.19-xfs-r2.tar.bz2 2497829
diff --git a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20 b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20
deleted file mode 100644
index 2693ae828287..000000000000
--- a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 7805a6fda090743d995e1f679dfc3058 patches-2.4.20-xfs.tar.bz2 3012141
diff --git a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20-r1 b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20-r1
deleted file mode 100644
index cc1f3d4eb2a8..000000000000
--- a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 0c5a3cacdc4c08d163718d00bbb16f75 patches-2.4.20-xfs-r1.tar.bz2 3014493
diff --git a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20-r2 b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20-r2
deleted file mode 100644
index 7acc40be3a94..000000000000
--- a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 46a28adb44039f6a9d599efa5d91fe4f patches-2.4.20-xfs-r2.tar.bz2 3006567
diff --git a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20-r3 b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20-r3
deleted file mode 100644
index b2e2064cc396..000000000000
--- a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 56b5aa9df07831f541baaefb927086f9 patches-2.4.20-xfs-r3.tar.bz2 3303544
diff --git a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20-r4 b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20-r4
deleted file mode 100644
index b2e2064cc396..000000000000
--- a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 56b5aa9df07831f541baaefb927086f9 patches-2.4.20-xfs-r3.tar.bz2 3303544
diff --git a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20-r5 b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20-r5
deleted file mode 100644
index b2e2064cc396..000000000000
--- a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 56b5aa9df07831f541baaefb927086f9 patches-2.4.20-xfs-r3.tar.bz2 3303544
diff --git a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.23-r1 b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.23-r1
deleted file mode 100644
index e8b0d47bcf65..000000000000
--- a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.23-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 642af5ab5e1fc63685fde85e9ae601e4 linux-2.4.23.tar.bz2 29832609
-MD5 832536656afe8784d23fb7eb64771591 xfs-sources-2.4.23.patch.bz2 1652549
diff --git a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.24-r6 b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.24-r6
new file mode 100644
index 000000000000..981a129bcbef
--- /dev/null
+++ b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.24-r6
@@ -0,0 +1,2 @@
+MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
+MD5 572ff310d39ce7fd20568bf27299ded8 xfs-sources-2.4.24-r3.patch.bz2 1718289
diff --git a/sys-kernel/xfs-sources/files/xfs-sources.CAN-2004-0075.patch b/sys-kernel/xfs-sources/files/xfs-sources.CAN-2004-0075.patch
new file mode 100644
index 000000000000..5c397deb9c46
--- /dev/null
+++ b/sys-kernel/xfs-sources/files/xfs-sources.CAN-2004-0075.patch
@@ -0,0 +1,25 @@
+--- linux-2.4.23/drivers/usb/vicam.c	2004-01-26 16:56:32.000000000 +0000
++++ linux-2.4.25/drivers/usb/vicam.c	2004-04-20 18:15:53.000000000 +0100
+@@ -601,12 +601,19 @@
+ 	case VIDIOCSWIN:
+ 		{
+ 
+-			struct video_window *vw = (struct video_window *) arg;
+-			DBG("VIDIOCSWIN %d x %d\n", vw->width, vw->height);
++			struct video_window vw;
+ 
+-			if ( vw->width != 320 || vw->height != 240 )
++			if (copy_from_user(&vw, arg, sizeof(vw)))
++			{
+ 				retval = -EFAULT;
++				break;
++			}
++
++			DBG("VIDIOCSWIN %d x %d\n", vw->width, vw->height);
+ 			
++			if ( vw.width != 320 || vw.height != 240 )
++				retval = -EFAULT;
++
+ 			break;
+ 		}
+ 
diff --git a/sys-kernel/xfs-sources/files/xfs-sources.CAN-2004-0133.patch b/sys-kernel/xfs-sources/files/xfs-sources.CAN-2004-0133.patch
new file mode 100644
index 000000000000..c756bc328bf2
--- /dev/null
+++ b/sys-kernel/xfs-sources/files/xfs-sources.CAN-2004-0133.patch
@@ -0,0 +1,11 @@
+--- linux-2.4.22/fs/xfs/xfs_log.c.can-2004-0133	2004-03-23 12:28:11.000000000 -0700
++++ linux-2.4.22/fs/xfs/xfs_log.c	2004-03-23 12:58:59.000000000 -0700
+@@ -1251,7 +1251,7 @@
+ 			  kmem_zalloc(sizeof(xlog_in_core_t), KM_SLEEP);
+ 		iclog = *iclogp;
+ 		iclog->hic_data = (xlog_in_core_2_t *)
+-			  kmem_alloc(iclogsize, KM_SLEEP);
++			  kmem_zalloc(iclogsize, KM_SLEEP);
+ 
+ 		iclog->ic_prev = prev_iclog;
+ 		prev_iclog = iclog;
diff --git a/sys-kernel/xfs-sources/files/xfs-sources.CAN-2004-0181.patch b/sys-kernel/xfs-sources/files/xfs-sources.CAN-2004-0181.patch
new file mode 100644
index 000000000000..5f7f1441b268
--- /dev/null
+++ b/sys-kernel/xfs-sources/files/xfs-sources.CAN-2004-0181.patch
@@ -0,0 +1,38 @@
+--- linux-2.4.22/fs/jfs/jfs_logmgr.c.jfs-sec	2004-03-23 12:30:35.000000000 -0700
++++ linux-2.4.22/fs/jfs/jfs_logmgr.c	2004-03-23 13:01:51.000000000 -0700
+@@ -1693,7 +1693,7 @@
+ 		if (lbuf == 0)
+ 			goto error;
+ 		lbuf->l_bh.b_data = lbuf->l_ldata =
+-		    (char *) __get_free_page(GFP_KERNEL);
++		    (char *) get_zeroed_page(GFP_KERNEL);
+ 		if (lbuf->l_ldata == 0) {
+ 			kfree(lbuf);
+ 			goto error;
+--- linux-2.4.22/fs/jfs/jfs_metapage.c.jfs-sec	2004-03-23 12:30:48.000000000 -0700
++++ linux-2.4.22/fs/jfs/jfs_metapage.c	2004-03-23 13:01:51.000000000 -0700
+@@ -375,6 +375,10 @@
+ 		}
+ 		mp->data = kmap(mp->page) + page_offset;
+ 	}
++
++	if (new)
++		memset(mp->data, 0, PSIZE);
++
+ 	jfs_info("__get_metapage: returning = 0x%p", mp);
+ 	return mp;
+ 
+--- linux-2.4.22/fs/jfs/super.c.jfs-sec	2004-03-23 12:31:10.000000000 -0700
++++ linux-2.4.22/fs/jfs/super.c	2004-03-23 13:01:51.000000000 -0700
+@@ -423,10 +423,10 @@
+ 
+ 	if ((flags & (SLAB_CTOR_VERIFY | SLAB_CTOR_CONSTRUCTOR)) ==
+ 	    SLAB_CTOR_CONSTRUCTOR) {
++		memset(jfs_ip, 0, sizeof(struct jfs_inode_info));
+ 		INIT_LIST_HEAD(&jfs_ip->anon_inode_list);
+ 		init_rwsem(&jfs_ip->rdwrlock);
+ 		init_MUTEX(&jfs_ip->commit_sem);
+-		jfs_ip->atlhead = 0;
+ 		jfs_ip->active_ag = -1;
+ 	}
+ }
diff --git a/sys-kernel/xfs-sources/files/xfs-sources.CAN-2004-0394.patch b/sys-kernel/xfs-sources/files/xfs-sources.CAN-2004-0394.patch
new file mode 100644
index 000000000000..273f1a52046f
--- /dev/null
+++ b/sys-kernel/xfs-sources/files/xfs-sources.CAN-2004-0394.patch
@@ -0,0 +1,11 @@
+--- linux-2.4.22-oM3-orig/kernel/panic.c	Tue Mar 30 15:37:18 2004
++++ linux-2.4.22-oM3-mod/kernel/panic.c	Mon May 17 18:44:01 2004
+@@ -51,7 +51,7 @@
+ 
+ 	bust_spinlocks(1);
+ 	va_start(args, fmt);
+-	vsprintf(buf, fmt, args);
++	vsnprintf(buf, sizeof(buf), fmt, args);
+ 	va_end(args);
+ 	printk(KERN_EMERG "Kernel panic: %s\n",buf);
+ 	if (in_interrupt())
diff --git a/sys-kernel/xfs-sources/files/xfs-sources.CAN-2004-0427.patch b/sys-kernel/xfs-sources/files/xfs-sources.CAN-2004-0427.patch
new file mode 100644
index 000000000000..ddc9610f67f8
--- /dev/null
+++ b/sys-kernel/xfs-sources/files/xfs-sources.CAN-2004-0427.patch
@@ -0,0 +1,14 @@
+diff -Nar -U 4 linux-2.4.25/kernel/fork.c linux-2.4.25-new/kernel/fork.c
+--- linux-2.4.25/kernel/fork.c	2004-02-18 05:36:32.000000000 -0800
++++ linux-2.4.25-new/kernel/fork.c	2004-04-07 17:43:29.000000000 -0700
+@@ -825,8 +825,10 @@
+ bad_fork_cleanup_namespace:
+ 	exit_namespace(p);
+ bad_fork_cleanup_mm:
+ 	exit_mm(p);
++	if (p->active_mm)
++		mmdrop(p->active_mm);
+ bad_fork_cleanup_sighand:
+ 	exit_sighand(p);
+ bad_fork_cleanup_fs:
+ 	exit_fs(p); /* blocking */
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.19-r3.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.19-r3.ebuild
deleted file mode 100644
index d7e8e2bfaaf5..000000000000
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.19-r3.ebuild
+++ /dev/null
@@ -1,62 +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/xfs-sources/xfs-sources-2.4.19-r3.ebuild,v 1.2 2004/04/27 22:13:39 agriffis Exp $
-
-IUSE="build crypt"
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
-# *evms*).  Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
-# This kernel also has support for the local USE flag acpi4linux which
-# activates the latest code from acpi.sourceforge.net instead of the
-# very out of date vanilla version
-
-ETYPE="sources"
-
-inherit kernel eutils
-OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
-EXTRAVERSION="-${PN/-*/}"
-[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
-KV="${OKV}${EXTRAVERSION}"
-
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/lolo-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="Full sources for the XFS Specialized Gentoo Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://gentoo.lostlogicx.com/patches-${KV/${PR}/r2}.tar.bz2"
-KEYWORDS="x86 -ppc -sparc "
-SLOT="${KV}"
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-
-	cd ${KV}
-	# Kill patches we aren't suppposed to use, don't worry about 
-	# failures, if they aren't there that is a good thing!
-
-	# This is the ratified crypt USE flag, enables IPSEC and patch-int
-	[ `use crypt` ] || rm 8*
-
-	# This is the latest release of ACPI from 
-	# http://www.sourceforge.net/projects/acpi	
-	[ `use acpi4linux` ] || rm 70*
-
-	cd ${S}
-	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!"
-	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
-	epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
-
-	kernel_src_unpack
-}
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r1.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r1.ebuild
deleted file mode 100644
index 90c0a08e59c0..000000000000
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r1.ebuild
+++ /dev/null
@@ -1,69 +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/xfs-sources/xfs-sources-2.4.20-r1.ebuild,v 1.9 2004/04/27 22:13:39 agriffis Exp $
-
-IUSE="build crypt"
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
-# *evms*).  Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
-ETYPE="sources"
-
-inherit kernel eutils
-OKV=2.4.20
-EXTRAVERSION=-xfs-r1
-KV=${OKV}${EXTRAVERSION}
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/xfs-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="Full sources for the XFS Specialized Gentoo Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 mirror://gentoo/patches-${KV}.tar.bz2"
-KEYWORDS="~x86 -ppc -sparc "
-SLOT="${KV}"
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-
-	cd ${KV}
-	# Kill patches we aren't suppposed to use, don't worry about
-	# failures, if they aren't there that is a good thing!
-
-	# If the compiler isn't gcc3 drop the gcc3 patches
-	if [[ "${COMPILER}" == "gcc3" ]];then
-		einfo "You are using gcc3, check out the special"
-		einfo "processor types just for you"
-	else
-		einfo "Your compiler is not gcc3, dropping patches..."
-		for file in *gcc3*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	fi
-
-	# This is the ratified crypt USE flag, enables IPSEC and patch-int
-	if [ -z "`use crypt`" ]; then
-		einfo "No Cryptographic support, dropping patches..."
-		for file in 8*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Cryptographic support enabled..."
-	fi
-
-	#IMPORTANT! Root Exploit!
-	epatch ${FILESDIR}/do_brk_fix.patch
-	kernel_src_unpack
-}
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r2.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r2.ebuild
deleted file mode 100644
index 504ae0549eb8..000000000000
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r2.ebuild
+++ /dev/null
@@ -1,71 +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/xfs-sources/xfs-sources-2.4.20-r2.ebuild,v 1.10 2004/04/27 22:13:39 agriffis Exp $
-
-IUSE="build crypt"
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
-# *evms*).  Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
-ETYPE="sources"
-
-inherit kernel eutils
-OKV=2.4.20
-EXTRAVERSION=-xfs-r2
-KV=${OKV}${EXTRAVERSION}
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/xfs-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="Full sources for the XFS Specialized Gentoo Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 mirror://gentoo/patches-${KV}.tar.bz2"
-KEYWORDS="x86 -ppc -sparc "
-SLOT="${KV}"
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-
-	cd ${KV}
-	# Kill patches we aren't suppposed to use, don't worry about
-	# failures, if they aren't there that is a good thing!
-
-	# If the compiler isn't gcc3 drop the gcc3 patches
-	if [[ "${COMPILER}" == "gcc3" ]];then
-		einfo "You are using gcc3, check out the special"
-		einfo "processor types just for you"
-	else
-		einfo "Your compiler is not gcc3, dropping patches..."
-		for file in *gcc3*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	fi
-
-	# This is the ratified crypt USE flag, enables IPSEC and patch-int
-	if [ -z "`use crypt`" ]; then
-		einfo "No Cryptographic support, dropping patches..."
-		for file in 8*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Cryptographic support enabled..."
-	fi
-
-	kernel_src_unpack
-
-	cd ${S}
-	#IMPORTANT! Root Exploit!
-	epatch ${FILESDIR}/do_brk_fix.patch
-}
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild
deleted file mode 100644
index 9fd4eb7ab1b9..000000000000
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild
+++ /dev/null
@@ -1,74 +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/xfs-sources/xfs-sources-2.4.20-r3.ebuild,v 1.11 2004/04/27 22:13:39 agriffis Exp $
-
-IUSE="build crypt"
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
-# *evms*).  Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
-ETYPE="sources"
-
-inherit kernel eutils
-OKV=2.4.20
-EXTRAVERSION=-xfs-r3
-KV=${OKV}${EXTRAVERSION}
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/xfs-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="Full sources for the XFS Specialized Gentoo Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 mirror://gentoo/patches-${KV}.tar.bz2"
-KEYWORDS="x86 -ppc -sparc "
-SLOT="${KV}"
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-
-	cd ${KV}
-	# Kill patches we aren't suppposed to use, don't worry about
-	# failures, if they aren't there that is a good thing!
-
-	# If the compiler isn't gcc3 drop the gcc3 patches
-	if [[ "${COMPILER}" == "gcc3" ]];then
-		einfo "You are using gcc3, check out the special"
-		einfo "processor types just for you"
-	else
-		einfo "Your compiler is not gcc3, dropping patches..."
-		for file in *gcc3*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	fi
-
-	# This is the ratified crypt USE flag, enables IPSEC and patch-int
-	if [ -z "`use crypt`" ]; then
-		einfo "No Cryptographic support, dropping patches..."
-		for file in 8*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Cryptographic support enabled..."
-	fi
-
-	kernel_src_unpack
-
-	#IMPORTANT! Root Exploit!
-	cd ${S}
-	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
-
-	epatch ${FILESDIR}/xfs-sources-2.4.20-gcc33.patch
-
-}
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r4.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r4.ebuild
deleted file mode 100644
index 67e13d41c908..000000000000
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r4.ebuild
+++ /dev/null
@@ -1,73 +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/xfs-sources/xfs-sources-2.4.20-r4.ebuild,v 1.3 2004/04/27 22:13:39 agriffis Exp $
-
-IUSE="build crypt"
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
-# *evms*).  Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
-ETYPE="sources"
-
-inherit kernel eutils
-OKV=2.4.20
-EXTRAVERSION=-xfs-r4
-KV=${OKV}${EXTRAVERSION}
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/xfs-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="Full sources for the XFS Specialized Gentoo Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 mirror://gentoo/patches-${KV/-r4/-r3}.tar.bz2"
-KEYWORDS="x86 -ppc -sparc "
-SLOT="${KV}"
-
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/${KV/-r4/-r3} ${WORKDIR}/${KV}
-	mv linux-${OKV} linux-${KV} || die
-
-	cd ${KV}
-	# Kill patches we aren't suppposed to use, don't worry about
-	# failures, if they aren't there that is a good thing!
-
-	# If the compiler isn't gcc3 drop the gcc3 patches
-	if [[ "${COMPILER}" == "gcc3" ]];then
-		einfo "You are using gcc3, check out the special"
-		einfo "processor types just for you"
-	else
-		einfo "Your compiler is not gcc3, dropping patches..."
-		for file in *gcc3*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	fi
-
-	# This is the ratified crypt USE flag, enables IPSEC and patch-int
-	if [ -z "`use crypt`" ]; then
-		einfo "No Cryptographic support, dropping patches..."
-		for file in 8*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Cryptographic support enabled..."
-	fi
-
-	kernel_src_unpack
-
-	cd ${S}
-	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
-	epatch ${FILESDIR}/xfs-sources-2.4.20-gcc33.patch
-
-}
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r5.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r5.ebuild
deleted file mode 100644
index 236e0b22818e..000000000000
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r5.ebuild
+++ /dev/null
@@ -1,75 +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/xfs-sources/xfs-sources-2.4.20-r5.ebuild,v 1.2 2004/04/27 22:13:39 agriffis Exp $
-
-IUSE="build crypt"
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
-# *evms*).  Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
-ETYPE="sources"
-
-inherit kernel eutils
-OKV=2.4.20
-EXTRAVERSION=-xfs-r5
-KV=${OKV}${EXTRAVERSION}
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/xfs-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="Full sources for the XFS Specialized Gentoo Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 mirror://gentoo/patches-${KV/${PR}/r3}.tar.bz2"
-KEYWORDS="x86 -ppc -sparc "
-SLOT="${KV}"
-
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/${KV/${PR}/r3} ${WORKDIR}/${KV}
-	mv linux-${OKV} linux-${KV} || die
-
-	cd ${KV}
-	# Kill patches we aren't suppposed to use, don't worry about
-	# failures, if they aren't there that is a good thing!
-
-	# If the compiler isn't gcc3 drop the gcc3 patches
-	if [[ "${COMPILER}" == "gcc3" ]];then
-		einfo "You are using gcc3, check out the special"
-		einfo "processor types just for you"
-	else
-		einfo "Your compiler is not gcc3, dropping patches..."
-		for file in *gcc3*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	fi
-
-	# This is the ratified crypt USE flag, enables IPSEC and patch-int
-	if [ -z "`use crypt`" ]; then
-		einfo "No Cryptographic support, dropping patches..."
-		for file in 8*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Cryptographic support enabled..."
-	fi
-
-	kernel_src_unpack
-
-	cd ${S}
-	epatch ${FILESDIR}/xfs-sources-2.4.20-gcc33.patch
-	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!"
-	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
-	epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
-
-}
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20.ebuild
deleted file mode 100644
index 5558c4c91fb8..000000000000
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20.ebuild
+++ /dev/null
@@ -1,69 +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/xfs-sources/xfs-sources-2.4.20.ebuild,v 1.8 2004/04/27 22:13:39 agriffis Exp $
-
-IUSE="build crypt"
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
-# *evms*).  Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
-ETYPE="sources"
-
-inherit kernel eutils
-OKV=2.4.20
-EXTRAVERSION=-${P/-sources-2.4.20}
-KV=${OKV}${EXTRAVERSION}
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/xfs-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="Full sources for the XFS Specialized Gentoo Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 mirror://gentoo/patches-${KV}.tar.bz2"
-KEYWORDS="x86 -ppc -sparc "
-SLOT="${KV}"
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-
-	cd ${KV}
-	# Kill patches we aren't suppposed to use, don't worry about
-	# failures, if they aren't there that is a good thing!
-
-	# If the compiler isn't gcc3 drop the gcc3 patches
-	if [[ "${COMPILER}" == "gcc3" ]];then
-		einfo "You are using gcc3, check out the special"
-		einfo "processor types just for you"
-	else
-		einfo "Your compiler is not gcc3, dropping patches..."
-		for file in *gcc3*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	fi
-
-	# This is the ratified crypt USE flag, enables IPSEC and patch-int
-	if [ -z "`use crypt`" ]; then
-		einfo "No Cryptographic support, dropping patches..."
-		for file in 8*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Cryptographic support enabled..."
-	fi
-
-	#IMPORTANT! Root Exploit!
-	epatch ${FILESDIR}/do_brk_fix.patch
-	kernel_src_unpack
-}
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.23-r1.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.23-r1.ebuild
deleted file mode 100644
index a84c354ee449..000000000000
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.23-r1.ebuild
+++ /dev/null
@@ -1,42 +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/xfs-sources/xfs-sources-2.4.23-r1.ebuild,v 1.4 2004/04/27 22:13:39 agriffis Exp $
-
-ETYPE="sources"
-
-inherit kernel eutils
-OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
-EXTRAVERSION="-${PN/-*/}-${PR}"
-KV=${OKV}${EXTRAVERSION}
-
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/xfs-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="Full sources for the XFS Specialized Gentoo Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	http://dev.gentoo.org/~scox/kernels/v2.4/xfs-sources-${PV}.patch.bz2"
-
-KEYWORDS="~x86 -ppc -sparc "
-SLOT="${KV}"
-
-src_unpack() {
-
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-
-	cd linux-${KV}
-
-	bzcat ${DISTDIR}/xfs-sources-${PV}.patch.bz2 | patch -p1 \
-		|| die "Failed to patch kernel"
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
-	epatch ${FILESDIR}/${PN}-2.4.22.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
-
-	make mrproper || die "make mrproper failed"
-	kernel_universal_unpack
-
-}
-
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.24-r6.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.24-r6.ebuild
new file mode 100644
index 000000000000..7fdcd6912a35
--- /dev/null
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.24-r6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.24-r6.ebuild,v 1.1 2004/06/04 15:54:18 plasmaroo Exp $
+
+ETYPE="sources"
+
+inherit kernel eutils
+IUSE=""
+OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
+EXTRAVERSION="-${PN/-*/}-${PR}"
+KV=${OKV}${EXTRAVERSION}
+
+S=${WORKDIR}/linux-${KV}
+
+# Documentation on the patches contained in this kernel will be installed
+# to /usr/share/doc/xfs-sources-${PV}/patches.txt.gz
+
+DESCRIPTION="Full sources for the XFS Specialized Gentoo Linux kernel"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+	http://dev.gentoo.org/~scox/kernels/v2.4/xfs-sources-${PV}-r3.patch.bz2"
+
+KEYWORDS="x86 -ppc -sparc"
+SLOT="${KV}"
+
+src_unpack() {
+	unpack ${A}
+	mv linux-${OKV} linux-${KV} || die
+
+	cd linux-${KV}
+
+	bzcat ${DISTDIR}/xfs-sources-${PV}-r3.patch.bz2 | patch -p1 \
+		|| die "Failed to patch kernel"
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}.munmap.patch || die "Failed to apply munmap!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0010.patch || die "Failed to add the CAN-2004-0010 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0075.patch || die "Failed to add the CAN-2004-0075 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0109.patch || die "Failed to add the CAN-2004-0109 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0133.patch || die "Failed to add the CAN-2004-0133 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0177.patch || die "Failed to add the CAN-2004-0177 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0178.patch || die "Failed to add the CAN-2004-0178 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0181.patch || die "Failed to add the CAN-2004-0181 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!"
+
+	make mrproper || die "make mrproper failed"
+	kernel_universal_unpack
+}
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.24.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.24.ebuild
index b1abef5369fc..5f0c06a8f127 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.24.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.24.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/xfs-sources/xfs-sources-2.4.24.ebuild,v 1.1 2004/01/20 22:03:37 livewire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.24.ebuild,v 1.2 2004/06/04 15:54:18 plasmaroo Exp $
 
 ETYPE="sources"
 
@@ -18,7 +18,7 @@ DESCRIPTION="Full sources for the XFS Specialized Gentoo Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	http://dev.gentoo.org/~scox/kernels/v2.4/xfs-sources-${PV}.patch.bz2"
 
-KEYWORDS="~x86 -ppc -sparc "
+KEYWORDS="x86 -ppc -sparc "
 SLOT="${KV}"
 
 src_unpack() {