Removed some old patches

4 files changed, 12 insertions, 231 deletions

diff --git a/sys-kernel/ppc-sources/Manifest b/sys-kernel/ppc-sources/Manifest
index 57fe4c80327e..69a1db7ce7f2 100644
--- a/sys-kernel/ppc-sources/Manifest
+++ b/sys-kernel/ppc-sources/Manifest
@@ -1,23 +1,20 @@
-MD5 e9c113d21b6cea5a177ba50d2b341083 ppc-sources-2.4.26-r1.ebuild 799
-MD5 0ad7cfa2c5beff11c34632d1987d97e4 ppc-sources-2.4.26-r3.ebuild 913
-MD5 419708d9cb35fffa914bfad6ec4a60f3 ppc-sources-2.4.24-r4.ebuild 2434
-MD5 09cc990d7d5cc944628b5d16355cab60 ppc-sources-2.4.26-r2.ebuild 875
 MD5 50a315d6c80153b113f7cee31c37cd9a ChangeLog 1300
 MD5 56a15df9612f7e4a07a0af134fa18ffd metadata.xml 231
+MD5 419708d9cb35fffa914bfad6ec4a60f3 ppc-sources-2.4.24-r4.ebuild 2434
+MD5 e9c113d21b6cea5a177ba50d2b341083 ppc-sources-2.4.26-r1.ebuild 799
+MD5 09cc990d7d5cc944628b5d16355cab60 ppc-sources-2.4.26-r2.ebuild 875
+MD5 0ad7cfa2c5beff11c34632d1987d97e4 ppc-sources-2.4.26-r3.ebuild 913
+MD5 98ac34ec29ab79b23d7aa45458c302e1 files/digest-ppc-sources-2.4.24-r4 136
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
 MD5 147fec50180ad91b6260fc7201dcb90f files/ppc-sources-2.4.24.CAN-2004-0010.patch 6050
-MD5 d4a740ae56c2049247083af387a22a85 files/ppc-sources-2.4.26.CAN-2004-0394.patch 350
-MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/ppc-sources-2.4.26.CAN-2004-0497.patch 707
-MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/ppc-sources-2.4.24.CAN-2004-0177.patch 384
 MD5 21f3a4f186017d925067335e24db36a1 files/ppc-sources-2.4.24.CAN-2004-0109.patch 1877
+MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/ppc-sources-2.4.24.CAN-2004-0177.patch 384
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/ppc-sources-2.4.24.CAN-2004-0178.patch 424
-MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
-MD5 e77a93fdf26f06cf3ea5080b27211725 files/ppc-sources-2.4.23.CAN-2003-0985.patch 414
-MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/ppc-sources-2.4.23.rtc_fix.patch 7073
-MD5 98ac34ec29ab79b23d7aa45458c302e1 files/digest-ppc-sources-2.4.24-r4 136
+MD5 174438d215b70cad5ffb00ca8123c062 files/ppc-sources-2.4.24.munmap.patch 837
 MD5 ea3523a550520965a412fb2e1758939c files/digest-ppc-sources-2.4.26-r1 144
+MD5 d4a740ae56c2049247083af387a22a85 files/ppc-sources-2.4.26.CAN-2004-0394.patch 350
 MD5 ea3523a550520965a412fb2e1758939c files/digest-ppc-sources-2.4.26-r2 144
-MD5 ea3523a550520965a412fb2e1758939c files/digest-ppc-sources-2.4.26-r3 144
-MD5 174438d215b70cad5ffb00ca8123c062 files/ppc-sources-2.4.24.munmap.patch 837
-MD5 0f66013f643c79c97fda489618a4e2fd files/ppc-sources-2.4.26.CAN-2004-0535.patch 476
 MD5 dc18e982f8149588a291956481885a8c files/ppc-sources-2.4.26.CAN-2004-0495.patch 17549
-MD5 990ae6b085cb09866bfbb7d44076b8ce files/ppc-sources-2.4.22-r1.via-pmu.diff 907
+MD5 0f66013f643c79c97fda489618a4e2fd files/ppc-sources-2.4.26.CAN-2004-0535.patch 476
+MD5 ea3523a550520965a412fb2e1758939c files/digest-ppc-sources-2.4.26-r3 144
+MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/ppc-sources-2.4.26.CAN-2004-0497.patch 707
diff --git a/sys-kernel/ppc-sources/files/ppc-sources-2.4.22-r1.via-pmu.diff b/sys-kernel/ppc-sources/files/ppc-sources-2.4.22-r1.via-pmu.diff
deleted file mode 100644
index 7c760eab2ac3..000000000000
--- a/sys-kernel/ppc-sources/files/ppc-sources-2.4.22-r1.via-pmu.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur linux-2.4.22.orig/drivers/macintosh/via-pmu.c linux-2.4.22/drivers/macintosh/via-pmu.c
---- linux-2.4.22.orig/drivers/macintosh/via-pmu.c	2003-10-26 13:11:39.000000000 +0100
-+++ linux-2.4.22/drivers/macintosh/via-pmu.c	2003-10-26 13:11:24.000000000 +0100
-@@ -477,7 +477,9 @@
- 	/* Create /proc/pmu */
- 	proc_pmu_root = proc_mkdir("pmu", 0);
- 	if (proc_pmu_root) {
-+#ifdef CONFIG_PMAC_PBOOK
- 		int i;
-+#endif
- 		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/files/ppc-sources-2.4.23.CAN-2003-0985.patch b/sys-kernel/ppc-sources/files/ppc-sources-2.4.23.CAN-2003-0985.patch
deleted file mode 100644
index dacf6ed810f9..000000000000
--- a/sys-kernel/ppc-sources/files/ppc-sources-2.4.23.CAN-2003-0985.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/files/ppc-sources-2.4.23.rtc_fix.patch b/sys-kernel/ppc-sources/files/ppc-sources-2.4.23.rtc_fix.patch
deleted file mode 100644
index 76a663c6e89d..000000000000
--- a/sys-kernel/ppc-sources/files/ppc-sources-2.4.23.rtc_fix.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-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)))