grsec2 has gone stable upstream, removing old portage cruft from tree to make life for security@gentoo easier.

16 files changed, 26 insertions, 509 deletions

diff --git a/sys-kernel/grsec-sources/ChangeLog b/sys-kernel/grsec-sources/ChangeLog
index 2d3b0b3a4507..6d32707b48e1 100644
--- a/sys-kernel/grsec-sources/ChangeLog
+++ b/sys-kernel/grsec-sources/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-kernel/grsec-sources
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/ChangeLog,v 1.17 2004/03/12 02:13:58 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/ChangeLog,v 1.18 2004/04/18 07:56:37 solar Exp $
+
+*grsec-sources-2.4.26.2.0 (18 Apr 2004)
+
+  18 Apr 2004; <solar@gentoo.org> grsec-sources-2.4.24.1.9.13-r1.ebuild,
+  grsec-sources-2.4.24.1.9.13.ebuild, grsec-sources-2.4.25.1.9.14.ebuild,
+  grsec-sources-2.4.25.2.0_rc5.ebuild, grsec-sources-2.4.26.2.0.ebuild,
+  metadata.xml, files/do_brk_fix.patch,
+  files/grsec-sources-2.4.23.CAN-2003-0985.patch,
+  files/grsec-sources-2.4.23.rtc_fix.patch,
+  files/grsec-sources-2.4.24.1.9.13.munmap.patch:
+  grsec2 has gone stable upstream, removing old portage cruft from tree to make
+  life for security@gentoo easier.
 
   11 Mar 2004; <solar@gentoo.org> grsec-sources-2.4.24.1.9.13-r1.ebuild,
   grsec-sources-2.4.24.1.9.13.ebuild, grsec-sources-2.4.25.1.9.14.ebuild,
diff --git a/sys-kernel/grsec-sources/Manifest b/sys-kernel/grsec-sources/Manifest
index 1cea4044d316..507f0d30d21a 100644
--- a/sys-kernel/grsec-sources/Manifest
+++ b/sys-kernel/grsec-sources/Manifest
@@ -1,15 +1,5 @@
-MD5 8dbc5c9e2c14d572c7f1539cea341caf grsec-sources-2.4.25.2.0_rc5.ebuild 3173
-MD5 d3f148899931f96051df77f6f614f60b grsec-sources-2.4.25.1.9.14.ebuild 3172
-MD5 225cb9e370f4e7d3bc1a98549377249e metadata.xml 484
 MD5 dfd4f02b206783259b34c52bd16d3f20 ChangeLog 3396
-MD5 c8f19db82fb5ca1dce38b68cb75b7989 grsec-sources-2.4.24.1.9.13.ebuild 2951
-MD5 a9959d46f01e6b09e019abd022e33d8f grsec-sources-2.4.24.1.9.13-r1.ebuild 2942
-MD5 3e6432ed3de7596318d58a3084f1bda8 files/digest-grsec-sources-2.4.25.2.0_rc5 221
-MD5 d8052b545fc3865a07f5d8df6b513a58 files/digest-grsec-sources-2.4.25.1.9.14 219
-MD5 e77a93fdf26f06cf3ea5080b27211725 files/grsec-sources-2.4.23.CAN-2003-0985.patch 414
-MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/grsec-sources-2.4.23.rtc_fix.patch 7073
-MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
-MD5 d8266c3fd31880277da566681a943098 files/digest-grsec-sources-2.4.24.1.9.13 67
+MD5 441b6aefac643a81a8589a01188a334f metadata.xml 479
+MD5 e5639c975c580f368a2ab88e297def32 grsec-sources-2.4.26.2.0.ebuild 3001
 MD5 b293289df61d6f42ff54e4e0ceae53cf files/2.4.24-x86.config 2397
