Fixed headers, fixed faulty 'ppc-sources-dev-2.4.22-r1.via-pmu.diff' patch and added patches to address the security vulnerabilities in bugs #37292 and #37317.

12 files changed, 320 insertions, 27 deletions

diff --git a/sys-kernel/ppc-sources-dev/ChangeLog b/sys-kernel/ppc-sources-dev/ChangeLog
index e78538d5d8e1..0370fe00b4f5 100644
--- a/sys-kernel/ppc-sources-dev/ChangeLog
+++ b/sys-kernel/ppc-sources-dev/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-kernel/ppc-sources-dev
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ChangeLog,v 1.15 2003/12/14 23:48:22 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ChangeLog,v 1.16 2004/01/08 21:30:08 plasmaroo Exp $
+
+*ppc-sources-dev-2.4.22-r1 (08 Jan 2004)
+
+  08 Jan 2004; <plasmaroo@gentoo.org> ppc-sources-dev-2.4.22-r1.ebuild,
+  files/ppc-sources-dev-2.4.22-r1.via-pmu.diff,
+  files/ppc-sources-dev-2.4.22.CAN-2003-0985.patch,
+  files/ppc-sources-dev-2.4.22.do_brk.patch,
+  files/ppc-sources-dev-2.4.22.rtc_fix.patch:
+  Fixed ppc-sources-dev-2.4.22-r1.via-pmu.diff to apply properly. Version bumped
+  and added patches to address the security vulnerabilities in bugs #37292 and
+  #37317.
 
   15 Dec 2003; <spider@gentoo.org> ppc-sources-dev-2.4.19.ebuild,
   ppc-sources-dev-2.4.20.ebuild:
diff --git a/sys-kernel/ppc-sources-dev/Manifest b/sys-kernel/ppc-sources-dev/Manifest
index 0ca071d01d5b..6212281caaf5 100644
--- a/sys-kernel/ppc-sources-dev/Manifest
+++ b/sys-kernel/ppc-sources-dev/Manifest
@@ -1,11 +1,16 @@
-MD5 8c9c569a217f64df2cec56ddae729e0d ChangeLog 2284
+MD5 0c100e6d9d62aebfa0a3ba5c9115d9a8 ChangeLog 2763
+MD5 46093868a7b9b6455e6a0917baaada76 ppc-sources-dev-2.4.22.ebuild 2064
 MD5 4b1f93b2fca55d2bfdd961a517eb5611 metadata.xml 347
-MD5 6b52baa1179ec681ef1778178ec3af90 ppc-sources-dev-2.4.19.ebuild 2250
-MD5 dc38d0bd039acc538bd54419369b3f7a ppc-sources-dev-2.4.20.ebuild 2492
-MD5 703bd606e2b9234cdf7b055cec49a82d ppc-sources-dev-2.4.21.ebuild 1872
-MD5 80e6f13f4d6febe129da9d3d19f43804 ppc-sources-dev-2.4.22.ebuild 2064
-MD5 660f16218c08735d9c1e9e0e5b292a23 files/digest-ppc-sources-dev-2.4.19 68
+MD5 d5bd00e9a574a24b019566b389e342c7 ppc-sources-dev-2.4.21.ebuild 1872
+MD5 2e1532c1dbff17ab96ea76d189a9b7ba ppc-sources-dev-2.4.19.ebuild 2253
+MD5 53c928a80615f43ab56d3927b66ef69c ppc-sources-dev-2.4.22-r1.ebuild 2326
+MD5 e08b80d2fa5bbcf80068d557458ffe59 ppc-sources-dev-2.4.20.ebuild 2495
+MD5 e77a93fdf26f06cf3ea5080b27211725 files/ppc-sources-dev-2.4.22.CAN-2003-0985.patch 414
+MD5 5b30d68e4f8019c1433bcb2a2f70adec files/digest-ppc-sources-dev-2.4.22 143
+MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/ppc-sources-dev-2.4.22.rtc_fix.patch 7073
+MD5 a580e6b8c602c2e13fb5de7cc2de65a0 files/ppc-sources-dev-2.4.22.do_brk.patch 242
 MD5 c45b2bb6026a8726c5932c0778879a21 files/digest-ppc-sources-dev-2.4.20 70
