Added patches for the CAN-2004-0075, CAN-2004-0133, CAN-2004-0181, CAN-2004-0394, and CAN-2004-0427 vulnerabilities. Bug #47881.

28 files changed, 291 insertions, 417 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index dc51c8bfff1c..505bb3d85f58 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,14 @@
 # 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.68 2004/05/30 23:53:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.69 2004/06/01 16:45:42 plasmaroo Exp $
+
+*gentoo-sources-2.4.25-r3 (01 Jun 2004)
+
+  01 Jun 2004; <plasmaroo@gentoo.org> +gentoo-sources-2.4.19-r14.ebuild,
+  +gentoo-sources-2.4.20-r17.ebuild, +gentoo-sources-2.4.22-r10.ebuild,
+  +gentoo-sources-2.4.25-r3.ebuild, +files/gentoo-sources-2.4...patch:
+  Added patches for the CAN-2004-0075, CAN-2004-0133, CAN-2004-0181,
+  CAN-2004-0394, and CAN-2004-0427 vulnerabilities. Bug #47881.
 
   31 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   gentoo-sources-2.4.25-r2.ebuild:
@@ -9,7 +17,7 @@
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
   gentoo-sources-2.4.19-r13.ebuild, gentoo-sources-2.4.20-r16.ebuild,
   gentoo-sources-2.4.20-r7.ebuild, gentoo-sources-2.4.22-r3.ebuild:
