Added patches for the CAN-2004-0010, CAN-2004-0177 and CAN-2004-0178 vulnerabilities.

18 files changed, 263 insertions, 117 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index 0aa3a37da629..8344adceb676 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 Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.65 2004/04/15 21:34:08 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.66 2004/04/17 10:59:15 plasmaroo Exp $
+
+*gentoo-sources-2.4.25-r2 (17 Apr 2004)
+
+  17 Apr 2004; <plasmaroo@gentoo.org>
+  +files/gentoo-sources-2.4.CAN-2004-0010.patch,
+  +files/gentoo-sources-2.4.CAN-2004-0177.patch,
+  +files/gentoo-sources-2.4.CAN-2004-0178.patch,
+  +gentoo-sources-2.4.19-r13.ebuild, +gentoo-sources-2.4.20-r16.ebuild,
+  +gentoo-sources-2.4.22-r9.ebuild, +gentoo-sources-2.4.25-r2.ebuild:
+  Added patches for the CAN-2004-0010, CAN-2004-0177 and CAN-2004-0178
+  vulnerabilities. Some older revisions were removed.
 
 *gentoo-sources-2.4.20-r14 (15 Apr 2004)
 
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r12 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r13
index 19d991259834..19d991259834 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r12
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r13
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r15 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r16
index 0d9abd01d13b..0d9abd01d13b 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r15
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r16
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r4 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r4
deleted file mode 100644
index b38780227b68..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
-MD5 02b06dd3d60a16e2cc26f5b22341f392 gentoo-sources-2.4.22-r4.patch.bz2 3404273
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
deleted file mode 100644
index a564b8210a40..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r8
+++ /dev/null
@@ -1,2 +0,0 @@
-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.22-r7 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r9
index a564b8210a40..a564b8210a40 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r7
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r9
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
deleted file mode 100644
index b1beb984fb40..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-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/digest-gentoo-sources-2.4.25 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r2
index b1beb984fb40..b1beb984fb40 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r2
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0010.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0010.patch
new file mode 100644
index 000000000000..6b4b1cefa49e
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0010.patch
@@ -0,0 +1,200 @@
+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/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0177.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0177.patch
new file mode 100644
index 000000000000..da6b7e190685
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0177.patch
@@ -0,0 +1,10 @@
+--- 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/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0178.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0178.patch
new file mode 100644
index 000000000000..19e57268c2fa
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0178.patch
@@ -0,0 +1,11 @@
+--- 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/gentoo-sources/gentoo-sources-2.4.19-r12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r13.ebuild
index b6b4c7914990..1d1f34b1dced 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r12.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r13.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-r12.ebuild,v 1.1 2004/04/15 21:34:08 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r13.ebuild,v 1.1 2004/04/17 10:59:15 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/12/10}.tar.bz2"
+	 http://gentoo.lostlogicx.com/patches-${KV/13/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/12/10}
+	cd ${KV/13/10}
 	# Kill patches we aren't suppposed to use, don't worry about 
 	# failures, if they aren't there that is a good thing!
 
@@ -60,10 +60,13 @@ src_unpack() {
 	kernel_src_unpack
 
 	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}/lcall-DoS.patch || die "lcall-DoS patch failed"
+	epatch ${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!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2003-0985.patch || die "Failed to patch CAN-2003-0985 vulnerability!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0010.patch || die "Failed to add the CAN-2004-0010 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0177.patch || die "Failed to add the CAN-2004-0177 patch!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0178.patch || die "Failed to add the CAN-2004-0178 patch!"
 }
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r15.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r16.ebuild
index cc51c2cfde0b..df3a50395f8e 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r15.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r16.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-r15.ebuild,v 1.1 2004/04/15 21:34:08 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r16.ebuild,v 1.1 2004/04/17 10:59:15 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/15/14}.tar.bz2"
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/16/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/15/14}
+	cd ${WORKDIR}/${KV/16/14}
 
 	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
 	if [ -z "`use aavm`" ]; then