+MD5 e880d661985279c3a91187e02fc00611 files/ppc-sources-dev-2.4.22-r1.via-pmu.diff 591
+MD5 660f16218c08735d9c1e9e0e5b292a23 files/digest-ppc-sources-dev-2.4.19 68
+MD5 5b30d68e4f8019c1433bcb2a2f70adec files/digest-ppc-sources-dev-2.4.22-r1 143
 MD5 91cdf75820acd5ac4942bab12e5ceb5a files/digest-ppc-sources-dev-2.4.21 143
-MD5 5b30d68e4f8019c1433bcb2a2f70adec files/digest-ppc-sources-dev-2.4.22 143
-MD5 990ae6b085cb09866bfbb7d44076b8ce files/ppc-sources-dev-2.4.22-r1.via-pmu.diff 907
diff --git a/sys-kernel/ppc-sources-dev/files/digest-ppc-sources-dev-2.4.22-r1 b/sys-kernel/ppc-sources-dev/files/digest-ppc-sources-dev-2.4.22-r1
new file mode 100644
index 000000000000..befa3b3be6e0
--- /dev/null
+++ b/sys-kernel/ppc-sources-dev/files/digest-ppc-sources-dev-2.4.22-r1
@@ -0,0 +1,2 @@
+MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
+MD5 021f265ba377de868f68ad17818bc1cd patches-2.4.22-ppc-dev.tar.bz2 1365965
diff --git a/sys-kernel/ppc-sources-dev/files/ppc-sources-dev-2.4.22-r1.via-pmu.diff b/sys-kernel/ppc-sources-dev/files/ppc-sources-dev-2.4.22-r1.via-pmu.diff
index 7c760eab2ac3..90043c292433 100644
--- a/sys-kernel/ppc-sources-dev/files/ppc-sources-dev-2.4.22-r1.via-pmu.diff
+++ b/sys-kernel/ppc-sources-dev/files/ppc-sources-dev-2.4.22-r1.via-pmu.diff
@@ -11,13 +11,3 @@ diff -Naur linux-2.4.22.orig/drivers/macintosh/via-pmu.c linux-2.4.22/drivers/ma
  		proc_pmu_info = create_proc_read_entry("info", 0, proc_pmu_root,
  					proc_get_info, NULL);
  		proc_pmu_irqstats = create_proc_read_entry("interrupts", 0, proc_pmu_root,
-@@ -1373,8 +1375,8 @@
- #endif /* CONFIG_PMAC_BACKLIGHT */
- 		}
- 	/* Tick interrupt */
--	else if ((1 << pirq) & PMU_INT_TICK) {
- #ifdef CONFIG_PMAC_PBOOK
-+	else if ((1 << pirq) & PMU_INT_TICK) {
- 		/* Environement or tick interrupt, query batteries */
- 		if (pmu_battery_count) {
- 			if ((--query_batt_timer) == 0) {
diff --git a/sys-kernel/ppc-sources-dev/files/ppc-sources-dev-2.4.22.CAN-2003-0985.patch b/sys-kernel/ppc-sources-dev/files/ppc-sources-dev-2.4.22.CAN-2003-0985.patch
new file mode 100644
index 000000000000..dacf6ed810f9
--- /dev/null
+++ b/sys-kernel/ppc-sources-dev/files/ppc-sources-dev-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-dev/files/ppc-sources-dev-2.4.22.do_brk.patch b/sys-kernel/ppc-sources-dev/files/ppc-sources-dev-2.4.22.do_brk.patch
new file mode 100644
index 000000000000..0f8438861e0d
--- /dev/null
+++ b/sys-kernel/ppc-sources-dev/files/ppc-sources-dev-2.4.22.do_brk.patch
@@ -0,0 +1,12 @@
+--- a/mm/mmap.c Fri Sep 12 06:44:06 2003
++++ b/mm/mmap.c Thu Oct  2 01:18:19 2003
+@@ -1248,6 +1248,9 @@
+	if (!len)
+		return addr;
+ 
++ 	if ((addr + len) > TASK_SIZE || (addr + len) < addr)
++ 		return -EINVAL;
++ 
+	/*
+	 * mlock MCL_FUTURE?
+	 */
diff --git a/sys-kernel/ppc-sources-dev/files/ppc-sources-dev-2.4.22.rtc_fix.patch b/sys-kernel/ppc-sources-dev/files/ppc-sources-dev-2.4.22.rtc_fix.patch
new file mode 100644
index 000000000000..76a663c6e89d
--- /dev/null
+++ b/sys-kernel/ppc-sources-dev/files/ppc-sources-dev-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-dev/ppc-sources-dev-2.4.19.ebuild b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.19.ebuild
index 23c7c044d028..86fe53fca366 100644
--- a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.19.ebuild
+++ b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.19.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-dev/ppc-sources-dev-2.4.19.ebuild,v 1.19 2003/12/14 23:48:22 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.19.ebuild,v 1.20 2004/01/08 21:30:08 plasmaroo Exp $
 
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
diff --git a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.20.ebuild b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.20.ebuild
index b1412a669992..1207630a89a0 100644
--- a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.20.ebuild
+++ b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.20.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-dev/ppc-sources-dev-2.4.20.ebuild,v 1.14 2003/12/14 23:48:22 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.20.ebuild,v 1.15 2004/01/08 21:30:08 plasmaroo Exp $
 
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
diff --git a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.21.ebuild b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.21.ebuild
index 47d08808ef56..8b258adb4e7f 100644
--- a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.21.ebuild
+++ b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.21.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-dev/ppc-sources-dev-2.4.21.ebuild,v 1.3 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.21.ebuild,v 1.4 2004/01/08 21:30:08 plasmaroo Exp $
 
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
diff --git a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22-r1.ebuild b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22-r1.ebuild
new file mode 100644
index 000000000000..74206ec93d88
--- /dev/null
+++ b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22-r1.ebuild
@@ -0,0 +1,80 @@
+# 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-dev/ppc-sources-dev-2.4.22-r1.ebuild,v 1.1 2004/01/08 21:30:08 plasmaroo Exp $
+
+#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+ETYPE="sources"
+IUSE="build crypt"
+
+inherit kernel
+OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
+EXTRAVERSION="-ppc-dev"
+[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+KV="${OKV}${EXTRAVERSION}"
+S=${WORKDIR}/linux-${KV}
+
+
+# What's in this kernel?
+
+# INCLUDED:
+#   benh 2.4.22-2
+#   Pegasos 20030902
+#   Amiga SFS 0.6
+#   Orinoco Monitor 0.13
+#   O_STREAMING
+#   GRsecurity 2.0-rc3
+#   ea+acl+nfsacl 0.8.60
+#   XFS 1.30
+#   Cryptoloop Jari
+#   Super FreeS/WAN 2.01
+#   x509 1.4.5
+#   Extra bootlogos
+#   Bootsplash 3.0.7 (Does not work on Macs)
+
+
+DESCRIPTION="Full developmental sources for the Gentoo Linux PPC kernel - Experimental!"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+	mirror://gentoo/patches-${OKV}-ppc-dev.tar.bz2"
+PROVIDE="virtual/linux-sources"
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
+LICENSE="GPL-2"
+SLOT="${KV}"
+KEYWORDS="~ppc -x86 -sparc -mips -hppa -alpha -arm"
+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} linux-${KV} || die "Unable to move kernel source tree to linux-${KV}"
+
+	cd ${WORKDIR}/${KV}
+	# 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* ;do
+			einfo "Dropping ${file}..."
+			rm -f ${file}
+		done
+	else
+		einfo "Cryptographic patches will be applied"
+	fi
+
+	kernel_src_unpack
+	cd ${S}
+	epatch ${FILESDIR}/ppc-sources-dev-2.4.22-r1.via-pmu.diff || die "patch failed"
+	epatch ${FILESDIR}/${P}.do_brk.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!"
+
+}
+
+pkg_postinst()
+{
+	kernel_pkg_postinst
+
+	ewarn "Bootsplash currently does not work on Macs."
+}
diff --git a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild
index 8dd65081494e..4c96a9caa5e1 100644
--- a/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild
+++ b/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.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-dev/ppc-sources-dev-2.4.22.ebuild,v 1.3 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-dev/ppc-sources-dev-2.4.22.ebuild,v 1.4 2004/01/08 21:30:08 plasmaroo Exp $
 
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.