Added 2.4.24 security patches; see bugs #37317 and #37292 for more details. Headers also fixed.

12 files changed, 288 insertions, 20 deletions

diff --git a/sys-kernel/gs-sources/ChangeLog b/sys-kernel/gs-sources/ChangeLog
index 8af27d3b6f7a..299683a247f0 100644
--- a/sys-kernel/gs-sources/ChangeLog
+++ b/sys-kernel/gs-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/gs-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/ChangeLog,v 1.29 2003/12/12 23:38:04 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/ChangeLog,v 1.30 2004/01/06 19:32:38 plasmaroo Exp $
+
+*gs-sources-2.4.23_pre8-r2 (06 Jan 2004)
+
+  06 Jan 2004; <plasmaroo@gentoo.org> gs-sources-2.4.23_pre8-r2.ebuild,
+  files/gs-sources.CAN-2003-0985.patch, files/gs-sources.rtc_fix.patch:
+  Added the 2.4.24 security patches for the mremap() vulnerability and
+  the RTC leaks. Please see bug #37292 and bug #37292.
 
   12 Dec 2003; <plasmaroo@gentoo.org> gs-sources-2.4.23_pre8-r1.ebuild,
   files/gs-sources-2.4.23_pre8-af_irda.patch:
diff --git a/sys-kernel/gs-sources/Manifest b/sys-kernel/gs-sources/Manifest
index 9fec2f8ebad5..6831155aefe1 100644
--- a/sys-kernel/gs-sources/Manifest
+++ b/sys-kernel/gs-sources/Manifest
@@ -1,18 +1,22 @@
-MD5 de01934e2fc87e2c1d42979430a23ad4 ChangeLog 5501
-MD5 1df7eef729f64224f4a95976b09b004a gs-sources-2.4.23_pre7.ebuild 1950
-MD5 87c15004851f26f9291567df0a355c7b gs-sources-2.4.23_pre6-r1.ebuild 1959
-MD5 8492209c2a15f6d924c36276d2a0aee1 gs-sources-2.4.22_pre2.ebuild 2026
-MD5 46c8ec068663d1638b25284092ea9bc4 gs-sources-2.4.23_pre8.ebuild 1950
+MD5 174d30d1e7a2d612784c4de4409c172b ChangeLog 5814
+MD5 069c597a916d1fde8eebced409db2ac4 gs-sources-2.4.23_pre7.ebuild 1951
+MD5 2cfd4fd196b9d42cd91582356ffb410f gs-sources-2.4.23_pre6-r1.ebuild 1960
+MD5 768a627dc6c2ceaa320bde51402e54a3 gs-sources-2.4.22_pre2.ebuild 2031
+MD5 938e3a5a3ee88a417d34209a69518bcc gs-sources-2.4.23_pre8-r2.ebuild 2194
+MD5 241ee5db29359dd14e0288ef611e0551 gs-sources-2.4.23_pre8.ebuild 1951
 MD5 4df72e65b139d3e4c18bec81f3a561df metadata.xml 227
-MD5 23991f603a7085a753a3d26cccefcaef gs-sources-2.4.23_pre8-r1.ebuild 2011
-MD5 783e7c84cf51942f711d519bf8d2cae8 gs-sources-2.4.23_pre6.ebuild 1950
+MD5 185dc4dd817ed6c8909bd8709d990784 gs-sources-2.4.23_pre8-r1.ebuild 2011
+MD5 a0e5894f5657746e3763c0ef5ffc3c0f gs-sources-2.4.23_pre6.ebuild 1951
 MD5 a56ba93e6d5df0f6298e9fc3b517424b files/digest-gs-sources-2.4.23_pre8-r1 144
 MD5 517fc1b71501382d041ce0bdfe304511 files/00_3.5-useraddress.patch 7247
 MD5 a56ba93e6d5df0f6298e9fc3b517424b files/digest-gs-sources-2.4.23_pre8 144
+MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/gs-sources.rtc_fix.patch 7073
 MD5 59790ea2368541ef6004889d6af417cc files/digest-gs-sources-2.4.23_pre6-r1 147
 MD5 9a7af8c010a2d4d64bfb70358fea3a62 files/digest-gs-sources-2.4.23_pre7 144
 MD5 4220f7240ff50a9a0b993acc7fab408e files/digest-gs-sources-2.4.22_pre2 144
 MD5 206fe55c70506a82e49b1249d83361a0 files/digest-gs-sources-2.4.23_pre6 144
 MD5 a3ec1083055b245758b2262dd2245145 files/pci.ids.patch 3376
