Fixed headers. Added patches to address the security vulnerabilities in bugs #37292 and #37317.

16 files changed, 291 insertions, 32 deletions

diff --git a/sys-kernel/ppc-sources-benh/ChangeLog b/sys-kernel/ppc-sources-benh/ChangeLog
index 3297d18edcb4..d93130b040ff 100644
--- a/sys-kernel/ppc-sources-benh/ChangeLog
+++ b/sys-kernel/ppc-sources-benh/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/ppc-sources-benh
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ChangeLog,v 1.13 2003/12/05 17:22:46 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ChangeLog,v 1.14 2004/01/08 19:19:20 plasmaroo Exp $
+
+*ppc-sources-benh-2.4.22-r4 (08 Jan 2004)
+
+  08 Jan 2004; <plasmaroo@gentoo.org> ppc-sources-benh-2.4.22-r4.ebuild,
+  files/ppc-sources-benh-2.4.22.CAN-2003-0985.patch,
+  files/ppc-sources-benh-2.4.22.rtc_fix.patch:
+  Added patches to address the security vulnerabilities in bugs #37292 and
+  #37317.
 
 *ppc-sources-benh-2.4.22-r3 (02 Dec 2003)
 
diff --git a/sys-kernel/ppc-sources-benh/Manifest b/sys-kernel/ppc-sources-benh/Manifest
index 0768729fe813..f41f902e2180 100644
--- a/sys-kernel/ppc-sources-benh/Manifest
+++ b/sys-kernel/ppc-sources-benh/Manifest
@@ -1,16 +1,18 @@
-MD5 dbff6b560804525ed7041ac405ab9b08 ChangeLog 2807
-MD5 b253c732a1b9896dec19dc2e79779f71 ppc-sources-benh-2.4.22-r3.ebuild 1568
-MD5 fa41d4268478c63c21d05519ff015b0e ppc-sources-benh-2.4.21-r2.ebuild 1557
-MD5 301400beeda5e8a020d80afde835bf30 ppc-sources-benh-2.4.20-r7.ebuild 1545
-MD5 faa511fe9cd825920adf97ec1a0fb1d9 ppc-sources-benh-2.4.20-r10.ebuild 1484
-MD5 bc81894b81dfea86937f62769e401eca ppc-sources-benh-2.4.20-r8.ebuild 1483
+MD5 6155601a52a856a0dac6884811f42162 ppc-sources-benh-2.4.22-r4.ebuild 1829
+MD5 6a8c7046069ae606de13059074179f9e ChangeLog 3109
+MD5 0d26ceab61f55ee6fbd77ae6f5d95e24 ppc-sources-benh-2.4.22-r3.ebuild 1579
+MD5 6cc2446957eaf3662e173b3ceb7afe61 ppc-sources-benh-2.4.21-r2.ebuild 1562
+MD5 d35fb771b88d128478ef0a76dc29e39a ppc-sources-benh-2.4.20-r7.ebuild 1545
+MD5 96e544b129fc2af629140f115acf069e ppc-sources-benh-2.4.20-r10.ebuild 1484
+MD5 5202968aac6be663e3999faaab81532a ppc-sources-benh-2.4.20-r8.ebuild 1483
 MD5 cfcc65dbc3d71d308d0b10faf4eb5615 metadata.xml 344
-MD5 7642e6f121e6602ab832e52dd3005bdc ppc-sources-benh-2.4.20-r5.ebuild 1483
-MD5 ada54166a9176f9461df5492350526ff ppc-sources-benh-2.4.22-r2.ebuild 1556
-MD5 926ee9a6334321b4801819d740ff0ee9 ppc-sources-benh-2.4.20-r9.ebuild 1557
-MD5 53346f985dbb4a3924b7a414fdd0c66f ppc-sources-benh-2.4.22-r1.ebuild 1557
-MD5 380b80209f503498418a004d5f5f5c38 ppc-sources-benh-2.4.20-r6.ebuild 1482
+MD5 b0e64802b6a3664f4113c6c43f9ac6ee ppc-sources-benh-2.4.20-r5.ebuild 1483
+MD5 4d0b77a705a9ca49af76dbae594d461e ppc-sources-benh-2.4.22-r2.ebuild 1561
+MD5 bc5b8dc8b0adecc3e62230db4435716a ppc-sources-benh-2.4.20-r9.ebuild 1562
+MD5 f71c34990d2b517e1c658daae7988bee ppc-sources-benh-2.4.22-r1.ebuild 1562
+MD5 258d8ff10ba0183fd568edd05bdbb822 ppc-sources-benh-2.4.20-r6.ebuild 1482
 MD5 bb1eb09e6487dea757b24c190fa535a1 files/digest-ppc-sources-benh-2.4.20-r7 135