-  Add inherit eutils
+  Add inherit eutils.
 
 *gentoo-sources-2.4.25-r2 (17 Apr 2004)
 
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r13 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r14
index 19d991259834..19d991259834 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r13
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r14
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r16 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r17
index 0d9abd01d13b..0d9abd01d13b 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r16
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r17
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r7 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r7
deleted file mode 100644
index ba471a1c8d80..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 197e927b5fc04c754b039998895b3039 patches-2.4.20-gentoo-r5.tar.bz2 4134962
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r5 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r10
index a564b8210a40..a564b8210a40 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r5
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r10
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r3 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r3
deleted file mode 100644
index b54246e2f830..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
-MD5 ccf2400476f47be4adaeda39541abebc gentoo-sources-2.4.22-r2.patch.bz2 3360209
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r9 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r9
deleted file mode 100644
index a564b8210a40..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r9
+++ /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.25-r2 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r3
index b1beb984fb40..b1beb984fb40 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r2
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r3
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26_pre3 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26_pre3
deleted file mode 100644
index 23f3dcf1efd4..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26_pre3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
-MD5 58f5196aca4e9e23fcf77222cff3eb94 gentoo-sources-2.4.26_pre3.patch.bz2 2258404
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26_pre5 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26_pre5
deleted file mode 100644
index dcb0403a9913..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26_pre5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
-MD5 ccea1f50afec616ef29d32440e179457 gentoo-sources-2.4.26_pre5.patch.bz2 2297080
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26_pre6 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26_pre6
deleted file mode 100644
index f8080e486fc0..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26_pre6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
-MD5 ccea1f50afec616ef29d32440e179457 gentoo-sources-2.4.26_pre5.patch.bz2 2297080
-MD5 3e547dcdefa3d2747964a8437d34372e gentoo-sources-pre5-pre6.bz2 26898
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.19-CAN-2004-0181.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.19-CAN-2004-0181.patch
new file mode 100644
index 000000000000..3d44c0fd0880
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.19-CAN-2004-0181.patch
@@ -0,0 +1,34 @@
+--- 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.20/fs/jfs/jfs_metapage.c	2002-11-28 23:53:15.000000000 +0000
++++ linux-2.4.20/fs/jfs/jfs_metapage.c.plasmaroo	2004-05-29 13:36:44.575503152 +0100
+@@ -379,6 +379,10 @@
+ 		}
+ 		mp->data = kmap(mp->page) + page_offset;
+ 	}
++
++	if(new)
++		memset(mp->data, 0, PSIZE);
++
+ 	jFYI(1, ("__get_metapage: returning = 0x%p\n", mp));
+ 	return mp;
+ 
+--- linux-2.4.20/fs/jfs/super.c	2002-11-28 23:53:15.000000000 +0000
++++ linux-2.4.20/fs/jfs/super.c.plasmaroo	2004-05-29 13:39:36.898306104 +0100
+@@ -373,6 +373,7 @@
+ 
+ 	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_LIST_HEAD(&jfs_ip->mp_list);
+ 		init_rwsem(&jfs_ip->rdwrlock);
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.19-rtc_fix.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.19-rtc_fix.patch
new file mode 100644
index 000000000000..00937f83623f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.19-rtc_fix.patch
@@ -0,0 +1,115 @@
+diff -ur linux-2.4.20-wolk4.9s/arch/cris/drivers/ds1302.c linux-2.4.20-wolk4.9s.plasmaroo/arch/cris/drivers/ds1302.c
+--- linux-2.4.20-wolk4.9s/arch/cris/drivers/ds1302.c	2004-01-05 23:33:45.000000000 +0000
++++ linux-2.4.20-wolk4.9s.plasmaroo/arch/cris/drivers/ds1302.c	2004-01-05 23:41:44.000000000 +0000
+@@ -315,6 +315,7 @@
+ 		{
+ 			struct rtc_time rtc_tm;
+ 						
++			memset(&rtc_tm, 0, sizeof (struct rtc_time));
+ 			get_rtc_time(&rtc_tm);						
+ 			if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time)))
+ 				return -EFAULT;	
+diff -ur linux-2.4.20-wolk4.9s/arch/m68k/bvme6000/rtc.c linux-2.4.20-wolk4.9s.plasmaroo/arch/m68k/bvme6000/rtc.c
+--- linux-2.4.20-wolk4.9s/arch/m68k/bvme6000/rtc.c	2004-01-05 23:33:45.000000000 +0000
++++ linux-2.4.20-wolk4.9s.plasmaroo/arch/m68k/bvme6000/rtc.c	2004-01-05 23:43:15.000000000 +0000
+@@ -54,6 +54,7 @@
+ 		/* Ensure clock and real-time-mode-register are accessible */
+ 		msr = rtc->msr & 0xc0;
+ 		rtc->msr = 0x40;
++		memset(&wtime, 0, sizeof (struct rtc_time));
+ 		do {
+ 			wtime.tm_sec =  BCD2BIN(rtc->bcd_sec);
+ 			wtime.tm_min =  BCD2BIN(rtc->bcd_min);
+diff -ur linux-2.4.20-wolk4.9s/arch/m68k/mvme16x/rtc.c linux-2.4.20-wolk4.9s.plasmaroo/arch/m68k/mvme16x/rtc.c
+--- linux-2.4.20-wolk4.9s/arch/m68k/mvme16x/rtc.c	2004-01-05 23:33:45.000000000 +0000
++++ linux-2.4.20-wolk4.9s.plasmaroo/arch/m68k/mvme16x/rtc.c	2004-01-05 23:44:02.000000000 +0000
+@@ -52,6 +52,7 @@
+ 		cli();
+ 		/* Ensure clock and real-time-mode-register are accessible */
+ 		rtc->ctrl = RTC_READ;
++		memset(&wtime, 0, sizeof (struct rtc_time));
+ 		wtime.tm_sec =  BCD2BIN(rtc->bcd_sec);
+ 		wtime.tm_min =  BCD2BIN(rtc->bcd_min);
+ 		wtime.tm_hour = BCD2BIN(rtc->bcd_hr);
+diff -ur linux-2.4.20-wolk4.9s/arch/ppc64/kernel/rtc.c linux-2.4.20-wolk4.9s.plasmaroo/arch/ppc64/kernel/rtc.c
+--- linux-2.4.20-wolk4.9s/arch/ppc64/kernel/rtc.c	2004-01-05 23:33:45.000000000 +0000
++++ linux-2.4.20-wolk4.9s.plasmaroo/arch/ppc64/kernel/rtc.c	2004-01-05 23:44:34.000000000 +0000
+@@ -96,6 +96,7 @@
+ 	switch (cmd) {
+ 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
+ 	{
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		ppc_md.get_rtc_time(&wtime);
+ 		break;
+ 	}
+diff -ur linux-2.4.20-wolk4.9s/drivers/char/efirtc.c linux-2.4.20-wolk4.9s.plasmaroo/drivers/char/efirtc.c
+--- linux-2.4.20-wolk4.9s/drivers/char/efirtc.c	2004-01-05 23:33:45.000000000 +0000
++++ linux-2.4.20-wolk4.9s.plasmaroo/drivers/char/efirtc.c	2004-01-05 23:47:53.000000000 +0000
+@@ -118,6 +118,7 @@
+ static void
+ convert_from_efi_time(efi_time_t *eft, struct rtc_time *wtime)
+ {
++	memset(wtime, 0, sizeof(struct rtc_time));
+ 	wtime->tm_sec  = eft->second;
+ 	wtime->tm_min  = eft->minute;
+ 	wtime->tm_hour = eft->hour;
+diff -ur linux-2.4.20-wolk4.9s/drivers/char/rtc.c linux-2.4.20-wolk4.9s.plasmaroo/drivers/char/rtc.c
+--- linux-2.4.20-wolk4.9s/drivers/char/rtc.c	2004-01-05 23:33:45.000000000 +0000
++++ linux-2.4.20-wolk4.9s.plasmaroo/drivers/char/rtc.c	2004-01-05 23:52:43.000000000 +0000
+@@ -370,6 +370,7 @@
+ 		 * tm_min, and tm_sec values are filled in.
+ 		 */
+ 
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		get_rtc_alm_time(&wtime);
+ 		break; 
+ 	}
+@@ -417,6 +418,7 @@
+ 	}
+ 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
+ 	{
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		get_rtc_time(&wtime);
+ 		break;
+ 	}
+diff -ur linux-2.4.20-wolk4.9s/drivers/macintosh/rtc.c linux-2.4.20-wolk4.9s.plasmaroo/drivers/macintosh/rtc.c
+--- linux-2.4.20-wolk4.9s/drivers/macintosh/rtc.c	2004-01-05 23:33:45.000000000 +0000
++++ linux-2.4.20-wolk4.9s.plasmaroo/drivers/macintosh/rtc.c	2004-01-05 23:54:15.000000000 +0000
+@@ -64,6 +64,7 @@
+ 	case RTC_RD_TIME:
+ 		if (ppc_md.get_rtc_time)
+ 		{
++			memset(&rtc_tm, 0, sizeof(struct rtc_time));
+ 			get_rtc_time(&rtc_tm);
+ 
+ 			if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time)))
+diff -ur linux-2.4.20-wolk4.9s/drivers/sbus/char/rtc.c linux-2.4.20-wolk4.9s.plasmaroo/drivers/sbus/char/rtc.c
+--- linux-2.4.20-wolk4.9s/drivers/sbus/char/rtc.c	2004-01-05 23:33:45.000000000 +0000
++++ linux-2.4.20-wolk4.9s.plasmaroo/drivers/sbus/char/rtc.c	2004-01-05 23:54:43.000000000 +0000
+@@ -89,6 +89,7 @@
+ 	switch (cmd)
+ 	{
+ 	case RTCGET:
++		memset(&rtc_tm, 0, sizeof(struct rtc_time));
+ 		get_rtc_time(&rtc_tm);
+ 
+ 		if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time)))
+diff -ur linux-2.4.20-wolk4.9s/drivers/sgi/char/ds1286.c linux-2.4.20-wolk4.9s.plasmaroo/drivers/sgi/char/ds1286.c
+--- linux-2.4.20-wolk4.9s/drivers/sgi/char/ds1286.c	2004-01-05 23:33:45.000000000 +0000
++++ linux-2.4.20-wolk4.9s.plasmaroo/drivers/sgi/char/ds1286.c	2004-01-05 23:47:25.000000000 +0000
+@@ -174,6 +174,7 @@
+ 		 * tm_min, and tm_sec values are filled in.
+ 		 */
+ 
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		ds1286_get_alm_time(&wtime);
+ 		break;
+ 	}
+@@ -216,6 +217,7 @@
+ 	}
+ 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
+ 	{
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		ds1286_get_time(&wtime);
+ 		break;
+ 	}
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.22-CAN-2004-0075.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.22-CAN-2004-0075.patch
new file mode 100644
index 000000000000..5c397deb9c46
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.22-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/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0133.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0133.patch
new file mode 100644
index 000000000000..c756bc328bf2
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.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/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0181.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0181.patch
new file mode 100644
index 000000000000..5f7f1441b268
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.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/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0394.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0394.patch
new file mode 100644
index 000000000000..273f1a52046f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.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/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0427.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0427.patch
new file mode 100644
index 000000000000..ddc9610f67f8
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.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/gentoo-sources/gentoo-sources-2.4.19-r13.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r14.ebuild
index 3ae27ba29ae0..66083bfc826a 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r13.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r14.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-r13.ebuild,v 1.2 2004/04/27 21:58:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r14.ebuild,v 1.1 2004/06/01 16:45:42 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/13/10}.tar.bz2"
+	 http://gentoo.lostlogicx.com/patches-${KV/14/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/13/10}
+	cd ${KV/14/10}
 	# Kill patches we aren't suppposed to use, don't worry about 
 	# failures, if they aren't there that is a good thing!
 