+MD5 d641cd49ae63ca2989672d2209691bb5 files/gs-sources.CAN-2003-0985.patch 414
 MD5 453c6a41c6c505e5f04c3885f54278c7 files/gs-sources-2.4.23_pre8-af_irda.patch 701
+MD5 a56ba93e6d5df0f6298e9fc3b517424b files/digest-gs-sources-2.4.23_pre8-r2 144
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
diff --git a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.23_pre8-r2 b/sys-kernel/gs-sources/files/digest-gs-sources-2.4.23_pre8-r2
new file mode 100644
index 000000000000..aad81484b58e
--- /dev/null
+++ b/sys-kernel/gs-sources/files/digest-gs-sources-2.4.23_pre8-r2
@@ -0,0 +1,2 @@
+MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
+MD5 64aff10db764dc7bdbfb105466db45ec patches-2.4.23_pre8-gss.tar.bz2 3663061
diff --git a/sys-kernel/gs-sources/files/gs-sources.CAN-2003-0985.patch b/sys-kernel/gs-sources/files/gs-sources.CAN-2003-0985.patch
new file mode 100644
index 000000000000..bacef69f02f8
--- /dev/null
+++ b/sys-kernel/gs-sources/files/gs-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/gs-sources/files/gs-sources.rtc_fix.patch b/sys-kernel/gs-sources/files/gs-sources.rtc_fix.patch
new file mode 100644
index 000000000000..76a663c6e89d
--- /dev/null
+++ b/sys-kernel/gs-sources/files/gs-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/gs-sources/gs-sources-2.4.22_pre2.ebuild b/sys-kernel/gs-sources/gs-sources-2.4.22_pre2.ebuild
index 51f452cd2c76..643ce0f85664 100644
--- a/sys-kernel/gs-sources/gs-sources-2.4.22_pre2.ebuild
+++ b/sys-kernel/gs-sources/gs-sources-2.4.22_pre2.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/gs-sources/gs-sources-2.4.22_pre2.ebuild,v 1.6 2003/12/01 22:51:34 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/gs-sources-2.4.22_pre2.ebuild,v 1.7 2004/01/06 19:32:38 plasmaroo Exp $
 
 IUSE="build crypt"
 
diff --git a/sys-kernel/gs-sources/gs-sources-2.4.23_pre6-r1.ebuild b/sys-kernel/gs-sources/gs-sources-2.4.23_pre6-r1.ebuild
index 8fc1a63f4ab7..92e25fec2158 100644
--- a/sys-kernel/gs-sources/gs-sources-2.4.23_pre6-r1.ebuild
+++ b/sys-kernel/gs-sources/gs-sources-2.4.23_pre6-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/gs-sources/gs-sources-2.4.23_pre6-r1.ebuild,v 1.1 2003/10/04 20:51:14 livewire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/gs-sources-2.4.23_pre6-r1.ebuild,v 1.2 2004/01/06 19:32:38 plasmaroo Exp $
 
 IUSE="build crypt"
 
diff --git a/sys-kernel/gs-sources/gs-sources-2.4.23_pre6.ebuild b/sys-kernel/gs-sources/gs-sources-2.4.23_pre6.ebuild
index ec94318fbc65..c86577606cac 100644
--- a/sys-kernel/gs-sources/gs-sources-2.4.23_pre6.ebuild
+++ b/sys-kernel/gs-sources/gs-sources-2.4.23_pre6.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/gs-sources/gs-sources-2.4.23_pre6.ebuild,v 1.1 2003/10/04 18:44:47 livewire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/gs-sources-2.4.23_pre6.ebuild,v 1.2 2004/01/06 19:32:38 plasmaroo Exp $
 
 IUSE="build crypt"
 
diff --git a/sys-kernel/gs-sources/gs-sources-2.4.23_pre7.ebuild b/sys-kernel/gs-sources/gs-sources-2.4.23_pre7.ebuild
index 92c5989793e9..d6f5ecf2446f 100644
--- a/sys-kernel/gs-sources/gs-sources-2.4.23_pre7.ebuild
+++ b/sys-kernel/gs-sources/gs-sources-2.4.23_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/gs-sources/gs-sources-2.4.23_pre7.ebuild,v 1.1 2003/10/14 22:35:33 livewire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/gs-sources-2.4.23_pre7.ebuild,v 1.2 2004/01/06 19:32:38 plasmaroo Exp $
 
 IUSE="build crypt"
 
