Version bumps for uclinux-sources; bug #47881.

13 files changed, 28 insertions, 349 deletions

diff --git a/sys-kernel/uclinux-sources/ChangeLog b/sys-kernel/uclinux-sources/ChangeLog
index feab96352044..feb98de7ee8a 100644
--- a/sys-kernel/uclinux-sources/ChangeLog
+++ b/sys-kernel/uclinux-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/uclinux-sources
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.7 2004/05/30 23:53:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.8 2004/06/02 14:22:00 plasmaroo Exp $
+
+*uclinux-sources-2.6.6_p0 (02 Jun 2004)
+
+  02 Jun 2004; <plasmaroo@gentoo.org> -uclinux-sources-2.4.24_p0-r2.ebuild,
+  +uclinux-sources-2.4.26_p0.ebuild, -uclinux-sources-2.6.5_p0-r1.ebuild,
+  +uclinux-sources-2.6.6_p0.ebuild,
+  +files/uclinux-sources-2.4.26_p0.CAN-2004-0394.patch:
+  Version bumps; bug #47881. Old versions removed.
 
   31 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   uclinux-sources-2.4.24_p0-r2.ebuild, uclinux-sources-2.6.5_p0-r1.ebuild:
diff --git a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.24_p0-r2 b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.24_p0-r2
deleted file mode 100644
index 1f752820c61e..000000000000
--- a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.24_p0-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
-MD5 cd8a3b23299305761c5b3b3f81dd017a uClinux-2.4.24-uc0.diff.gz 3762410
diff --git a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0 b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0
new file mode 100644
index 000000000000..130b229c980e
--- /dev/null
+++ b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0
@@ -0,0 +1,2 @@
+MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
+MD5 8c2a75543abe268ff71d59c85b7607ac uClinux-2.4.26-uc0.diff.gz 4062854
diff --git a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.5_p0-r1 b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.5_p0-r1
deleted file mode 100644
index d1c9ca4e12cf..000000000000
--- a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.5_p0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9a76bf64c1151369b250f967d83077aa linux-2.6.5.tar.bz2 34684611
-MD5 7e55c2a8f83460c8b7917abeb67a97c8 linux-2.6.5-uc0.patch.gz 61905
diff --git a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.6_p0 b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.6_p0
new file mode 100644
index 000000000000..19f5d1d1ba26
--- /dev/null
+++ b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.6_p0
@@ -0,0 +1,2 @@
+MD5 5218790bc3db41e77a7422969639a9ad linux-2.6.6.tar.bz2 34896138
+MD5 9eaa834dd12facf92f3ff4393c31e752 linux-2.6.6-uc0.patch.gz 189743
diff --git a/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.24_p0.CAN-2004-0010.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.24_p0.CAN-2004-0010.patch
deleted file mode 100644
index 6b4b1cefa49e..000000000000
--- a/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.24_p0.CAN-2004-0010.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-diff -urN linux-2.4.25-pre6/fs/ncpfs/dir.c linux-2.4.25-pre7/fs/ncpfs/dir.c
---- linux-2.4.25-pre6/fs/ncpfs/dir.c	2002-11-28 15:53:15.000000000 -0800
-+++ linux-2.4.25-pre7/fs/ncpfs/dir.c	2004-01-23 10:53:26.000000000 -0800
-@@ -266,8 +266,8 @@
- 	struct ncp_server *server;
- 	struct inode *dir = dentry->d_parent->d_inode;
- 	struct ncp_entry_info finfo;
--	int res, val = 0, len = dentry->d_name.len + 1;
--	__u8 __name[len];
-+	int res, val = 0, len;
-+	__u8 __name[NCP_MAXPATHLEN + 1];
- 
- 	if (!dentry->d_inode || !dir)
- 		goto finished;
-@@ -291,14 +291,15 @@
- 		dentry->d_parent->d_name.name, dentry->d_name.name,
- 		NCP_GET_AGE(dentry));
- 
-+	len = sizeof(__name);
- 	if (ncp_is_server_root(dir)) {
- 		res = ncp_io2vol(server, __name, &len, dentry->d_name.name,
--						len-1, 1);
-+						dentry->d_name.len, 1);
- 		if (!res)
- 			res = ncp_lookup_volume(server, __name, &(finfo.i));
- 	} else {
- 		res = ncp_io2vol(server, __name, &len, dentry->d_name.name,
--						len-1, !ncp_preserve_case(dir));
-+						dentry->d_name.len, !ncp_preserve_case(dir));
- 		if (!res)
- 			res = ncp_obtain_info(server, dir, __name, &(finfo.i));
- 	}
-@@ -548,9 +549,9 @@
- 	int valid = 0;
- 	int hashed = 0;
- 	ino_t ino = 0;
--	__u8 __name[256];
-+	__u8 __name[NCP_MAXPATHLEN + 1];
- 
--	qname.len = 256;
-+	qname.len = sizeof(__name);
- 	if (ncp_vol2io(NCP_SERVER(inode), __name, &qname.len,
- 			entry->i.entryName, entry->i.nameLen,
- 			!ncp_preserve_entry_case(inode, entry->i.NSCreator)))
-@@ -705,16 +706,19 @@
- {
- 	struct ncp_server* server = NCP_SBP(sb);
- 	struct nw_info_struct i;
--	int result, len = strlen(server->m.mounted_vol) + 1;
--	__u8 __name[len];
-+	int result;
- 
- 	if (ncp_single_volume(server)) {
-+		int len;
- 		struct dentry* dent;
-+		__u8 __name[NCP_MAXPATHLEN + 1];
- 
--		result = -ENOENT;
--		if (ncp_io2vol(server, __name, &len, server->m.mounted_vol,
--								len-1, 1))
-+		len = sizeof(__name);
-+		result = ncp_io2vol(server, __name, &len, server->m.mounted_vol,
-+				    strlen(server->m.mounted_vol), 1);
-+		if (result)
- 			goto out;
-+		result = -ENOENT;
- 		if (ncp_lookup_volume(server, __name, &i)) {
- 			PPRINTK("ncp_conn_logged_in: %s not found\n",
- 				server->m.mounted_vol);
-@@ -745,8 +749,8 @@
- 	struct ncp_server *server = NCP_SERVER(dir);
- 	struct inode *inode = NULL;
- 	struct ncp_entry_info finfo;
--	int error, res, len = dentry->d_name.len + 1;
--	__u8 __name[len];
-+	int error, res, len;
-+	__u8 __name[NCP_MAXPATHLEN + 1];
- 
- 	error = -EIO;
- 	if (!ncp_conn_valid(server))
-@@ -755,14 +759,15 @@
- 	PPRINTK("ncp_lookup: server lookup for %s/%s\n",
- 		dentry->d_parent->d_name.name, dentry->d_name.name);
- 
-+	len = sizeof(__name);
- 	if (ncp_is_server_root(dir)) {
- 		res = ncp_io2vol(server, __name, &len, dentry->d_name.name,
--						len-1, 1);
-+				 dentry->d_name.len, 1);
- 		if (!res)
- 			res = ncp_lookup_volume(server, __name, &(finfo.i));
- 	} else {
- 		res = ncp_io2vol(server, __name, &len, dentry->d_name.name,
--						len-1, !ncp_preserve_case(dir));
-+				 dentry->d_name.len, !ncp_preserve_case(dir));
- 		if (!res)
- 			res = ncp_obtain_info(server, dir, __name, &(finfo.i));
- 	}
-@@ -825,9 +830,9 @@
- {
- 	struct ncp_server *server = NCP_SERVER(dir);
- 	struct ncp_entry_info finfo;
--	int error, result, len = dentry->d_name.len + 1;
-+	int error, result, len;
- 	int opmode;
--	__u8 __name[len];
-+	__u8 __name[NCP_MAXPATHLEN + 1];
- 	
- 	PPRINTK("ncp_create_new: creating %s/%s, mode=%x\n",
- 		dentry->d_parent->d_name.name, dentry->d_name.name, mode);
-@@ -836,8 +841,9 @@
- 		goto out;
- 
- 	ncp_age_dentry(server, dentry);
-+	len = sizeof(__name);
- 	error = ncp_io2vol(server, __name, &len, dentry->d_name.name,
--						len-1, !ncp_preserve_case(dir));
-+			   dentry->d_name.len, !ncp_preserve_case(dir));
- 	if (error)
- 		goto out;
- 
-@@ -880,8 +886,8 @@
- {
- 	struct ncp_entry_info finfo;
- 	struct ncp_server *server = NCP_SERVER(dir);
--	int error, len = dentry->d_name.len + 1;
--	__u8 __name[len];
-+	int error, len;
-+	__u8 __name[NCP_MAXPATHLEN + 1];
- 
- 	DPRINTK("ncp_mkdir: making %s/%s\n",
- 		dentry->d_parent->d_name.name, dentry->d_name.name);
-@@ -890,8 +896,9 @@
- 		goto out;
- 
- 	ncp_age_dentry(server, dentry);
-+	len = sizeof(__name);
- 	error = ncp_io2vol(server, __name, &len, dentry->d_name.name,
--						len-1, !ncp_preserve_case(dir));
-+			   dentry->d_name.len, !ncp_preserve_case(dir));
- 	if (error)
- 		goto out;
- 
-@@ -909,8 +916,8 @@
- static int ncp_rmdir(struct inode *dir, struct dentry *dentry)
- {
- 	struct ncp_server *server = NCP_SERVER(dir);
--	int error, result, len = dentry->d_name.len + 1;
--	__u8 __name[len];
-+	int error, result, len;
-+	__u8 __name[NCP_MAXPATHLEN + 1];
- 
- 	DPRINTK("ncp_rmdir: removing %s/%s\n",
- 		dentry->d_parent->d_name.name, dentry->d_name.name);
-@@ -923,8 +930,9 @@
- 	if (!d_unhashed(dentry))
- 		goto out;
- 
-+	len = sizeof(__name);
- 	error = ncp_io2vol(server, __name, &len, dentry->d_name.name,
--						len-1, !ncp_preserve_case(dir));
-+			   dentry->d_name.len, !ncp_preserve_case(dir));
- 	if (error)
- 		goto out;
- 
-@@ -1022,9 +1030,8 @@
- {
- 	struct ncp_server *server = NCP_SERVER(old_dir);
- 	int error;
--	int old_len = old_dentry->d_name.len + 1;
--	int new_len = new_dentry->d_name.len + 1;
--	__u8 __old_name[old_len], __new_name[new_len];
-+	int old_len, new_len;
-+	__u8 __old_name[NCP_MAXPATHLEN + 1], __new_name[NCP_MAXPATHLEN + 1];
- 
- 	DPRINTK("ncp_rename: %s/%s to %s/%s\n",
- 		old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
-@@ -1037,15 +1044,17 @@
- 	ncp_age_dentry(server, old_dentry);
- 	ncp_age_dentry(server, new_dentry);
- 
-+	old_len = sizeof(__old_name);
- 	error = ncp_io2vol(server, __old_name, &old_len,
--					old_dentry->d_name.name, old_len-1,
--					!ncp_preserve_case(old_dir));
-+			   old_dentry->d_name.name, old_dentry->d_name.len,
-+			   !ncp_preserve_case(old_dir));
- 	if (error)
- 		goto out;
- 
-+	new_len = sizeof(__new_name);
- 	error = ncp_io2vol(server, __new_name, &new_len,
--					new_dentry->d_name.name, new_len-1,
--					!ncp_preserve_case(new_dir));
-+			   new_dentry->d_name.name, new_dentry->d_name.len,
-+			   !ncp_preserve_case(new_dir));
- 	if (error)
- 		goto out;
- 
-
diff --git a/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.24_p0.CAN-2004-0109.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.24_p0.CAN-2004-0109.patch
deleted file mode 100644
index d02b51c57fc6..000000000000
--- a/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.24_p0.CAN-2004-0109.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- 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/uclinux-sources/files/uclinux-sources-2.4.24_p0.CAN-2004-0177.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.24_p0.CAN-2004-0177.patch
deleted file mode 100644
index da6b7e190685..000000000000
--- a/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.24_p0.CAN-2004-0177.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- linux-2.4.26-pre3/fs/jbd/journal.c	2004-02-18 05:36:31.000000000 -0800
-+++ linux-2.4.26-pre4/fs/jbd/journal.c	2004-03-16 09:59:36.000000000 -0800
-@@ -671,6 +671,7 @@
- 
- 	bh = getblk(journal->j_dev, blocknr, journal->j_blocksize);
- 	lock_buffer(bh);
-+	memset(bh->b_data, 0, journal->j_blocksize);
- 	BUFFER_TRACE(bh, "return this buffer");
- 	return journal_add_journal_head(bh);
- }
diff --git a/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.24_p0.CAN-2004-0178.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.24_p0.CAN-2004-0178.patch
deleted file mode 100644
index 19e57268c2fa..000000000000
--- a/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.24_p0.CAN-2004-0178.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.4.26-pre2/drivers/sound/sb_audio.c	2002-02-25 11:38:06.000000000 -0800
-+++ linux-2.4.26-pre3/drivers/sound/sb_audio.c	2004-03-13 07:43:23.000000000 -0800
-@@ -879,7 +879,7 @@
- 			c -= locallen; p += locallen;
- 		}
- 		/* used = ( samples * 16 bits size ) */
--		*used = len << 1;
-+		*used =  max_in  > ( max_out << 1) ? (max_out << 1) : max_in;
- 		/* returned = ( samples * 8 bits size ) */
- 		*returned = len;
- 	}
diff --git a/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.24_p0.munmap.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.24_p0.munmap.patch
deleted file mode 100644
index e120b35b7adb..000000000000
--- a/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.24_p0.munmap.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/uclinux-sources/files/uclinux-sources-2.4.26_p0.CAN-2004-0394.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.26_p0.CAN-2004-0394.patch
new file mode 100644
index 000000000000..273f1a52046f
--- /dev/null
+++ b/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.26_p0.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/uclinux-sources/uclinux-sources-2.4.24_p0-r2.ebuild b/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0.ebuild
index bb980c8b1bd6..23d9fe6dfe9e 100644
--- a/sys-kernel/uclinux-sources/uclinux-sources-2.4.24_p0-r2.ebuild
+++ b/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0.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/uclinux-sources/uclinux-sources-2.4.24_p0-r2.ebuild,v 1.2 2004/05/30 23:53:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0.ebuild,v 1.1 2004/06/02 14:22:00 plasmaroo Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ EXTRAVERSION="uc${PV/*_p/}"
 [ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
 KV="${OKV}-${EXTRAVERSION}"
 
-#Get the major & minor kernel version
+# Get the major & minor kernel version
 MMV=`echo $PV | awk -F. '{print $1"."$2}'`
 
 patch="diff"
@@ -44,11 +44,7 @@ src_unpack() {
 	unset ARCH
 	rm ../${MY_P/linux/${base}}.${patch}
 
-	epatch ${FILESDIR}/${P}.munmap.patch || die "Failed to apply munmap patch!"
-	epatch ${FILESDIR}/${P}.CAN-2004-0010.patch || die "Failed to add the CAN-2004-0010 patch!"
-	epatch ${FILESDIR}/${P}.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
-	epatch ${FILESDIR}/${P}.CAN-2004-0177.patch || die "Failed to add the CAN-2004-0177 patch!"
-	epatch ${FILESDIR}/${P}.CAN-2004-0178.patch || die "Failed to add the CAN-2004-0178 patch!"
+	epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
 
 	kernel_universal_unpack
 	set ARCH=${MY_ARCH}
diff --git a/sys-kernel/uclinux-sources/uclinux-sources-2.6.5_p0-r1.ebuild b/sys-kernel/uclinux-sources/uclinux-sources-2.6.6_p0.ebuild
index cb83a6e22a09..5e971f7a9dc4 100644
--- a/sys-kernel/uclinux-sources/uclinux-sources-2.6.5_p0-r1.ebuild
+++ b/sys-kernel/uclinux-sources/uclinux-sources-2.6.6_p0.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/uclinux-sources/uclinux-sources-2.6.5_p0-r1.ebuild,v 1.2 2004/05/30 23:53:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/uclinux-sources-2.6.6_p0.ebuild,v 1.1 2004/06/02 14:22:00 plasmaroo Exp $
 
 IUSE=""
 
@@ -43,7 +43,6 @@ src_unpack() {
 	set MY_ARCH=${ARCH}
 	unset ARCH
 	rm ../${MY_P/linux/${base}}.${patch}
-	epatch ${FILESDIR}/${P}.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
 
 	kernel_universal_unpack
 	set ARCH=${MY_ARCH}