@@ -64,9 +64,14 @@ src_unpack() {
 	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}/${P}-rtc_fix.patch || die "Failed to apply the RTC fixes!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2003-0985.patch || die "Failed to add the CAN-2003-0985 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-0109.patch || die "Failed to add the CAN-2004-0109 patch!"
+	use xfs && { epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0133.patch || die "Failed to add the CAN-2004-0133 patch!"; }
 	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}/${PN}-2.4.CAN-2004-0181.patch || die "Failed to add the CAN-2004-0181 patch!"
+	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!"
 }
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r16.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r17.ebuild
index 42a4e6ea36af..88a3eae1432c 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r16.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r17.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-r16.ebuild,v 1.2 2004/04/27 21:58:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r17.ebuild,v 1.1 2004/06/01 16:45:42 plasmaroo Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -30,18 +30,17 @@ 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/16/14}.tar.bz2"
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/17/14}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc -sparc -alpha -hppa -mips "
+KEYWORDS="x86 -ppc -sparc -alpha -hppa -mips"
 SLOT="${KV}"
 
-
 src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
 
-	cd ${WORKDIR}/${KV/16/14}
+	cd ${WORKDIR}/${KV/17/14}
 
 	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
 	if [ -z "`use aavm`" ]; then
@@ -125,14 +124,17 @@ src_unpack() {
 	epatch ${FILESDIR}/security.patch4
 
 	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to apply do_brk() fix!"
+	epatch ${FILESDIR}/${P}-munmap.patch || die "Failed to apply munmap patch!"
+	epatch ${FILESDIR}/${P}-rtc_fix.patch || die "Failed to apply RTC 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-0109.patch || die "Failed to add the CAN-2004-0109 patch!"
 	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!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0181.patch || die "Failed to add the CAN-2004-0181 patch!"
+	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!"
 }
 
 pkg_postinst() {
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild
deleted file mode 100644
index eab5ddb98fc3..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild
+++ /dev/null
@@ -1,159 +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.20-r7.ebuild,v 1.13 2004/04/27 21:58:33 agriffis Exp $
-
-IUSE="build crypt evms2 aavm usagi"
-
-# 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="`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
-	mirror://gentoo/patches-${KV/7/5}.tar.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 ${WORKDIR}/${KV/7/5}
-
-	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
-	if [ -z "`use aavm`" ]; then
-		einfo "Setting up kernel for rmap support(default)."
-		for file in *.aavm ;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Setting up kernel for aavm support."
-		for file in *.rmap ;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	fi
-
-	# If the compiler isn't gcc>3.1 drop the gcc>=3.1 patches
-	if [[ "${COMPILER}" == "gcc3" ]]; then
-		einfo "Enabling gcc > 3.1 processor optimizations..."
-		einfo "To use them, choose the processor families labelled with (gcc>31)"
-		einfo "in \"Processor type and features -> Processor Family\""
-	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* evms2 USE flag, enables evms2 support
-	if [ -z "`use evms2`" ]; then
-		einfo "Setting up kernel for EVMS 1.2.1 support (default)..."
-		for file in 2* ;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Setting up kernel for EVMS 2.0.1 support..."
-		ewarn "This is very beta. Please read the 'evms2' doc provided with this kernel."
-		ewarn "It is the install doc from the evms 2.0.1 tarball."
-		for file in 1* ;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	fi
-
-	# This is the crypt USE flag, keeps {USAGI/superfreeswan/patch-int/loop-jari}
-	if [ -z "`use crypt`" ]; then
-		einfo "No Cryptographic support, dropping patches..."
-		for file in 6* 8* ;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Cryptographic patches will be applied."
-	fi
-
-	# This is the usagi USE flag, keeps USAGI, drops {superfreeswan/patch-int/loop-jari}
-	# Using USAGI will also cause you to drop all iptables ipv6 patches
-	if [ -z "`use usagi`" ]; then
-		einfo "Keeping {superfreeswan/patch-int/loop-jari} patches, dropping USAGI"
-		for file in 6* ;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Keeping USAGI patch, dropping {superfreeswan/patch-int/loop-jari}"
-		for file in *.ipv6 8* ;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	fi
-
-	kernel_src_unpack
-
-	epatch ${FILESDIR}/security.patch1
-	epatch ${FILESDIR}/security.patch2
-	epatch ${FILESDIR}/security.patch3
-	epatch ${FILESDIR}/security.patch4
-	epatch ${FILESDIR}/gentoo-sources-2.4.20-gcc33.patch
-	epatch ${FILESDIR}/gentoo-sources-2.4.20-cs46xx-gcc33.patch
-	epatch ${FILESDIR}/gentoo-sources-2.4.20-grsec-disabled.patch
-	epatch ${FILESDIR}/gentoo-sources-2.4.20-sched-interrupt.patch
-	epatch ${FILESDIR}/gentoo-sources-2.4.20-mdcount.patch
-	epatch ${FILESDIR}/gentoo-sources-2.4.20-devfs-snd-fix.patch
-	epatch ${FILESDIR}/gentoo-sources-2.4.20-ipt-realm.patch
-	epatch ${FILESDIR}/do_brk_fix.patch
-
-}
-
-pkg_postinst() {
-
-	kernel_pkg_postinst
-
-	echo
-	ewarn "There is no xfs support in this kernel."
-	ewarn "If you need xfs support, emerge xfs-sources."
-	echo
-	ewarn "If iptables/netfilter behaves abnormally, such as 'Invalid Argument',"
-	ewarn "you will need to re-emerge iptables to restore proper functionality."
-	echo
-	einfo "This set contains the ptrace patch as part of grsecurity."
-	echo
-	einfo "If there are issues with it, read the docs and associated help provided."
-	einfo "Next you should check http://forums.gentoo.org/ for assistance."
-	echo
-	einfo "Otherwise check http://bugs.gentoo.org/ for an existing bug."
-	einfo "Only create a new bug if you have not found one that matches your issue."
-	einfo "It is best to do an advanced search to increase search yield."
-	echo
-	einfo "Please assign bugs to x86-kernel@gentoo.org"
-	echo
-	einfo "Please read the ChangeLog and associated docs for more information."
-	echo
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r9.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r10.ebuild
index c4115460425f..b4c288aa2467 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r9.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r10.ebuild
@@ -1,16 +1,21 @@
 # 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-r9.ebuild,v 1.1 2004/04/17 10:59:15 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r10.ebuild,v 1.1 2004/06/01 16:45:42 plasmaroo Exp $
 
 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}/${P}-CAN-2004-0075.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0109.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0133.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"