diff --git a/sys-kernel/gs-sources/gs-sources-2.4.23_pre8-r1.ebuild b/sys-kernel/gs-sources/gs-sources-2.4.23_pre8-r1.ebuild
index 003a3c6a2652..a133dc6782e7 100644
--- a/sys-kernel/gs-sources/gs-sources-2.4.23_pre8-r1.ebuild
+++ b/sys-kernel/gs-sources/gs-sources-2.4.23_pre8-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/gs-sources/gs-sources-2.4.23_pre8-r1.ebuild,v 1.2 2003/12/12 23:38:04 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/gs-sources-2.4.23_pre8-r1.ebuild,v 1.3 2004/01/06 19:32:38 plasmaroo Exp $
 
 IUSE="build crypt"
 
diff --git a/sys-kernel/gs-sources/gs-sources-2.4.23_pre8-r2.ebuild b/sys-kernel/gs-sources/gs-sources-2.4.23_pre8-r2.ebuild
new file mode 100644
index 000000000000..fdfe3e0803c6
--- /dev/null
+++ b/sys-kernel/gs-sources/gs-sources-2.4.23_pre8-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/gs-sources-2.4.23_pre8-r2.ebuild,v 1.1 2004/01/06 19:32:38 plasmaroo Exp $
+
+IUSE="build crypt"
+
+# OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+# Kernel ebuilds using the kernel.eclass can remove any patch that you
+# do not want to apply by simply setting the KERNEL_EXCLUDE shell
+# variable to the string you want to exclude (for instance
+# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
+# *evms*).  Kernels are only tested in the default configuration, but
+# this may be useful if you know that a particular patch is causing a
+# conflict with a patch you personally want to apply, or some other
+# similar situation.
+
+ETYPE="sources"
+
+inherit kernel
+PROVIDE="virtual/linux-sources virtual/winkernel"
+OKV=2.4.22
+EXTRAVERSION=_pre8-gss
+KV=2.4.23_pre8-gss
+S=${WORKDIR}/linux-${KV}
+
+# Documentation on the patches contained in this kernel will be installed
+# to /usr/share/doc/gs-sources-${PV}/patches.txt.gz
+
+DESCRIPTION="This kernel stays up to date with current kernel -pres,
+	with recent acpi,evms,win3lin ,futexes,aic79xx,
+	superfreeswan,preempt/ll, and various hw fixes."
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+	 mirror://gentoo/patches-${KV}.tar.bz2"
+KEYWORDS="x86 -ppc -sparc"
+SLOT="${KV}"
+
+src_unpack() {
+
+	unpack ${A}
+	mv linux-${OKV} linux-${KV} || die
+	cd ${KV} || die
+	# Kill patches we aren't suppposed to use, don't worry about
+	# failures, if they aren't there that is a good thing!
+	# This is the ratified crypt USE flag, enables IPSEC and patch-int
+	if [ -z "`use crypt`" ]; then
+		einfo "No Cryptographic support, dropping patches..."
+		for file in 8*;do
+			einfo "Dropping ${file}..."
+			rm -f ${file}
+		done
+	else
+		einfo "Cryptographic support enabled..."
+	fi
+
+	kernel_src_unpack
+	cd ${S} && epatch ${FILESDIR}/${P}-af_irda.patch || die
+
+	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!"
+
+}
diff --git a/sys-kernel/gs-sources/gs-sources-2.4.23_pre8.ebuild b/sys-kernel/gs-sources/gs-sources-2.4.23_pre8.ebuild
index 4dafc18c40db..395a40314b4c 100644
--- a/sys-kernel/gs-sources/gs-sources-2.4.23_pre8.ebuild
+++ b/sys-kernel/gs-sources/gs-sources-2.4.23_pre8.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/gs-sources/gs-sources-2.4.23_pre8.ebuild,v 1.1 2003/10/27 02:10:10 livewire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/gs-sources-2.4.23_pre8.ebuild,v 1.2 2004/01/06 19:32:38 plasmaroo Exp $
 
 IUSE="build crypt"