-MD5 d8266c3fd31880277da566681a943098 files/digest-grsec-sources-2.4.24.1.9.13-r1 67
-MD5 174438d215b70cad5ffb00ca8123c062 files/grsec-sources-2.4.24.1.9.13.munmap.patch 837
+MD5 c8e36f5dbfbf5b4c8adc12dd5aaaa810 files/digest-grsec-sources-2.4.26.2.0 213
diff --git a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.24.1.9.13 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.24.1.9.13
deleted file mode 100644
index c53c09ff6087..000000000000
--- a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.24.1.9.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
diff --git a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.24.1.9.13-r1 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.24.1.9.13-r1
deleted file mode 100644
index c53c09ff6087..000000000000
--- a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.24.1.9.13-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
diff --git a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.25.1.9.14 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.25.1.9.14
deleted file mode 100644
index fbc2248dc1e6..000000000000
--- a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.25.1.9.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1b1448d09bb9baa3d386de4d664b3e85 grsecurity-1.9.14-2.4.25.patch 540235
-MD5 016bc2f0f69feb37a933f857ba99d599 grsecurity-1.9.14-2.4.25.patch.sign 238
-MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
diff --git a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.25.2.0_rc5 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.25.2.0_rc5
deleted file mode 100644
index 7190f647f121..000000000000
--- a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.25.2.0_rc5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 397fe31144a2c38ec64a87712086fd82 grsecurity-2.0-rc5-2.4.25.patch 588130
-MD5 5a50a53753482cfa0734e80f769d2ec8 grsecurity-2.0-rc5-2.4.25.patch.sign 189
-MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
diff --git a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0
new file mode 100644
index 000000000000..e002df4c833f
--- /dev/null
+++ b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0
@@ -0,0 +1,3 @@
+MD5 ee2f2a447a6bbef50b6be1dab656a263 grsecurity-2.0-2.4.26.patch 609900
+MD5 fb6785a246082c638d966e11e7cdd508 grsecurity-2.0-2.4.26.patch.sign 189
+MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
diff --git a/sys-kernel/grsec-sources/files/do_brk_fix.patch b/sys-kernel/grsec-sources/files/do_brk_fix.patch
deleted file mode 100644
index fef1f1e981e2..000000000000
--- a/sys-kernel/grsec-sources/files/do_brk_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/mm/mmap.c Fri Sep 12 06:44:06 2003
-+++ b/mm/mmap.c Thu Oct  2 01:18:19 2003
-@@ -1041,6 +1041,9 @@
-	if (!len)
-		return addr;
- 
-+ 	if ((addr + len) > TASK_SIZE || (addr + len) < addr)
-+ 		return -EINVAL;
-+ 
-	/*
-	 * mlock MCL_FUTURE?
-	 */
diff --git a/sys-kernel/grsec-sources/files/grsec-sources-2.4.23.CAN-2003-0985.patch b/sys-kernel/grsec-sources/files/grsec-sources-2.4.23.CAN-2003-0985.patch
deleted file mode 100644
index dacf6ed810f9..000000000000
--- a/sys-kernel/grsec-sources/files/grsec-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/grsec-sources/files/grsec-sources-2.4.23.rtc_fix.patch b/sys-kernel/grsec-sources/files/grsec-sources-2.4.23.rtc_fix.patch
deleted file mode 100644
index 76a663c6e89d..000000000000
--- a/sys-kernel/grsec-sources/files/grsec-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)))
diff --git a/sys-kernel/grsec-sources/files/grsec-sources-2.4.24.1.9.13.munmap.patch b/sys-kernel/grsec-sources/files/grsec-sources-2.4.24.1.9.13.munmap.patch
deleted file mode 100644
index e120b35b7adb..000000000000
--- a/sys-kernel/grsec-sources/files/grsec-sources-2.4.24.1.9.13.munmap.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur linux-2.4.25-rc3/mm/mremap.c linux-2.4.25-rc4/mm/mremap.c
---- linux-2.4.25-rc3/mm/mremap.c	2004-02-18 13:56:01.000000000 +0000
-+++ linux-2.4.25-rc4/mm/mremap.c	2004-02-18 13:49:08.000000000 +0000
-@@ -258,16 +258,20 @@
- 		if ((addr <= new_addr) && (addr+old_len) > new_addr)
- 			goto out;
- 
--		do_munmap(current->mm, new_addr, new_len);
-+		ret = do_munmap(current->mm, new_addr, new_len);
-+		if (ret && new_len)
-+			goto out;
- 	}
- 
- 	/*
- 	 * Always allow a shrinking remap: that just unmaps
- 	 * the unnecessary pages..
- 	 */
--	ret = addr;
- 	if (old_len >= new_len) {
--		do_munmap(current->mm, addr+new_len, old_len - new_len);
-+		ret = do_munmap(current->mm, addr+new_len, old_len - new_len);
-+		if (ret && old_len != new_len)
-+			goto out;
-+		ret = addr;
- 		if (!(flags & MREMAP_FIXED) || (new_addr == addr))
- 			goto out;
- 	}
diff --git a/sys-kernel/grsec-sources/grsec-sources-2.4.24.1.9.13-r1.ebuild b/sys-kernel/grsec-sources/grsec-sources-2.4.24.1.9.13-r1.ebuild
deleted file mode 100644
index a3100684df52..000000000000
--- a/sys-kernel/grsec-sources/grsec-sources-2.4.24.1.9.13-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.24.1.9.13-r1.ebuild,v 1.2 2004/03/12 02:13:58 solar Exp $
-
-# We control what versions of what we download based on the KEYWORDS we
-# are using for the various arches. Thus if we want grsec1 stable we run
-# the with "arch" ACCEPT_KEYWORDS or ~arch and we will get the
-# grsec-2.0-preX which has alot more features.
-
-# the only thing that should ever differ in one of these 1.9.x ebuilds
-# and 2.x of the same kernel version is the KEYWORDS and header. 
-# shame cvs symlinks don't exist
-
-ETYPE="sources"
-IUSE=""
-
-inherit eutils
-inherit kernel
-
-[ "$OKV" == "" ] && OKV="2.4.24"
-
-PATCH_BASE="${PV/${OKV}./}"
-PATCH_BASE="${PATCH_BASE/_/-}"
-EXTRAVER="-grsec-${PATCH_BASE}"
-EXTRAVERSION="-grsec-${PATCH_BASE}-${PR}"
-KV="${OKV}${EXTRAVERSION}"
-
-PATCH_SRC_BASE="grsecurity-${PATCH_BASE}-${OKV}.patch"
-
-# hppa takes a special patch and usually has play catch up between
-# versions of this package we.
-
-HPPA_SRC_URI=""
-if [ "${ARCH}" == "hppa" ]; then
-	PARISC_KERNEL_VERSION="pa1"
-	KV="${OKV}-${PARISC_KERNEL_VERSION}${EXTRAVER}"
-	HPPA_PATCH_SRC_BASE="parisc-linux-${OKV}-${PARISC_KERNEL_VERSION}${EXTRAVER}.gz"
-	HPPA_SRC_URI="mirror://gentoo/${HPPA_PATCH_SRC_BASE} http://dev.gentoo.org/~pappy/gentoo-x86/sys-kernel/grsec-sources/${HPPA_PATCH_SRC__BASE}"
-	PATCH_SRC_BASE="${HPPA_PATCH_SRC_BASE}"
-fi
-
-DESCRIPTION="Vanilla sources of the linux kernel with the grsecurity ${PATCH_BASE} patch"
-
-SRC_URI="hppa? ( $HPPA_SRC_URI ) \
-	!hppa? ( http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch \
-		http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch.sign ) \
-	http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
-
-HOMEPAGE="http://www.kernel.org/ http://www.grsecurity.net"
-
-[ ${PATCH_BASE/.*/} == 1 ] && KEYWORDS="x86 -hppa" || KEYWORDS="~x86 ~sparc ~ppc ~alpha -hppa"
-
-SLOT="${KV}"
-S="${WORKDIR}/linux-${KV}"
-
-src_unpack() {
-	unpack linux-"${OKV}".tar.bz2 || die "unable to unpack the kernel"
-	mv linux-"${OKV}" linux-"${KV}" || die "unable to move the kernel"
-	cd linux-"${KV}" || die "unable to cd into the kernel source tree"
-
-	[ -f "${DISTDIR}/${PATCH_SRC_BASE}" ] || die "File does not exist?"
-
-	# users are often confused by what settings should be set so
-	# here lets them an example of what a P4 desktop would look like.
-	cp ${FILESDIR}/2.4.24-x86.config gentoo-grsec-custom-example-2.4.24-x86.config
-
-	ebegin "Patching the kernel with ${PATCH_SRC_BASE}"
-	case "${ARCH}" in
-		hppa)	zcat ${DISTDIR}/${PATCH_SRC_BASE} | patch -g0 -p1 --quiet ;;
-		*)	cat  ${DISTDIR}/${PATCH_SRC_BASE} | patch -g0 -p1 --quiet ;;
-	esac
-	[ $? == 0 ] || die "failed patching with ${PATCH_SRC_BASE}"
-	eend 0
-	epatch ${FILESDIR}/${P}.munmap.patch || die "Failed to apply munmap patch!"
-
-	mkdir docs
-	touch docs/patches.txt
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/grsec-sources/grsec-sources-2.4.24.1.9.13.ebuild b/sys-kernel/grsec-sources/grsec-sources-2.4.24.1.9.13.ebuild
deleted file mode 100644
index 0414bd0259bc..000000000000
--- a/sys-kernel/grsec-sources/grsec-sources-2.4.24.1.9.13.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.24.1.9.13.ebuild,v 1.2 2004/03/12 02:13:58 solar Exp $
-
-# We control what versions of what we download based on the KEYWORDS we
-# are using for the various arches. Thus if we want grsec1 stable we run
-# the with "arch" ACCEPT_KEYWORDS or ~arch and we will get the
-# grsec-2.0-preX which has alot more features.
-
-# the only thing that should ever differ in one of these 1.9.x ebuilds
-# and 2.x of the same kernel version is the KEYWORDS and header. 
-# shame cvs symlinks don't exist
-
-ETYPE="sources"
-IUSE=""
-
-inherit eutils
-inherit kernel
-
-[ "$OKV" == "" ] && OKV="2.4.24"
-
-PATCH_BASE="${PV/${OKV}./}"
-PATCH_BASE="${PATCH_BASE/_/-}"
-EXTRAVERSION="-grsec-${PATCH_BASE}"
-KV="${OKV}${EXTRAVERSION}"
-
-PATCH_SRC_BASE="grsecurity-${PATCH_BASE}-${OKV}.patch"
-
-# hppa takes a special patch and usually has play catch up between
-# versions of this package we.
-
-HPPA_SRC_URI=""
-if [ "${ARCH}" == "hppa" ]; then
-	PARISC_KERNEL_VERSION="pa1"
-	KV="${OKV}-${PARISC_KERNEL_VERSION}${EXTRAVERSION}"
-	HPPA_PATCH_SRC_BASE="parisc-linux-${OKV}-${PARISC_KERNEL_VERSION}${EXTRAVERSION}.gz"
-	HPPA_SRC_URI="mirror://gentoo/${HPPA_PATCH_SRC_BASE} http://dev.gentoo.org/~pappy/gentoo-x86/sys-kernel/grsec-sources/${HPPA_PATCH_SRC__BASE}"
-	PATCH_SRC_BASE="${HPPA_PATCH_SRC_BASE}"
-fi
-
-DESCRIPTION="Vanilla sources of the linux kernel with the grsecurity ${PATCH_BASE} patch"
-
-SRC_URI="hppa? ( $HPPA_SRC_URI ) \
-	!hppa? ( http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch \
-		http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch.sign ) \
-	http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
-
-HOMEPAGE="http://www.kernel.org/ http://www.grsecurity.net"
-
-[ ${PATCH_BASE/.*/} == 1 ] && KEYWORDS="x86 -hppa" || KEYWORDS="~x86 ~sparc ~ppc ~alpha -hppa"
-
-SLOT="${KV}"
-S="${WORKDIR}/linux-${KV}"
-
-src_unpack() {
-	unpack linux-"${OKV}".tar.bz2 || die "unable to unpack the kernel"
-	mv linux-"${OKV}" linux-"${KV}" || die "unable to move the kernel"
-	cd linux-"${KV}" || die "unable to cd into the kernel source tree"
-
-	[ -f "${DISTDIR}/${PATCH_SRC_BASE}" ] || die "File does not exist?"
-
-	# users are often confused by what settings should be set so
-	# here lets them an example of what a P4 desktop would look like.
-	cp ${FILESDIR}/2.4.24-x86.config gentoo-grsec-custom-example-2.4.24-x86.config
-
-	ebegin "Patching the kernel with ${PATCH_SRC_BASE}"
-	case "${ARCH}" in
-		hppa)	zcat ${DISTDIR}/${PATCH_SRC_BASE} | patch -g0 -p1 --quiet ;;
-		*)	cat  ${DISTDIR}/${PATCH_SRC_BASE} | patch -g0 -p1 --quiet ;;
-	esac
-	[ $? == 0 ] || die "failed patching with ${PATCH_SRC_BASE}"
-	eend 0
-
-	mkdir docs
-	touch docs/patches.txt
-	kernel_universal_unpack
-
-	# fixed in .24
-	#epatch ${FILESDIR}/${PN}-${OKV}.CAN-2003-0985.patch
-	#epatch ${FILESDIR}/${PN}-${OKV}.rtc_fix.patch
-}
diff --git a/sys-kernel/grsec-sources/grsec-sources-2.4.25.2.0_rc5.ebuild b/sys-kernel/grsec-sources/grsec-sources-2.4.25.2.0_rc5.ebuild
deleted file mode 100644
index ab57c749f026..000000000000
--- a/sys-kernel/grsec-sources/grsec-sources-2.4.25.2.0_rc5.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.25.2.0_rc5.ebuild,v 1.2 2004/03/12 02:13:58 solar Exp $
-
-# We control what versions of what we download based on the KEYWORDS we
-# are using for the various arches. Thus if we want grsec1 stable we run
-# the with "arch" ACCEPT_KEYWORDS or ~arch and we will get the
-# grsec-2.0-preX which has alot more features.
-
-# the only thing that should ever differ in one of these 1.9.x ebuilds
-# and 2.x of the same kernel version is the KEYWORDS and header. 
-# shame cvs symlinks don't exist
-
-ETYPE="sources"
-IUSE=""
-
-inherit eutils
-inherit kernel
-
-[ "$OKV" == "" ] && OKV="2.4.25"
-
-PATCH_BASE="${PV/${OKV}./}"
-PATCH_BASE="${PATCH_BASE/_/-}"
-EXTRAVERSION="-grsec-${PATCH_BASE}"
-KV="${OKV}${EXTRAVERSION}"
-
-PATCH_SRC_BASE="grsecurity-${PATCH_BASE}-${OKV}.patch"
-
-# hppa takes a special patch and usually has play catch up between
-# versions of this package we.
-
-HPPA_SRC_URI=""
-if [ "${ARCH}" == "hppa" ]; then
-	PARISC_KERNEL_VERSION="pa1"
-	KV="${OKV}-${PARISC_KERNEL_VERSION}${EXTRAVERSION}"
-	HPPA_PATCH_SRC_BASE="parisc-linux-${OKV}-${PARISC_KERNEL_VERSION}${EXTRAVERSION}.gz"
-	HPPA_SRC_URI="mirror://gentoo/${HPPA_PATCH_SRC_BASE} http://dev.gentoo.org/~pappy/gentoo-x86/sys-kernel/grsec-sources/${HPPA_PATCH_SRC_BASE}"
-	PATCH_SRC_BASE="${HPPA_PATCH_SRC_BASE}"
-fi
-
-DESCRIPTION="Vanilla sources of the linux kernel with the grsecurity ${PATCH_BASE} patch"
-
-DYSFUNCTIONAL_SRC_URI="hppa? ( $HPPA_SRC_URI ) \
-	!hppa? ( http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch \
-		http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch.sign ) \
-	http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
-
-SRC_URI="http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch \
-	http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch.sign  \
-	http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
-
-HOMEPAGE="http://www.kernel.org/ http://www.grsecurity.net"
-
-[ ${PATCH_BASE/.*/} == 1 ] && KEYWORDS="x86 -hppa" || KEYWORDS="~x86 ~sparc ~ppc ~alpha -hppa"
-
-SLOT="${KV}"
-S="${WORKDIR}/linux-${KV}"
-
-src_unpack() {
-	unpack linux-"${OKV}".tar.bz2 || die "unable to unpack the kernel"
-	mv linux-"${OKV}" linux-"${KV}" || die "unable to move the kernel"
-	cd linux-"${KV}" || die "unable to cd into the kernel source tree"
-
-	[ -f "${DISTDIR}/${PATCH_SRC_BASE}" ] || die "File does not exist?"
-
-	# users are often confused by what settings should be set so
-	# here lets them an example of what a P4 desktop would look like.
-	cp ${FILESDIR}/2.4.24-x86.config gentoo-grsec-custom-example-2.4.24-x86.config
-
-	ebegin "Patching the kernel with ${PATCH_SRC_BASE}"
-	case "${ARCH}" in
-		hppa)	zcat ${DISTDIR}/${PATCH_SRC_BASE} | patch -g0 -p1 --quiet ;;
-		*)	cat  ${DISTDIR}/${PATCH_SRC_BASE} | patch -g0 -p1 --quiet ;;
-	esac
-	[ $? == 0 ] || die "failed patching with ${PATCH_SRC_BASE}"
-	eend 0
-
-	mkdir docs
-	touch docs/patches.txt
-	kernel_universal_unpack
-
-	# fixed in .24
-	#epatch ${FILESDIR}/${PN}-${OKV}.CAN-2003-0985.patch
-	#epatch ${FILESDIR}/${PN}-${OKV}.rtc_fix.patch
-}
diff --git a/sys-kernel/grsec-sources/grsec-sources-2.4.25.1.9.14.ebuild b/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0.ebuild
index 6deff3441b7f..77144d38b7f2 100644
--- a/sys-kernel/grsec-sources/grsec-sources-2.4.25.1.9.14.ebuild
+++ b/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.25.1.9.14.ebuild,v 1.2 2004/03/12 02:13:58 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0.ebuild,v 1.1 2004/04/18 07:56:37 solar Exp $
 
 # We control what versions of what we download based on the KEYWORDS we
 # are using for the various arches. Thus if we want grsec1 stable we run