+	${FILESDIR}/${PN}-2.4.CAN-2004-0181.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0394.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0427.patch
+	${DISTDIR}/gentoo-sources-${PVR/10/5}.patch.bz2"
 
 inherit kernel-2
 detect_version
@@ -19,7 +24,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/9/5}.patch.bz2"
+	http://dev.gentoo.org/~iggy/gentoo-sources-${PVR/10/5}.patch.bz2"
 KEYWORDS="x86 -*"
 SLOT="${KV}"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r3.ebuild
deleted file mode 100644
index 1f67e81bc2bc..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-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/gentoo-sources/gentoo-sources-2.4.22-r3.ebuild,v 1.6 2004/04/27 21:58:33 agriffis Exp $
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-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/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/gentoo-sources-2.4.22-r2.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}
-
-	bzcat ${DISTDIR}/gentoo-sources-2.4.22-r2.patch.bz2 | patch -p1 \
-		|| die "Failed to patch kernel, please file a bug at bugs.gentoo.org"
-
-	cd ${S}
-
-	epatch ${FILESDIR}/gentoo-sources-2.4.CAN-2003-0985.patch || die "Failed to apply mremap() fix!"
-	epatch ${FILESDIR}/gentoo-sources-2.4.22-rtc_fix.patch || die "Failed to apply RTC fix!"
-
-	make mrproper || die "make mrproper failed"
-	make include/linux/version.h || die "make include/linux/version.h failed"
-	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-r5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r5.ebuild
deleted file mode 100644
index 5daa625bf337..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r5.ebuild
+++ /dev/null
@@ -1,26 +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-r5.ebuild,v 1.5 2004/02/18 08:17:18 iggy Exp $
-
-UNIPATCH_LIST="${FILESDIR}/gentoo-sources-2.4.CAN-2004-0001.patch ${DISTDIR}/gentoo-sources-${PVR}.patch.bz2"
-ETYPE="sources"
-
-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}.patch.bz2"
-KEYWORDS="x86 -amd64 -ia64 -*"
-SLOT="${KV}"
-
-K_EXTRAEINFO="If there are issues with this kernel, search http://bugs.gentoo.org/ for an
-existing bug. Only create a new bug if you have not found one that matches
-your issue. It is best to do an advanced search as the initial search has a
-very low yield. Please assign your bugs to x86-kernel@gentoo.org.
-Please read the ChangeLog and associated docs for more information."
-
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r2.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r3.ebuild
index 343d12def2cb..4c5e46f04ca5 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r2.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r3.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.25-r2.ebuild,v 1.2 2004/05/30 23:53:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r3.ebuild,v 1.1 2004/06/01 16:45:42 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -9,8 +9,12 @@ detect_version
 KEYWORDS="x86 -ppc"
 UNIPATCH_LIST="
 	${FILESDIR}/${PN}-2.4.CAN-2004-0109.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0133.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0177.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0178.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0181.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0394.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0427.patch
 	${DISTDIR}/${P}.patch.bz2"
 
 DESCRIPTION="Full sources including the gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_pre3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_pre3.ebuild