+MD5 e77a93fdf26f06cf3ea5080b27211725 files/ppc-sources-benh-2.4.22.CAN-2003-0985.patch 414
 MD5 2f9a9c2485f343bd18574b9ba5aee730 files/digest-ppc-sources-benh-2.4.21-r2 133
 MD5 36cf6976ec33f3d449ecd186ce7903e7 files/digest-ppc-sources-benh-2.4.20-r5 133
 MD5 c5fc0f3db2d2f44309007a4eb2574c03 files/digest-ppc-sources-benh-2.4.22-r2 133
@@ -20,4 +22,6 @@ MD5 a519dd89b0f3e8c61682551315d9c46d files/digest-ppc-sources-benh-2.4.20-r10 21
 MD5 d401640feba334b89b7426dc145901ee files/digest-ppc-sources-benh-2.4.22-r1 133
 MD5 2af745b267f5e078a7b10bf02256fb02 files/digest-ppc-sources-benh-2.4.20-r6 133
 MD5 c5fc0f3db2d2f44309007a4eb2574c03 files/digest-ppc-sources-benh-2.4.22-r3 133
+MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/ppc-sources-benh-2.4.22.rtc_fix.patch 7073
+MD5 c5fc0f3db2d2f44309007a4eb2574c03 files/digest-ppc-sources-benh-2.4.22-r4 133
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
diff --git a/sys-kernel/ppc-sources-benh/files/digest-ppc-sources-benh-2.4.22-r4 b/sys-kernel/ppc-sources-benh/files/digest-ppc-sources-benh-2.4.22-r4
new file mode 100644
index 000000000000..15997863c4fd
--- /dev/null
+++ b/sys-kernel/ppc-sources-benh/files/digest-ppc-sources-benh-2.4.22-r4
@@ -0,0 +1,2 @@
+MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
+MD5 090471cf12ce6c1b8c239183c434297f patch-2.4.22-ben2.bz2 131871
diff --git a/sys-kernel/ppc-sources-benh/files/ppc-sources-benh-2.4.22.CAN-2003-0985.patch b/sys-kernel/ppc-sources-benh/files/ppc-sources-benh-2.4.22.CAN-2003-0985.patch
new file mode 100644
index 000000000000..dacf6ed810f9
--- /dev/null
+++ b/sys-kernel/ppc-sources-benh/files/ppc-sources-benh-2.4.22.CAN-2003-0985.patch
@@ -0,0 +1,13 @@
+--- linux/mm/mremap.c.orig	2004-01-05 17:01:21.382104120 +0000
++++ linux/mm/mremap.c	2004-01-05 17:15:25.689749848 +0000
+@@ -315,6 +315,10 @@
+ 	old_len = PAGE_ALIGN(old_len);
+ 	new_len = PAGE_ALIGN(new_len);
+ 
++	/* Don't allow the degenerate cases */
++	if (!old_len || !new_len)
++		goto out;
++
+ 	/* new_addr is only valid if MREMAP_FIXED is specified */
+ 	if (flags & MREMAP_FIXED) {
+ 		if (new_addr & ~PAGE_MASK)
diff --git a/sys-kernel/ppc-sources-benh/files/ppc-sources-benh-2.4.22.rtc_fix.patch b/sys-kernel/ppc-sources-benh/files/ppc-sources-benh-2.4.22.rtc_fix.patch
new file mode 100644
index 000000000000..76a663c6e89d
--- /dev/null
+++ b/sys-kernel/ppc-sources-benh/files/ppc-sources-benh-2.4.22.rtc_fix.patch
@@ -0,0 +1,180 @@
+diff -urN linux-2.4.23/arch/cris/drivers/ds1302.c linux-2.4.24/arch/cris/drivers/ds1302.c
+--- linux-2.4.23/arch/cris/drivers/ds1302.c	2003-08-25 04:44:39.000000000 -0700
++++ linux-2.4.24/arch/cris/drivers/ds1302.c	2004-01-05 05:53:56.000000000 -0800
+@@ -346,6 +346,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 -urN linux-2.4.23/arch/cris/drivers/pcf8563.c linux-2.4.24/arch/cris/drivers/pcf8563.c
+--- linux-2.4.23/arch/cris/drivers/pcf8563.c	2003-08-25 04:44:39.000000000 -0700
++++ linux-2.4.24/arch/cris/drivers/pcf8563.c	2004-01-05 05:53:56.000000000 -0800
+@@ -220,6 +220,7 @@
+ 		{
+ 			struct rtc_time tm;
+ 
++			memset(&tm, 0, sizeof (struct rtc_time));
+ 			get_rtc_time(&tm);
+ 
+ 			if (copy_to_user((struct rtc_time *) arg, &tm, sizeof tm)) {
+diff -urN linux-2.4.23/arch/m68k/bvme6000/rtc.c linux-2.4.24/arch/m68k/bvme6000/rtc.c
+--- linux-2.4.23/arch/m68k/bvme6000/rtc.c	2003-06-13 07:51:31.000000000 -0700
++++ linux-2.4.24/arch/m68k/bvme6000/rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -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 -urN linux-2.4.23/arch/m68k/mvme16x/rtc.c linux-2.4.24/arch/m68k/mvme16x/rtc.c
+--- linux-2.4.23/arch/m68k/mvme16x/rtc.c	2003-06-13 07:51:31.000000000 -0700
++++ linux-2.4.24/arch/m68k/mvme16x/rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -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 -urN linux-2.4.23/arch/ppc64/kernel/rtc.c linux-2.4.24/arch/ppc64/kernel/rtc.c
+--- linux-2.4.23/arch/ppc64/kernel/rtc.c	2003-06-13 07:51:32.000000000 -0700
++++ linux-2.4.24/arch/ppc64/kernel/rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -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 -urN linux-2.4.23/drivers/acorn/char/i2c.c linux-2.4.24/drivers/acorn/char/i2c.c
+--- linux-2.4.23/drivers/acorn/char/i2c.c	2003-08-25 04:44:40.000000000 -0700
++++ linux-2.4.24/drivers/acorn/char/i2c.c	2004-01-05 05:53:56.000000000 -0800
+@@ -166,6 +166,7 @@
+ 		break;
+ 
+ 	case RTC_RD_TIME:
++		memset(&rtctm, 0, sizeof(struct rtc_time));
+ 		get_rtc_time(&rtc_raw, &year);
+ 		rtctm.tm_sec  = rtc_raw.secs;
+ 		rtctm.tm_min  = rtc_raw.mins;
+diff -urN linux-2.4.23/drivers/char/ds1286.c linux-2.4.24/drivers/char/ds1286.c
+--- linux-2.4.23/drivers/char/ds1286.c	2003-08-25 04:44:41.000000000 -0700
++++ linux-2.4.24/drivers/char/ds1286.c	2004-01-05 05:53:56.000000000 -0800
+@@ -173,7 +173,7 @@
+ 		 * means "don't care" or "match all". Only the tm_hour,
+ 		 * tm_min, and tm_sec values are filled in.
+ 		 */
+-
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		ds1286_get_alm_time(&wtime);
+ 		break;
+ 	}
+@@ -216,6 +216,7 @@
+ 	}
+ 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
+ 	{
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		ds1286_get_time(&wtime);
+ 		break;
+ 	}
+diff -urN linux-2.4.23/drivers/char/efirtc.c linux-2.4.24/drivers/char/efirtc.c
+--- linux-2.4.23/drivers/char/efirtc.c	2003-06-13 07:51:32.000000000 -0700
++++ linux-2.4.24/drivers/char/efirtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -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 -urN linux-2.4.23/drivers/char/ip27-rtc.c linux-2.4.24/drivers/char/ip27-rtc.c
+--- linux-2.4.23/drivers/char/ip27-rtc.c	2003-08-25 04:44:41.000000000 -0700
++++ linux-2.4.24/drivers/char/ip27-rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -83,6 +83,7 @@
+ 	switch (cmd) {
+ 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
+ 	{
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		get_rtc_time(&wtime);
+ 		break;
+ 	}
+diff -urN linux-2.4.23/drivers/char/mips_rtc.c linux-2.4.24/drivers/char/mips_rtc.c
+--- linux-2.4.23/drivers/char/mips_rtc.c	2003-08-25 04:44:41.000000000 -0700
++++ linux-2.4.24/drivers/char/mips_rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -82,6 +82,7 @@
+ 
+ 	switch (cmd) {
+ 	case RTC_RD_TIME:	/* Read the time/date from RTC  */
++		memset(&rtc_tm, 0, sizeof(struct rtc_time));
+ 		curr_time = rtc_get_time();
+ 		to_tm(curr_time, &rtc_tm);
+ 		rtc_tm.tm_year -= 1900;
+diff -urN linux-2.4.23/drivers/char/rtc.c linux-2.4.24/drivers/char/rtc.c
+--- linux-2.4.23/drivers/char/rtc.c	2003-11-28 10:26:20.000000000 -0800
++++ linux-2.4.24/drivers/char/rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -362,7 +362,7 @@
+ 		 * means "don't care" or "match all". Only the tm_hour,
+ 		 * tm_min, and tm_sec values are filled in.
+ 		 */
+-
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		get_rtc_alm_time(&wtime);
+ 		break; 
+ 	}
+@@ -406,6 +406,7 @@
+ 	}
+ 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
+ 	{
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		get_rtc_time(&wtime);
+ 		break;
+ 	}
+diff -urN linux-2.4.23/drivers/hil/hp_sdc_rtc.c linux-2.4.24/drivers/hil/hp_sdc_rtc.c
+--- linux-2.4.23/drivers/hil/hp_sdc_rtc.c	2003-06-13 07:51:33.000000000 -0700
++++ linux-2.4.24/drivers/hil/hp_sdc_rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -561,6 +561,7 @@
+         }
+         case RTC_ALM_READ:      /* Read the present alarm time */
+         {
++		memset(&ttime, 0, sizeof(struct timeval));
+ 		if (hp_sdc_rtc_read_mt(&ttime)) return -EFAULT;
+                 break;
+         }
+@@ -609,6 +610,7 @@
+         }
+         case RTC_RD_TIME:       /* Read the time/date from RTC  */
+         {
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		if (hp_sdc_rtc_read_bbrtc(&wtime)) return -EFAULT;
+                 break;
+         }
+diff -urN linux-2.4.23/drivers/macintosh/rtc.c linux-2.4.24/drivers/macintosh/rtc.c
+--- linux-2.4.23/drivers/macintosh/rtc.c	2002-02-25 11:37:58.000000000 -0800
++++ linux-2.4.24/drivers/macintosh/rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -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 -urN linux-2.4.23/drivers/sbus/char/rtc.c linux-2.4.24/drivers/sbus/char/rtc.c
+--- linux-2.4.23/drivers/sbus/char/rtc.c	2001-10-10 23:42:47.000000000 -0700
++++ linux-2.4.24/drivers/sbus/char/rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -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 --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r10.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r10.ebuild
index 7c69445540f9..a7e9d9c02761 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r10.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r10.ebuild,v 1.2 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r10.ebuild,v 1.3 2004/01/08 19:19:20 plasmaroo Exp $
 
 IUSE=""
 
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r5.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r5.ebuild
index 548dd574501b..4cdfade8e9e6 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r5.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r5.ebuild,v 1.10 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r5.ebuild,v 1.11 2004/01/08 19:19:20 plasmaroo Exp $
 
 IUSE=""
 
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r6.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r6.ebuild
index 3732d79b3ae0..ae1432d1b0c8 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r6.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r6.ebuild,v 1.6 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r6.ebuild,v 1.7 2004/01/08 19:19:20 plasmaroo Exp $
 
 IUSE=""
 
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r7.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r7.ebuild
index 1ac4c6763d4d..227b471ffb3a 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r7.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r7.ebuild,v 1.6 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r7.ebuild,v 1.7 2004/01/08 19:19:20 plasmaroo Exp $
 
 IUSE=""
 
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r8.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r8.ebuild
index 375e3384fd54..8a2300cdc89e 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r8.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r8.ebuild,v 1.5 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r8.ebuild,v 1.6 2004/01/08 19:19:20 plasmaroo Exp $
 
 IUSE=""
 
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r9.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r9.ebuild
index f689ac1f6d2f..ffa0d6b0e155 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r9.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r9.ebuild,v 1.5 2003/12/02 08:08:13 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.20-r9.ebuild,v 1.6 2004/01/08 19:19:20 plasmaroo Exp $
 
 IUSE=""
 
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.21-r2.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.21-r2.ebuild
index 451da4e1fc3c..867a53a39ed9 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.21-r2.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.21-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.21-r2.ebuild,v 1.3 2003/12/02 08:08:13 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.21-r2.ebuild,v 1.4 2004/01/08 19:19:20 plasmaroo Exp $
 
 IUSE=""
 
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r1.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r1.ebuild
index dca00f817b35..29b072ee45b3 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r1.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r1.ebuild,v 1.3 2003/12/02 08:08:13 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r1.ebuild,v 1.4 2004/01/08 19:19:20 plasmaroo Exp $
 
 IUSE=""
 
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r2.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r2.ebuild
index 583dd622757d..5ce5808571be 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r2.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r2.ebuild,v 1.6 2003/12/02 08:08:13 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r2.ebuild,v 1.7 2004/01/08 19:19:20 plasmaroo Exp $
 
 IUSE=""
 
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r3.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r3.ebuild
index 6733133f3d74..e093bb1dcb52 100644
--- a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r3.ebuild
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r3.ebuild,v 1.2 2003/12/17 04:52:10 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r3.ebuild,v 1.3 2004/01/08 19:19:20 plasmaroo Exp $
 
 IUSE=""
 
