Fixed headers, and bumped to a new revision with the 2.4.24 security patches. See bugs #37317 and #37292.

20 files changed, 319 insertions, 45 deletions

diff --git a/sys-kernel/hppa-sources/ChangeLog b/sys-kernel/hppa-sources/ChangeLog
index a9ac072de5ad..9e40fecb4418 100644
--- a/sys-kernel/hppa-sources/ChangeLog
+++ b/sys-kernel/hppa-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/hppa-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/ChangeLog,v 1.26 2003/12/31 15:58:32 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/ChangeLog,v 1.27 2004/01/06 19:58:13 plasmaroo Exp $
+
+*hppa-sources-2.4.23_p4-r2 (06 Jan 2004)
+
+  06 Jan 2004; <plasmaroo@gentoo.org> hppa-sources-2.4.23_p4-r2.ebuild,
+  files/hppa-sources.CAN-2003-0985.patch, files/hppa-sources.rtc_fix.patch:
+  Added patches to address the security vulnerabilities in bugs #37292 and
+  #37317.
 
 *hppa-sources-2.4.23_p4-r1 (28 Dec 2003)
 
diff --git a/sys-kernel/hppa-sources/Manifest b/sys-kernel/hppa-sources/Manifest
index 5b5852fe06d6..29e6ac5ee640 100644
--- a/sys-kernel/hppa-sources/Manifest
+++ b/sys-kernel/hppa-sources/Manifest
@@ -1,20 +1,20 @@
-MD5 622e8f2314c5ea410458584582a6e460 hppa-sources-2.4.21_p10.ebuild 1561
-MD5 0bbe2f61ecebe1eb0d3eafb16295ec4b ChangeLog 4031
-MD5 0667cf3202c25da239dfee81f2003ca6 hppa-sources-2.4.23_p4-r1.ebuild 2371
-MD5 8ead225e4121c070404ba3246354ac60 hppa-sources-2.4.21_p8.ebuild 1485
+MD5 51f36b719aef57601b622fca2df7dcac hppa-sources-2.4.21_p10.ebuild 1566
+MD5 bc930c89e85e0b318f012b37ba0926ed ChangeLog 4034
+MD5 f30177716d47f34f7c2baab51e32f96c hppa-sources-2.4.23_p4-r1.ebuild 2374
+MD5 00d7d880b7a90e400799a444b539c774 hppa-sources-2.4.21_p8.ebuild 1490
 MD5 05ed5731534e9423f109cbec1aa7e993 metadata.xml 223