@@ -127,7 +127,10 @@ src_unpack() {
 	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to apply do_brk() fix!"
 	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-0010.patch || die "Failed to add the CAN-2004-0010 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0177.patch || die "Failed to add the CAN-2004-0177 patch!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0178.patch || die "Failed to add the CAN-2004-0178 patch!"
 	epatch ${FILESDIR}/${P}-rtc_fix.patch || die "Failed to apply RTC fix!"
 	epatch ${FILESDIR}/${P}-munmap.patch || die "Failed to apply munmap patch!"
 }
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r4.ebuild
deleted file mode 100644
index f558df8ff9d1..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r4.ebuild
+++ /dev/null
@@ -1,59 +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/gentoo-sources/gentoo-sources-2.4.22-r4.ebuild,v 1.5 2004/02/22 23:31:43 agriffis Exp $
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-
-inherit kernel
-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/gentoo-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="Full sources for the Gentoo Kernel."
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	http://dev.gentoo.org/~iggy/${PF}.patch.bz2"
-HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
-LICENSE="GPL-2"
-KEYWORDS="x86 -ppc -sparc -alpha -hppa -mips -amd64 -ia64"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack ${A}
-
-	mv linux-${OKV} linux-${KV} \
-		|| die "Error moving kernel source tree to linux-${KV}"
-
-	cd linux-${KV}
-
-	epatch ${DISTDIR}/${PF}.patch.bz2 \
-		|| die "Failed to patch kernel"
-
-	cd ${S}
-	sed -e '34s/#//' -i net/ipsec/Config.in
-	sed -e '13s/^/#/' -i net/ipsec/alg/Config.in
-
-	kernel_universal_unpack
-}
-
-pkg_postinst() {
-	kernel_pkg_postinst
-
-	echo
-	ewarn "If iptables/netfilter behaves abnormally, such as 'Invalid Argument',"
-	ewarn "you will need to re-emerge iptables to restore proper functionality."
-	echo
-	einfo "If there are issues with this kernel, search http://bugs.gentoo.org/ for an"
-	einfo "existing bug. Only create a new bug if you have not found one that matches"
-	einfo "your issue. It is best to do an advanced search as the initial search has a"
-	einfo "very low yield. Please assign your bugs to x86-kernel@gentoo.org."
-	echo
-	einfo "Please read the ChangeLog and associated docs for more information."
-}
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
deleted file mode 100644
index edc01bc60454..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r8.ebuild
+++ /dev/null
@@ -1,23 +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/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.22-r7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r9.ebuild
index aeff9b3a2fc2..c4115460425f 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r7.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r9.ebuild
@@ -1,20 +1,25 @@
 # 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-r7.ebuild,v 1.1 2004/02/18 17:15:14 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r9.ebuild,v 1.1 2004/04/17 10:59:15 plasmaroo Exp $
 
-UNIPATCH_LIST="${FILESDIR}/gentoo-sources-2.4.CAN-2004-0001.patch ${DISTDIR}/gentoo-sources-${PVR/7/5}.patch.bz2 ${FILESDIR}/gentoo-sources-2.4.munmap.patch"
 ETYPE="sources"
+UNIPATCH_LIST="
+	${FILESDIR}/${PN}-2.4.munmap.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0001.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0010.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0109.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0177.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0178.patch
+	${DISTDIR}/gentoo-sources-${PVR/9/5}.patch.bz2"
 
 inherit kernel-2
 detect_version
 
-#RESTRICT="nomirror"
-
 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/7/5}.patch.bz2"
+	http://dev.gentoo.org/~iggy/gentoo-sources-${PVR/9/5}.patch.bz2"
 KEYWORDS="x86 -*"
 SLOT="${KV}"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r2.ebuild
index 09ccba449822..ec9630d478d8 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r2.ebuild
@@ -1,13 +1,17 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r2.ebuild,v 1.1 2004/04/17 10:59:15 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"
+UNIPATCH_LIST="
+	${FILESDIR}/${PN}-2.4.CAN-2004-0109.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0177.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0178.patch
+	${DISTDIR}/${P}.patch.bz2"
 
 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"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25.ebuild
deleted file mode 100644
index d92385f44a9b..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25.ebuild
+++ /dev/null
@@ -1,13 +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/gentoo-sources/gentoo-sources-2.4.25.ebuild,v 1.2 2004/03/21 03:12:28 livewire Exp $
-
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-KEYWORDS="x86"
-UNIPATCH_LIST="${DISTDIR}/${P}.patch.bz2"
-
-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"