diff --git a/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r4.ebuild b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r4.ebuild
new file mode 100644
index 000000000000..d3acd8cbb570
--- /dev/null
+++ b/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-benh/ppc-sources-benh-2.4.22-r4.ebuild,v 1.1 2004/01/08 19:19:20 plasmaroo Exp $
+
+IUSE=""
+
+ETYPE="sources"
+inherit kernel
+
+# OKV=original kernel version, KV=patched kernel version.  They can be the same.
+OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
+EXTRAVERSION="-${PN/-*/}"
+[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR/4/2}"
+KV="${OKV}${EXTRAVERSION}"
+
+S=${WORKDIR}/linux-${KV}
+
+MY_R=`echo $PR | sed "s:r:ben:g"`
+
+DESCRIPTION="PowerPC kernel tree based on benh's patches, -r corresponds to ben{r} versioning"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+	http://www.kernel.org/pub/linux/kernel/people/benh/patch-${OKV}-${MY_R/4/2}.bz2"
+HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/benh/"
+KEYWORDS="-x86 ppc -sparc -alpha ppc64"
+PROVIDE="virtual/linux-sources"
+LICENSE="GPL-2"
+SLOT="${KV}"
+DEPEND=">=sys-devel/binutils-2.11.90.0.31"
+RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl virtual/modutils sys-devel/make"
+
+src_unpack() {
+	unpack ${A}
+	mv linux-${OKV} ${PF} || die
+
+	cd ${PF}
+	patch -p1 < ${WORKDIR}/patch-${OKV}-${MY_R/4/2} || die "patch failed"
+
+	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!"
+	epatch ${FILESDIR}/${P}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
+	epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
+
+	use xfs && ( ewarn "XFS is no longer included!" )
+	EXTRAVERSION="-ben${PR/r4/2}-${PR}" && kernel_universal_unpack
+}
+
+src_install() {
+	dodir /usr/src
+	cd ${S}
+	rm ${WORKDIR}/patch-${OKV}-${MY_R}
+	echo ">>> Copying sources..."
+	mv ${WORKDIR}/* ${D}/usr/src
+}