-MD5 38b00b5d2411620e0ff2f40b7f3228f6 hppa-sources-2.4.21_p2.ebuild 1082
-MD5 d1634464af966cde568341c2ed96b6a8 hppa-sources-2.4.23_p4-r2.ebuild 2553
-MD5 0dcef44b9c80df51b0a94704894f781e hppa-sources-2.4.22_p13.ebuild 1874
-MD5 0758f55b4873a3d88c96aec4952597c3 hppa-sources-2.4.21_p13.ebuild 1879
-MD5 a7731136711ea8a34621c9247dece54a hppa-sources-2.4.22_p6.ebuild 1795
-MD5 a6ee3f76c9292211bafbc08ab583b3ce hppa-sources-2.4.21_p9.ebuild 1560
-MD5 6bdfbb6a1254cd02158e028a37e5266f hppa-sources-2.4.22_p17.ebuild 1874
-MD5 1f0f4c545f91d73945cd2b70cef8048a hppa-sources-2.4.21_p7.ebuild 1082
-MD5 d2c27c55a1aa36cf5f88533bd8e252de hppa-sources-2.4.23_p3.ebuild 1049
-MD5 09f6accca0f7d64509ba9c0ceb968229 hppa-sources-2.4.22_p10.ebuild 1787
-MD5 eec55809d1047284ca33e9eebd18c15e hppa-sources-2.4.23_p4.ebuild 1711
-MD5 dc1a2fc752979121cc9bad084290ea83 hppa-sources-2.4.21_p6.ebuild 1082
+MD5 9ef4b6ac1a5d02b0bfd4f49d7404511f hppa-sources-2.4.21_p2.ebuild 1087
+MD5 05ac1542399eeb2017cffca899fd5006 hppa-sources-2.4.23_p4-r2.ebuild 2556
+MD5 1be4b0226c0ee84ddde4936ba021a672 hppa-sources-2.4.22_p13.ebuild 1879
+MD5 3e8a90325c2148e1a02cb477ff04ca87 hppa-sources-2.4.21_p13.ebuild 1884
+MD5 bf8f1b8b6a52e8143591ae5e06050c7a hppa-sources-2.4.22_p6.ebuild 1800
+MD5 79a6bf893ddc10492b14288bf896c4cf hppa-sources-2.4.21_p9.ebuild 1565
+MD5 8b46b5f8597f99d9e756141ec684e7ef hppa-sources-2.4.22_p17.ebuild 1879
+MD5 ea46be0aff5d4dc4b9994572fa531517 hppa-sources-2.4.21_p7.ebuild 1087
+MD5 1c944d786538d3fcc7664f02fc1dd624 hppa-sources-2.4.23_p3.ebuild 1052
+MD5 7563a882378776cfb0f461ea68440a67 hppa-sources-2.4.22_p10.ebuild 1792
+MD5 bee2f1a7f9d66d115848622af53b8d33 hppa-sources-2.4.23_p4.ebuild 1714
+MD5 acda3b4244daae692e9ff29df996db4f hppa-sources-2.4.21_p6.ebuild 1087
 MD5 7743c939ccccf0343faed987e12b489b files/digest-hppa-sources-2.4.21_p10 334
 MD5 21f8036e5fe4337145680f7b384774ab files/digest-hppa-sources-2.4.22_p17 870
 MD5 d641cd49ae63ca2989672d2209691bb5 files/hppa-sources.CAN-2003-0985.patch 414