@@ -17,7 +17,7 @@ IUSE=""
 inherit eutils
 inherit kernel
 
-[ "$OKV" == "" ] && OKV="2.4.25"
+[ "$OKV" == "" ] && OKV="2.4.26"
 
 PATCH_BASE="${PV/${OKV}./}"
 PATCH_BASE="${PATCH_BASE/_/-}"
@@ -51,7 +51,7 @@ SRC_URI="http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch \
 
 HOMEPAGE="http://www.kernel.org/ http://www.grsecurity.net"
 
-[ ${PATCH_BASE/.*/} == 1 ] && KEYWORDS="x86 -hppa" || KEYWORDS="~x86 ~sparc ~ppc ~alpha -hppa"
+KEYWORDS="x86 sparc ppc alpha amd64 -hppa"
 
 SLOT="${KV}"
 S="${WORKDIR}/linux-${KV}"
@@ -63,8 +63,8 @@ src_unpack() {
 
 	[ -f "${DISTDIR}/${PATCH_SRC_BASE}" ] || die "File does not exist?"
 
-	# users are often confused by what settings should be set so
-	# here lets them an example of what a P4 desktop would look like.
+	# users are often confused by what settings should be set.
+	# so we provide an  example of what a P4 desktop would look like.
 	cp ${FILESDIR}/2.4.24-x86.config gentoo-grsec-custom-example-2.4.24-x86.config
 
 	ebegin "Patching the kernel with ${PATCH_SRC_BASE}"
@@ -79,7 +79,4 @@ src_unpack() {
 	touch docs/patches.txt
 	kernel_universal_unpack
 
-	# fixed in .24
-	#epatch ${FILESDIR}/${PN}-${OKV}.CAN-2003-0985.patch
-	#epatch ${FILESDIR}/${PN}-${OKV}.rtc_fix.patch
 }
diff --git a/sys-kernel/grsec-sources/metadata.xml b/sys-kernel/grsec-sources/metadata.xml
index 72feedd04e7b..994c241cec54 100644
--- a/sys-kernel/grsec-sources/metadata.xml
+++ b/sys-kernel/grsec-sources/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
+	<herd>no-herd</herd>
 	<maintainer>
 		<email>solar@gentoo.org</email>
 		<description>Primary Maintainer</description>
 	</maintainer>
 	<maintainer>
 		<email>pappy@gentoo.org</email>
-		<description>Secondary Maintainer</description>
+		<description>HPPA Maintainer</description>
 	</maintainer>
 	<longdescription>Vanilla sources of the linux kernel with the grsecurity patch</longdescription>
 </pkgmetadata>