deleted file mode 100644
index f5befe95616d..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_pre3.ebuild
+++ /dev/null
@@ -1,45 +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.26_pre3.ebuild,v 1.3 2004/03/21 15:15:55 livewire 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
-OKV=2.4.25
-EXTRAVERSION=_pre3-gentoo
-KV=2.4.26_pre3-gentoo
-S=${WORKDIR}/linux-${KV}
-DESCRIPTION="Full sources for the Gentoo Kernel."
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/gentoo-sources-${PV}/patches.txt.gz
-
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://dev.gentoo.org/~livewire/${P}.patch.bz2"
-KEYWORDS="~x86 -ppc -sparc "
-SLOT="${KV}"
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-	cd linux-${KV} || die
-	bzcat ${DISTDIR}/${P}.patch.bz2 | patch -p1 || die "Failed to patch kernel, please file a bug at bugs.gentoo.org"
-	# 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
-	make mrproper || die "make mrproper failed"
-	make include/linux/version.h || die "make include/linux/version.h failed"
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_pre5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_pre5.ebuild
deleted file mode 100644
index 289d7d55bcf3..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_pre5.ebuild
+++ /dev/null
@@ -1,45 +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.26_pre5.ebuild,v 1.2 2004/03/21 15:10:10 plasmaroo 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
-OKV=2.4.25
-EXTRAVERSION=_pre5-gentoo
-KV=2.4.26_pre5-gentoo
-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
-
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://dev.gentoo.org/~livewire/${P}.patch.bz2"
-KEYWORDS="~x86 -ppc -sparc"
-SLOT="${KV}"
-DESCRIPTION="Full sources for the Gentoo Kernel."
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-	cd linux-${KV} || die
-	bzcat ${DISTDIR}/${P}.patch.bz2 | patch -p1 || die "Failed to patch kernel, please file a bug at bugs.gentoo.org"
-	# 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
-	make mrproper || die "make mrproper failed"
-	make include/linux/version.h || die "make include/linux/version.h failed"
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_pre6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_pre6.ebuild
deleted file mode 100644
index 38ccc260b29e..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26_pre6.ebuild
+++ /dev/null
@@ -1,48 +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.26_pre6.ebuild,v 1.1 2004/03/27 01:12:36 livewire 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
-OKV=2.4.25
-EXTRAVERSION=_pre6-gentoo
-KV=2.4.26_pre6-gentoo
-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
-
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://dev.gentoo.org/~livewire/gentoo-sources-2.4.26_pre5.patch.bz2
-	http://dev.gentoo.org/~livewire/gentoo-sources-pre5-pre6.bz2"
-KEYWORDS="~x86 -ppc -sparc"
-SLOT="${KV}"
-DESCRIPTION="Full sources for the Gentoo Kernel."
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-	cd linux-${KV} || die
-	bzcat ${DISTDIR}/gentoo-sources-2.4.26_pre5.patch.bz2 | patch -p1 || die "Failed to patch kernel, please file a bug at bugs.gentoo.org"
-	bzcat ${DISTDIR}/gentoo-sources-pre5-pre6.bz2 | patch -p1 || die "Failed to patch kernel, please file a bug at bugs.gentoo.org"
-
-	# 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
-	make mrproper || die "make mrproper failed"
-	make include/linux/version.h || die "make include/linux/version.h failed"
-	kernel_universal_unpack
-}