diff --git a/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.23_p4-r2 b/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.23_p4-r2
new file mode 100644
index 000000000000..e93a8fde744e
--- /dev/null
+++ b/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.23_p4-r2
@@ -0,0 +1,6 @@
+MD5 642af5ab5e1fc63685fde85e9ae601e4 linux-2.4.23.tar.bz2 29832609
+MD5 e3d60ede46a72bfed58d7e6b3a34bd0c patch-2.4.23-pa1.gz 715027
+MD5 d1ef1d7ef6d68bee06aae58c824f82bc patch-2.4.23-pa1-pa2.gz 4141
+MD5 255e3de06190a68e71ebd960a51c53a8 patch-2.4.23-pa2-pa3.gz 919
+MD5 498c36aba7ea1e20436f83609867a9dd patch-2.4.23-pa3-pa4.gz 443
+MD5 fd23b7f3af634c6e93151cb48cbde8d8 xfs-2.4.23_p4-hppa.patch.bz2 1188535
diff --git a/sys-kernel/hppa-sources/files/hppa-sources.CAN-2003-0985.patch b/sys-kernel/hppa-sources/files/hppa-sources.CAN-2003-0985.patch
new file mode 100644
index 000000000000..bacef69f02f8
--- /dev/null
+++ b/sys-kernel/hppa-sources/files/hppa-sources.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/hppa-sources/files/hppa-sources.rtc_fix.patch b/sys-kernel/hppa-sources/files/hppa-sources.rtc_fix.patch
new file mode 100644
index 000000000000..76a663c6e89d
--- /dev/null
+++ b/sys-kernel/hppa-sources/files/hppa-sources.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/hppa-sources/hppa-sources-2.4.21_p10.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.21_p10.ebuild
index 4f54bbfb45d1..e686747a6d03 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.21_p10.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.21_p10.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/hppa-sources/hppa-sources-2.4.21_p10.ebuild,v 1.3 2003/10/27 13:49:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.21_p10.ebuild,v 1.4 2004/01/06 19:58:13 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.21_p13.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.21_p13.ebuild
index b79815623c7a..ef7e9aa2bad3 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.21_p13.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.21_p13.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/hppa-sources/hppa-sources-2.4.21_p13.ebuild,v 1.3 2003/10/27 13:49:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.21_p13.ebuild,v 1.4 2004/01/06 19:58:13 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.21_p2.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.21_p2.ebuild
index 9c154074ec7b..7d4c266c99f8 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.21_p2.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.21_p2.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/hppa-sources/hppa-sources-2.4.21_p2.ebuild,v 1.4 2003/10/27 13:49:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.21_p2.ebuild,v 1.5 2004/01/06 19:58:13 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.21_p6.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.21_p6.ebuild
index e89e6f51804a..c7f4dbe52f15 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.21_p6.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.21_p6.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/hppa-sources/hppa-sources-2.4.21_p6.ebuild,v 1.4 2003/10/27 13:49:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.21_p6.ebuild,v 1.5 2004/01/06 19:58:13 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.21_p7.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.21_p7.ebuild
index 6898342f131d..ed5b5a52303a 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.21_p7.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.21_p7.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/hppa-sources/hppa-sources-2.4.21_p7.ebuild,v 1.3 2003/10/27 13:49:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.21_p7.ebuild,v 1.4 2004/01/06 19:58:13 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.21_p8.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.21_p8.ebuild
index 205a9ec0573c..b456f9aae0c4 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.21_p8.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.21_p8.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/hppa-sources/hppa-sources-2.4.21_p8.ebuild,v 1.3 2003/10/27 13:49:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.21_p8.ebuild,v 1.4 2004/01/06 19:58:13 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.21_p9.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.21_p9.ebuild
index 3d4659236a7f..d1606156f213 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.21_p9.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.21_p9.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/hppa-sources/hppa-sources-2.4.21_p9.ebuild,v 1.3 2003/10/27 13:49:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.21_p9.ebuild,v 1.4 2004/01/06 19:58:13 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.22_p10.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.22_p10.ebuild
index 0e4511f9df77..22c72712ead0 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.22_p10.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.22_p10.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/hppa-sources/hppa-sources-2.4.22_p10.ebuild,v 1.2 2003/10/27 13:49:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.22_p10.ebuild,v 1.3 2004/01/06 19:58:13 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.22_p13.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.22_p13.ebuild
index de0199af2cae..7d9ffb42acc1 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.22_p13.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.22_p13.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/hppa-sources/hppa-sources-2.4.22_p13.ebuild,v 1.2 2003/12/02 03:37:30 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.22_p13.ebuild,v 1.3 2004/01/06 19:58:13 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.22_p17.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.22_p17.ebuild
index 8ec3045fc5a4..2979050d67f1 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.22_p17.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.22_p17.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/hppa-sources/hppa-sources-2.4.22_p17.ebuild,v 1.2 2003/12/02 03:37:30 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.22_p17.ebuild,v 1.3 2004/01/06 19:58:13 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.22_p6.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.22_p6.ebuild
index 4b837a1afeb3..66daeda3e925 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.22_p6.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.22_p6.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/hppa-sources/hppa-sources-2.4.22_p6.ebuild,v 1.3 2003/10/27 13:49:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.22_p6.ebuild,v 1.4 2004/01/06 19:58:13 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.23_p3.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.23_p3.ebuild
index 5b5750e36256..53bd5f7c426d 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.23_p3.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.23_p3.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/hppa-sources/hppa-sources-2.4.23_p3.ebuild,v 1.2 2003/12/05 21:41:17 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.23_p3.ebuild,v 1.3 2004/01/06 19:58:13 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r1.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r1.ebuild
index 7d4c25f068da..7bbb8f100158 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r1.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-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/hppa-sources/hppa-sources-2.4.23_p4-r1.ebuild,v 1.3 2003/12/31 15:58:32 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r1.ebuild,v 1.4 2004/01/06 19:58:13 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r2.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r2.ebuild
new file mode 100644
index 000000000000..7d419e4dcecc
--- /dev/null
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r2.ebuild,v 1.1 2004/01/06 19:58:13 plasmaroo Exp $
+#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+ETYPE="sources"
+inherit kernel
+OKV="${PV/_p*/}"
+PATCH_LEVEL="${PV/${OKV}_p/}"
+KV=${OKV}-pa${PATCH_LEVEL}
+EXTRAVERSION="-pa${PATCH_LEVEL}"
+S=${WORKDIR}/linux-${KV}
+IUSE="xfs"
+
+PATCH_SET="`seq 1 ${PATCH_LEVEL}`"
+PATCH_COUNT="$(( `echo ${PATCH_SET} | wc -w` - 1 ))"
+
+
+DESCRIPTION="Full sources for the Linux kernel with patch for hppa"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 http://ftp.parisc-linux.org/cvs/linux-2.4/patch-${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'`.gz
+`for i in \`seq 1 ${PATCH_COUNT}\`; do echo http://ftp.parisc-linux.org/cvs/linux-2.4/patch-${OKV}-pa\`echo ${PATCH_SET} | awk \"{ print \\\\\$$i }\"\`-pa\`echo ${PATCH_SET} | awk \"{ print \\\\\$$((i + 1)) }\"\`.gz; done`
+xfs? ( http://dev.gentoo.org/~gmsoft/patches/xfs-${PV}-hppa.patch.bz2 )"
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://parisc-linux.org"
+KEYWORDS="~hppa -*"
+SLOT="${KV}"
+
+
+src_unpack() {
+	unpack linux-${OKV}.tar.bz2
+	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${KV}
+	cd ${S}
+
+	einfo Applying ${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'`
+	zcat ${DISTDIR}/patch-${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'`.gz | patch -sp 1
+
+	for i in `seq 1 ${PATCH_COUNT}`
+	do
+		a=`echo ${PATCH_SET} | awk "{ print \\\$$i }"`
+		b=`echo ${PATCH_SET} | awk "{ print \\\$$((i + 1)) }"`
+		einfo Applying patch from ${OKV}-pa${a} to ${OKV}-pa${b}
+		zcat ${DISTDIR}/patch-${OKV}-pa${a}-pa${b}.gz | patch -sp 1
+	done
+
+	use xfs && epatch ${DISTDIR}/xfs-${PV}-hppa.patch.bz2
+
+	DEFCONFIG="${S}/arch/parisc/defconfig"
+
+	# Tweaks the default configuration
+
+	for i in CONFIG_SERIAL_NONSTANDARD CONFIG_PDC_CONSOLE CONFIG_DEVFS_FS \
+		CONFIG_USB CONFIG_USB_OHCI CONFIG_USB_HID CONFIG_USB_HIDINPUT \
+		CONFIG_CRC32 CONFIG_BLK_STATS
+	do
+		sed -i -e "s/^.*${i}\ .*$//" "${DEFCONFIG}"
+		echo "${i}=y" >> "${DEFCONFIG}"
+	done
+
+	for i in CONFIG_HOTPLUG CONFIG_PARPORT CONFIG_BLK_DEV_RAM CONFIG_MD \
+		CONFIG_CRYPTO CONFIG_DEVPTS_FS
+	do
+		sed -i -e "s/^.*${i}=.*$/# ${i} is not set/" "${DEFCONFIG}"
+	done
+
+	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
+	epatch ${FILESDIR}/${PN}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
+
+	kernel_universal_unpack
+}
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4.ebuild
index 49410738b0f5..0913f1d7e96f 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4.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/hppa-sources/hppa-sources-2.4.23_p4.ebuild,v 1.1 2003/12/18 19:17:19 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4.ebuild,v 1.2 2004/01/06 19:58:13 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"