Fixed headers, version bumped to protect against some security vulnerabilities - see bugs #37317 and #37292 for more details.

12 files changed, 412 insertions, 18 deletions

diff --git a/sys-kernel/wolk-sources/Manifest b/sys-kernel/wolk-sources/Manifest
index a1893dfd6ed8..51c479d84d3e 100644
--- a/sys-kernel/wolk-sources/Manifest
+++ b/sys-kernel/wolk-sources/Manifest
@@ -1,12 +1,12 @@
-MD5 c841add29ea5ddc01752eb93c1914d96 wolk-sources-4.10_pre7-r1.ebuild 4015
-MD5 590fec9aff7490a8c2374d5d5ae91a97 ChangeLog 12097
-MD5 791a5f730eafae17aff78355187c8844 wolk-sources-4.10_pre7.ebuild 4012
-MD5 ff233d0f2decc531470e47446383c742 wolk-sources-4.10_pre7-r2.ebuild 4203
+MD5 865a2d87ae7a992da3be94a734111ec0 wolk-sources-4.10_pre7-r1.ebuild 4020
+MD5 ce05e1bd3e016f3556122c01da0d5cee ChangeLog 12109
+MD5 fffdad471260d307109e093b8329a76b wolk-sources-4.10_pre7.ebuild 4017
+MD5 3e9e3a6d3bcf27bb6b2b18d018ad4cc2 wolk-sources-4.10_pre7-r2.ebuild 4208
 MD5 6fd890f722da90b57c3c3f37ff79c75e metadata.xml 226
-MD5 dce8157130cc4280293416470040b3c1 wolk-sources-4.9.ebuild 2017
-MD5 3c56c5a87dcb7379b7378ac2b269f913 wolk-sources-4.9-r1.ebuild 4019
-MD5 22c6f69fb12737527fbcf4666c11cccc wolk-sources-4.9-r3.ebuild 4218
-MD5 59d9c3cf198207c37f39b80376f4c298 wolk-sources-4.9-r2.ebuild 4019
+MD5 a0dcabb396915fb5b0e860888494f1ca wolk-sources-4.9.ebuild 2022
+MD5 4df221792a90e51a0256c62c8877603c wolk-sources-4.9-r1.ebuild 4024
+MD5 3846337958cc498a769937b608385be8 wolk-sources-4.9-r3.ebuild 4223
+MD5 d18ff5a683988f1048963c164c20f209 wolk-sources-4.9-r2.ebuild 4024
 MD5 d5efa40a4cca5b1a29d16204dd1f3a32 files/wolk-4.9s-page.h.patch 635
 MD5 89bada44b04d81e4cb483ff373519e20 files/digest-wolk-sources-4.10_pre7-r2 1393
 MD5 94da93ba922ec8143b6d7a8470747fb5 files/wolk-4.9s-setup.c.patch 531
diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.10_pre7-r2 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.10_pre7-r2
new file mode 100644
index 000000000000..245eac2c6b8e
--- /dev/null
+++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.10_pre7-r2
@@ -0,0 +1,17 @@
+MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
+MD5 1a2631214a59d8cd1baadc709917518b linux-2.4.20-wolk4.0s.patch.bz2 8987097
+MD5 3695872e7123b1f8a0cbf1791755ba9a linux-2.4.20-wolk4.0s-to-4.1s.patch.bz2 38586
+MD5 2e43277e89e06604c6b2f824c1c5bf44 linux-2.4.20-wolk4.1s-to-4.2s.patch.bz2 204629
+MD5 a84b52c73a66d9daf5462cf4aa39311c linux-2.4.20-wolk4.2s-to-4.3s.patch.bz2 38388
+MD5 6fbff6c3c6c0e298eb203d6c2af36772 linux-2.4.20-wolk4.3s-to-4.4s.patch.bz2 634399
+MD5 022f242d488e6def5e23791787491e6e linux-2.4.20-wolk4.4s-to-4.5s.patch.bz2 35905
+MD5 0b758dcfc015034f80b10f8bba194d58 linux-2.4.20-wolk4.5s-to-4.6s.patch.bz2 89749
+MD5 51412491c4aed5b328f7dc68085b865d linux-2.4.20-wolk4.6s-to-4.7s.patch.bz2 726436
+MD5 992ecfbd8c227938ebe395e1b5682bcb linux-2.4.20-wolk4.7s-to-4.8s.patch.bz2 41114
+MD5 06d2f90afaa7438f56653611a7a00cce linux-2.4.20-wolk4.8s-to-4.9s.patch.bz2 400853
+MD5 b979f5f2a55b0ac6070a94e0e026e3af 4.10s-pre7-update.patch.bz2 2701033
+MD5 3495fc5d08cd1c45c3252d438dddd2e9 1007_bootsplash-v3.0.7-2.4.20-0.patch 83101
+MD5 164b794eb5eb3321ee24c6f63734aee9 1007_bootsplash-v3.0.7-2.4.20-1-aty128.patch 1163
+MD5 87bdd189276be8de8c9f8177855e7f27 1007_bootsplash-v3.0.8-2.4.20-update.patch 4402
+MD5 48110e2e60a28e6a433bbb24f0bd93a9 1008_supermount-1.2.9-2.4.20-OLDIDE.patch 169980
+MD5 4c94545d63a35b216c7a9c5c3e10b223 1009_mipv6-0.9.5.1-v2.4.20-wolk4.0s.patch 586142
diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r3 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r3
new file mode 100644
index 000000000000..1a638cec623d
--- /dev/null
+++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r3
@@ -0,0 +1,16 @@
+MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
+MD5 1a2631214a59d8cd1baadc709917518b linux-2.4.20-wolk4.0s.patch.bz2 8987097
+MD5 3695872e7123b1f8a0cbf1791755ba9a linux-2.4.20-wolk4.0s-to-4.1s.patch.bz2 38586
+MD5 2e43277e89e06604c6b2f824c1c5bf44 linux-2.4.20-wolk4.1s-to-4.2s.patch.bz2 204629
+MD5 a84b52c73a66d9daf5462cf4aa39311c linux-2.4.20-wolk4.2s-to-4.3s.patch.bz2 38388
+MD5 6fbff6c3c6c0e298eb203d6c2af36772 linux-2.4.20-wolk4.3s-to-4.4s.patch.bz2 634399
+MD5 022f242d488e6def5e23791787491e6e linux-2.4.20-wolk4.4s-to-4.5s.patch.bz2 35905
+MD5 0b758dcfc015034f80b10f8bba194d58 linux-2.4.20-wolk4.5s-to-4.6s.patch.bz2 89749
+MD5 51412491c4aed5b328f7dc68085b865d linux-2.4.20-wolk4.6s-to-4.7s.patch.bz2 726436
+MD5 992ecfbd8c227938ebe395e1b5682bcb linux-2.4.20-wolk4.7s-to-4.8s.patch.bz2 41114
+MD5 06d2f90afaa7438f56653611a7a00cce linux-2.4.20-wolk4.8s-to-4.9s.patch.bz2 400853
+MD5 3495fc5d08cd1c45c3252d438dddd2e9 1007_bootsplash-v3.0.7-2.4.20-0.patch 83101
+MD5 164b794eb5eb3321ee24c6f63734aee9 1007_bootsplash-v3.0.7-2.4.20-1-aty128.patch 1163
+MD5 87bdd189276be8de8c9f8177855e7f27 1007_bootsplash-v3.0.8-2.4.20-update.patch 4402
+MD5 48110e2e60a28e6a433bbb24f0bd93a9 1008_supermount-1.2.9-2.4.20-OLDIDE.patch 169980
+MD5 4c94545d63a35b216c7a9c5c3e10b223 1009_mipv6-0.9.5.1-v2.4.20-wolk4.0s.patch 586142
diff --git a/sys-kernel/wolk-sources/files/wolk-sources-4.9s.rtc_fix.patch b/sys-kernel/wolk-sources/files/wolk-sources-4.9s.rtc_fix.patch
new file mode 100644
index 000000000000..10e9c228d6d2
--- /dev/null
+++ b/sys-kernel/wolk-sources/files/wolk-sources-4.9s.rtc_fix.patch
@@ -0,0 +1,156 @@
+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/cris/drivers/pcf8563.c linux-2.4.20-wolk4.9s.plasmaroo/arch/cris/drivers/pcf8563.c
+--- linux-2.4.20-wolk4.9s/arch/cris/drivers/pcf8563.c	2004-01-05 23:33:45.000000000 +0000
++++ linux-2.4.20-wolk4.9s.plasmaroo/arch/cris/drivers/pcf8563.c	2004-01-05 23:42:22.000000000 +0000
+@@ -174,6 +174,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(struct rtc_time))) {
+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/mips/sgi-ip27/ip27-rtc.c linux-2.4.20-wolk4.9s.plasmaroo/arch/mips/sgi-ip27/ip27-rtc.c
+--- linux-2.4.20-wolk4.9s/arch/mips/sgi-ip27/ip27-rtc.c	2004-01-05 23:33:45.000000000 +0000
++++ linux-2.4.20-wolk4.9s.plasmaroo/arch/mips/sgi-ip27/ip27-rtc.c	2004-01-05 23:48:34.000000000 +0000
+@@ -84,6 +84,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 -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/hil/hp_sdc_rtc.c linux-2.4.20-wolk4.9s.plasmaroo/drivers/hil/hp_sdc_rtc.c
+--- linux-2.4.20-wolk4.9s/drivers/hil/hp_sdc_rtc.c	2004-01-05 23:33:45.000000000 +0000
++++ linux-2.4.20-wolk4.9s.plasmaroo/drivers/hil/hp_sdc_rtc.c	2004-01-05 23:53:36.000000000 +0000
+@@ -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 -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/wolk-sources/files/wolk-sources.CAN-2003-0985.patch b/sys-kernel/wolk-sources/files/wolk-sources.CAN-2003-0985.patch
new file mode 100644
index 000000000000..bacef69f02f8
--- /dev/null
+++ b/sys-kernel/wolk-sources/files/wolk-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/wolk-sources/wolk-sources-4.10_pre7-r1.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.10_pre7-r1.ebuild
index 3bb75f9dec41..f10a1bdb7a98 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.10_pre7-r1.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.10_pre7-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/wolk-sources/wolk-sources-4.10_pre7-r1.ebuild,v 1.2 2003/12/04 00:08:59 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.10_pre7-r1.ebuild,v 1.3 2004/01/06 00:28:57 plasmaroo Exp $
 
 IUSE="build wolk-bootsplash wolk-supermount ipv6"
 
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.10_pre7-r2.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.10_pre7-r2.ebuild
new file mode 100644
index 000000000000..b00356165707
--- /dev/null
+++ b/sys-kernel/wolk-sources/wolk-sources-4.10_pre7-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.10_pre7-r2.ebuild,v 1.1 2004/01/06 00:28:57 plasmaroo Exp $
+
+IUSE="build wolk-bootsplash wolk-supermount ipv6"
+
+# OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+ETYPE="sources"
+
+inherit kernel || die
+
+OKV=2.4.20
+EXTRAVERSION="-${PN/-*/}4.10s-pre7"
+KV="${OKV}${EXTRAVERSION}"
+
+S=${WORKDIR}/linux-${KV}
+DESCRIPTION="Working Overloaded Linux Kernel (Server-Edition)"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
+SRC_PATH="mirror://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
+
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.0s.patch.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.0s-to-4.1s.patch.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.1s-to-4.2s.patch.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.2s-to-4.3s.patch.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.3s-to-4.4s.patch.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.4s-to-4.5s.patch.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.5s-to-4.6s.patch.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.6s-to-4.7s.patch.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.7s-to-4.8s.patch.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.8s-to-4.9s.patch.bz2
+	http://wolk.sourceforge.net/tmp/4.10s-pre7-update.patch.bz2
+	wolk-bootsplash? ( http://wolk.sourceforge.net/Workstation-Edition/1007_bootsplash-v3.0.7-2.4.20-0.patch
+			 http://wolk.sourceforge.net/Workstation-Edition/1007_bootsplash-v3.0.7-2.4.20-1-aty128.patch
+			 http://wolk.sourceforge.net/Workstation-Edition/1007_bootsplash-v3.0.8-2.4.20-update.patch)
+	wolk-supermount? ( http://wolk.sourceforge.net/Workstation-Edition/1008_supermount-1.2.9-2.4.20-OLDIDE.patch)
+	ipv6? ( http://wolk.sourceforge.net/Workstation-Edition/1009_mipv6-0.9.5.1-v2.4.20-wolk4.0s.patch )"
+
+SLOT="${KV}"
+HOMEPAGE="http://wolk.sourceforge.net http://www.kernel.org"
+
+src_unpack() {
+local PATCHEFILES="-wolk4.0s -wolk4.0s-to-4.1s -wolk4.1s-to-4.2s -wolk4.2s-to-4.3s -wolk4.3s-to-4.4s -wolk4.4s-to-4.5s -wolk4.5s-to-4.6s -wolk4.6s-to-4.7s -wolk4.7s-to-4.8s -wolk4.8s-to-4.9s"
+
+	unpack linux-${OKV}.tar.bz2 || die
+		mv linux-${OKV} linux-${KV} || die
+		cd ${WORKDIR}/linux-${KV} || die
+		for PATCHES in ${PATCHEFILES}
+		do
+			epatch ${DISTDIR}/linux-${OKV}${PATCHES}.patch.bz2 || die
+		done
+
+	epatch ${DISTDIR}/4.10s-pre7-update.patch.bz2 || die
+
+		if [ "`use wolk-supermount`" ]; then
+			einfo "Applying Supermount patch"
+			epatch ${DISTDIR}/1008_supermount-1.2.9-2.4.20-OLDIDE.patch  || die
+		fi
+		if [ "`use ipv6`" ]; then
+			einfo "Applying MIPv6 patch"
+			epatch ${DISTDIR}/1009_mipv6-0.9.5.1-v2.4.20-wolk4.0s.patch  || die
+		fi
+		if [ "`use wolk-bootsplash`" ]; then
+			einfo "Applying Bootsplash patchset"
+			epatch ${DISTDIR}/1007_bootsplash-v3.0.7-2.4.20-0.patch  || die
+			epatch ${DISTDIR}/1007_bootsplash-v3.0.7-2.4.20-1-aty128.patch  || die
+			epatch ${DISTDIR}/1007_bootsplash-v3.0.8-2.4.20-update.patch || die
+		fi
+
+	# unnecessary according to:
+	# http://article.gmane.org/gmane.linux.wolk.devel/275
+	# epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
+	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
+	epatch ${FILESDIR}/${PN}-4.9s.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
+
+	kernel_universal_unpack
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Since wolk-sources-4.6s the 3com 3c59x v0.99Za drivers are excluded."
+	einfo "For many people they may work, but too many people expecting problems"
+	einfo "with this drivers. They will be reintroduced when they are fixed."
+	einfo "You have to fall back to an earlier release of the wolk kernel when you want"
+	einfo "to use one of this drivers."
+	einfo
+	einfo "This new ebuild has support for the workstation patches."
+	einfo "With the wolk-bootsplash, wolk-supermount, and ipv6"
+	einfo "use flags you can take advantage of the, "
+	einfo "Bootsplash, Supermount, MIPv6 patches."
+	ewarn "Patches not guaranteed; YMMV..."
+	einfo
+}
+
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.ebuild
index f9d0df82e6e9..5dccd8a19ef1 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.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/wolk-sources/wolk-sources-4.10_pre7.ebuild,v 1.8 2003/12/04 00:08:59 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.ebuild,v 1.9 2004/01/06 00:28:57 plasmaroo Exp $
 
 IUSE="build wolk-bootsplash wolk-supermount ipv6"
 
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.9-r1.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.9-r1.ebuild
index f1dd92254597..c3295c7125b2 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.9-r1.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.9-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/wolk-sources/wolk-sources-4.9-r1.ebuild,v 1.5 2003/12/02 04:19:13 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9-r1.ebuild,v 1.6 2004/01/06 00:28:57 plasmaroo Exp $
 
 IUSE="build wolk-bootsplash wolk-supermount ipv6"
 
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.9-r2.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.9-r2.ebuild
index 8f146fb92ef8..6925aa747a43 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.9-r2.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.9-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/wolk-sources/wolk-sources-4.9-r2.ebuild,v 1.1 2003/12/02 09:40:44 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9-r2.ebuild,v 1.2 2004/01/06 00:28:57 plasmaroo Exp $
 
 IUSE="build wolk-bootsplash wolk-supermount ipv6"
 
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.9-r3.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.9-r3.ebuild
new file mode 100644
index 000000000000..d9243615fb45
--- /dev/null
+++ b/sys-kernel/wolk-sources/wolk-sources-4.9-r3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9-r3.ebuild,v 1.1 2004/01/06 00:28:57 plasmaroo Exp $
+
+IUSE="build wolk-bootsplash wolk-supermount ipv6"
+
+# OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+ETYPE="sources"
+
+inherit kernel || die
+
+OKV=2.4.20
+EXTRAVERSION="-${PN/-*/}4.9s"
+KV="${OKV}${EXTRAVERSION}"
+
+S=${WORKDIR}/linux-${KV}
+DESCRIPTION="Working Overloaded Linux Kernel (Server-Edition)"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
+SRC_PATH="mirror://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
+
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.0s.patch.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.0s-to-4.1s.patch.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.1s-to-4.2s.patch.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.2s-to-4.3s.patch.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.3s-to-4.4s.patch.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.4s-to-4.5s.patch.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.5s-to-4.6s.patch.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.6s-to-4.7s.patch.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.7s-to-4.8s.patch.bz2
+	mirror://sourceforge/wolk/linux-${OKV}-wolk4.8s-to-4.9s.patch.bz2
+		wolk-bootsplash? ( http://wolk.sourceforge.net/Workstation-Edition/1007_bootsplash-v3.0.7-2.4.20-0.patch
+			http://wolk.sourceforge.net/Workstation-Edition/1007_bootsplash-v3.0.7-2.4.20-1-aty128.patch
+			http://wolk.sourceforge.net/Workstation-Edition/1007_bootsplash-v3.0.8-2.4.20-update.patch)
+		wolk-supermount? ( http://wolk.sourceforge.net/Workstation-Edition/1008_supermount-1.2.9-2.4.20-OLDIDE.patch)
+		ipv6? ( http://wolk.sourceforge.net/Workstation-Edition/1009_mipv6-0.9.5.1-v2.4.20-wolk4.0s.patch )"
+
+SLOT="${KV}"
+HOMEPAGE="http://wolk.sourceforge.net http://www.kernel.org"
+
+src_unpack() {
+local PATCHEFILES="-wolk4.0s -wolk4.0s-to-4.1s -wolk4.1s-to-4.2s -wolk4.2s-to-4.3s -wolk4.3s-to-4.4s -wolk4.4s-to-4.5s -wolk4.5s-to-4.6s -wolk4.6s-to-4.7s -wolk4.7s-to-4.8s -wolk4.8s-to-4.9s"
+	unpack linux-${OKV}.tar.bz2 || die
+		mv linux-${OKV} linux-${KV} || die
+		cd ${WORKDIR}/linux-${KV} || die
+		for PATCHES in ${PATCHEFILES}
+		do
+			epatch ${DISTDIR}/linux-${OKV}${PATCHES}.patch.bz2 || die
+		done
+
+	einfo "Applying nvidia patches"
+	epatch ${FILESDIR}/wolk-4.9s-page.h.patch || die
+	epatch ${FILESDIR}/wolk-4.9s-setup.c.patch || die
+
+	einfo "Applying other needed patches"
+	epatch ${FILESDIR}/wolk-4.9s-speedstep.c.patch || die
+
+	if [ "`use wolk-supermount`" ]; then
+		ewinfo "Applying Supermount patch"
+		epatch ${DISTDIR}/1008_supermount-1.2.9-2.4.20-OLDIDE.patch  || die
+	fi
+	if [ "`use ipv6`" ]; then
+		einfo "Applying MIPv6 patch"
+		epatch ${DISTDIR}/1009_mipv6-0.9.5.1-v2.4.20-wolk4.0s.patch  || die
+	fi
+
+	if [ "`use wolk-bootsplash`" ]; then
+		einfo "Applying Bootsplash patches"
+		epatch ${DISTDIR}/1007_bootsplash-v3.0.7-2.4.20-0.patch  || die
+		epatch ${DISTDIR}/1007_bootsplash-v3.0.7-2.4.20-1-aty128.patch  || die
+		epatch ${DISTDIR}/1007_bootsplash-v3.0.8-2.4.20-update.patch || die
+	fi
+
+	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch for do_brk() vulnerability!"
+	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
+	epatch ${FILESDIR}/${PN}-4.9s.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
+
+	kernel_universal_unpack
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Since wolk-sources-4.6s the 3com 3c59x v0.99Za drivers are excluded."
+	einfo "For many people they may work, but too many people expecting problems"
+	einfo "with this drivers. They will be reintroduced when they are fixed."
+	einfo "You have to fall back to an earlier release of the wolk kernel when you want"
+	einfo "to use one of this drivers."
+	einfo
+	einfo "This new ebuild has support for the workstation patches."
+	einfo "With the wolk-bootsplash, wolk-supermount, and"
+	einfo "ipv6 use flags you can take advantage of the"
+	einfo "Bootsplash, Supermount, and MIPv6 patches."
+	ewarn "Patches not guaranteed; YMMV..."
+	einfo
+}
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.9.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.9.ebuild
index 59a7b57ab0e3..e77de017e019 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.9.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.9.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/wolk-sources/wolk-sources-4.9.ebuild,v 1.5 2003/12/02 04:19:13 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9.ebuild,v 1.6 2004/01/06 00:28:57 plasmaroo Exp $
 
 IUSE="build"