- mark .30-r1 stable and remove older vuln ebuilds from the tree. filesdir cleanup..

(Portage version: 2.0.51.20-r5)

16 files changed, 17 insertions, 337 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index a230706eddfa..f55fc86288af 100644
--- a/sys-kernel/hardened-sources/ChangeLog
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-kernel/hardened-sources
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.53 2005/04/22 01:33:43 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.54 2005/04/29 12:28:27 solar Exp $
+
+  29 Apr 2005; <solar@gentoo.org> -files/2.4.27-CAN-2004-0394.patch,
+  -files/2.4.27-cmdline-race.patch,
+  -files/2.4.28-grsec-2.1.0-pax-mmap-pgtables.patch,
+  -files/2.4.28-grsec-binfmt_a.out.patch,
+  -files/2.4.28-grsec-cmdline-race.patch,
+  -files/2.4.28-selinux-binfmt_a.out.patch,
+  -files/2.4.28-selinux-cmdline-race.patch,
+  -hardened-sources-2.4.28-r5.ebuild, -hardened-sources-2.4.29.ebuild,
+  hardened-sources-2.4.30-r1.ebuild, -hardened-sources-2.4.30.ebuild:
+  - mark .30-r1 stable and remove older vuln ebuilds from the tree. filesdir
+  cleanup..
 
 *hardened-sources-2.4.30-r1 (21 Apr 2005)
 
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 0730bd9a48d1..0385d1d25810 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -1,33 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c5d57ca3fe025ec6371cdcf2e475ede5 hardened-sources-2.6.11-r1.ebuild 895
-MD5 fc8ff145fa686cb2f852b167a6ccc822 hardened-sources-2.4.30-r1.ebuild 781
-MD5 524273305082cd982f2aecb77d95080f hardened-sources-2.4.29.ebuild 802
-MD5 793dcc5589a9a5204e1a684c7cad7fa9 hardened-sources-2.4.28-r5.ebuild 1091
-MD5 e0b3e3e860384c3306daee7521a8e50b hardened-sources-2.4.30.ebuild 778
-MD5 e3761d5f04f3980f5b99c2627ce2b502 ChangeLog 13537
+MD5 4c475b98c5ce9c03a96f756a80c97091 hardened-sources-2.4.30-r1.ebuild 780
+MD5 5be55aac2ca3f5870c964d0337b8b166 ChangeLog 14098
 MD5 3f27e55312920e3241f47b70f2ef6242 hardened-sources-2.6.10-r3.ebuild 908
 MD5 33a62ed13518b2975dae58d9297b6760 metadata.xml 829
-MD5 4a0215139f9aebfe2cc2747743763f08 files/2.4.28-grsec-binfmt_a.out.patch 1887
-MD5 c8985a5695cfda1c35d1b433d62604ce files/2.4.28-selinux-binfmt_a.out.patch 1743
-MD5 13c5cbb90bda8da4e4922d1e1477a712 files/digest-hardened-sources-2.4.28-r5 145
 MD5 31b0edc023e247961a1743f3661da443 files/digest-hardened-sources-2.4.30-r1 145
-MD5 376d0153645489845937a4ffd83e761b files/2.4.28-grsec-cmdline-race.patch 352
-MD5 b1f723b1661a3fcbe79e921ddfe40584 files/2.4.28-grsec-2.1.0-pax-mmap-pgtables.patch 1202
-MD5 b86e17bb3729e5d79659e95c84db46a9 files/digest-hardened-sources-2.4.29 145
-MD5 c5eeb457e73703235f1639a02f397b99 files/digest-hardened-sources-2.4.30 145
-MD5 8850fb5244d9d10736d95a85f3c5b3f1 files/2.4.27-CAN-2004-0394.patch 448
-MD5 d1ccc2047be533c992f67270a150a210 files/2.4.27-cmdline-race.patch 388
-MD5 98e84c850a16b9cb458be21ae4fb82df files/2.4.28-selinux-cmdline-race.patch 352
 MD5 73d345a26186ac7508ba680069f892d7 files/digest-hardened-sources-2.6.10-r3 145
 MD5 240ef418b4a76a5758c5196f18bb7caf files/digest-hardened-sources-2.6.11-r1 145
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iQCVAwUBQmhUR54WFLgrx1GWAQJMwwQAmUgRID1GTsqF5l8M24yitdph369oRdni
-MHMpo1I7ahhLZWRerzUvqKLj+xlh1AXHmUhltLwpFItm392iUDAhVejTigxX+try
-0l+p0wVefWKEzwEimBV1jjvokiJrXCL26tyUW1cHO8zsFWGGImmeFp5S9qIeGv4L
-DBKLA6FQMO8=
-=Y8vH
------END PGP SIGNATURE-----
diff --git a/sys-kernel/hardened-sources/files/2.4.27-CAN-2004-0394.patch b/sys-kernel/hardened-sources/files/2.4.27-CAN-2004-0394.patch
deleted file mode 100644
index f2e421dc7861..000000000000
--- a/sys-kernel/hardened-sources/files/2.4.27-CAN-2004-0394.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN linux-2.4.26-hardened/kernel/panic.c linux-2.4.26-can/kernel/panic.c
---- linux-2.4.26-hardened/kernel/panic.c	2003-11-28 19:26:21.000000000 +0100
-+++ linux-2.4.26-can/kernel/panic.c	2004-06-22 22:40:11.000000000 +0200
-@@ -59,7 +59,7 @@
- 	
- 	bust_spinlocks(1);
- 	va_start(args, fmt);
--	vsprintf(buf, fmt, args);
-+	vsnprintf(buf, sizeof(buf), fmt, args);
- 	va_end(args);
- 	printk(KERN_EMERG "Kernel panic: %s\n",buf);
- 	if (in_interrupt())
diff --git a/sys-kernel/hardened-sources/files/2.4.27-cmdline-race.patch b/sys-kernel/hardened-sources/files/2.4.27-cmdline-race.patch
deleted file mode 100644
index 5f26f7f388f6..000000000000
--- a/sys-kernel/hardened-sources/files/2.4.27-cmdline-race.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.4/fs/proc/base.c	2004-04-15 07:09:32.000000000 +0100
-+++ linux-2.4/fs/proc/base.c.plasmaroo	2004-08-09 23:30:43.869195800 +0100
-@@ -187,7 +187,7 @@ static int proc_pid_cmdline(struct task_
- 	if (mm)
- 		atomic_inc(&mm->mm_users);
- 	task_unlock(task);
--	if (mm) {
-+	if (mm && mm->arg_end) {
- 		int len = mm->arg_end - mm->arg_start;
- 		if (len > PAGE_SIZE)
- 			len = PAGE_SIZE;
diff --git a/sys-kernel/hardened-sources/files/2.4.28-grsec-2.1.0-pax-mmap-pgtables.patch b/sys-kernel/hardened-sources/files/2.4.28-grsec-2.1.0-pax-mmap-pgtables.patch
deleted file mode 100644
index baf4907aba34..000000000000
--- a/sys-kernel/hardened-sources/files/2.4.28-grsec-2.1.0-pax-mmap-pgtables.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- mm/mmap.c.orig	2005-03-05 13:29:06.000000000 -0500
-+++ mm/mmap.c	2005-03-05 13:33:51.000000000 -0500
-@@ -1014,7 +1014,7 @@
-  * we just free'd - but there's no telling how much before.
-  */
- static void free_pgtables(struct mm_struct * mm, struct vm_area_struct *prev,
--	unsigned long start, unsigned long end)
-+	struct vm_area_struct *mpnt, unsigned long start, unsigned long end)
- {
- 	unsigned long first = start & PGDIR_MASK;
- 	unsigned long last = end + PGDIR_SIZE - 1;
-@@ -1046,6 +1046,14 @@
- 		break;
- 	}
- no_mmaps:
-+	while (mpnt && first < last) {
-+		if ((mpnt->vm_end > first) &&(last > mpnt->vm_start)) {
-+			first = mpnt->vm_end + PGDIR_SIZE - 1;
-+			last = mpnt->vm_start;
-+		}
-+		mpnt = mpnt->vm_next;
-+	}
-+
- 	if (last < first)
- 		return;
- 	/*
-@@ -1106,7 +1114,7 @@
- 		extra = unmap_vma(mm, addr, len, mpnt, extra);
- 	}
- 
--	free_pgtables(mm, prev, addr, addr+len);
-+	free_pgtables(mm, prev, NULL, addr, addr+len);
- 
- 	return extra;
- }
-@@ -1130,7 +1138,7 @@
- 		find_vma_prev(mm, mpnt->vm_start, &prev);
- 		extra_m = unmap_vma(mm, addr_m, len, mpnt, extra_m);
- 
--		free_pgtables(mm, prev, start, end);
-+		free_pgtables(mm, prev, free_m, start, end);
- 	}               
- 
- 	return extra_m;
diff --git a/sys-kernel/hardened-sources/files/2.4.28-grsec-binfmt_a.out.patch b/sys-kernel/hardened-sources/files/2.4.28-grsec-binfmt_a.out.patch
deleted file mode 100644
index 16e06c44b5b4..000000000000
--- a/sys-kernel/hardened-sources/files/2.4.28-grsec-binfmt_a.out.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nru linux-2.4.28/fs/binfmt_aout.c linux-2.4.28-hardened/fs/binfmt_aout.c
---- linux-2.4.28/fs/binfmt_aout.c	2004-11-28 15:44:03.000000000 -0500
-+++ linux-2.4.28-hardened/fs/binfmt_aout.c	2004-11-28 16:05:16.000000000 -0500
-@@ -39,13 +39,18 @@
- 	NULL, THIS_MODULE, load_aout_binary, load_aout_library, aout_core_dump, PAGE_SIZE
- };
- 
--static void set_brk(unsigned long start, unsigned long end)
-+#define BAD_ADDR(x)	((unsigned long)(x) >= TASK_SIZE)
-+
-+static int set_brk(unsigned long start, unsigned long end)
- {
- 	start = PAGE_ALIGN(start);
- 	end = PAGE_ALIGN(end);
--	if (end <= start)
--		return;
--	do_brk(start, end - start);
-+	if (end > start) {
-+		unsigned long addr = do_brk(start, end - start);
-+		if (BAD_ADDR(addr))
-+			return addr;
-+	}
-+	return 0;
- }
- 
- /*
-@@ -429,7 +434,11 @@
- beyond_if:
- 	set_binfmt(&aout_format);
- 
--	set_brk(current->mm->start_brk, current->mm->brk);
-+	retval = set_brk(current->mm->start_brk, current->mm->brk);
-+	if (retval < 0) {
-+		send_sig(SIGKILL, current, 0);
-+		return retval;
-+	}
- 
- 	retval = setup_arg_pages(bprm); 
- 	if (retval < 0) { 
-diff -Nru linux-2.4.28/fs/exec.c linux-2.4.28-hardened/fs/exec.c
---- linux-2.4.28/fs/exec.c	2004-11-28 15:44:03.000000000 -0500
-+++ linux-2.4.28-hardened/fs/exec.c	2004-11-28 16:05:16.000000000 -0500
-@@ -387,6 +387,7 @@
- 
- 	down_write(&current->mm->mmap_sem);
- 	{
-+		struct vm_area_struct *vma;
- 		mpnt->vm_mm = current->mm;
- 		mpnt->vm_start = PAGE_MASK & (unsigned long) bprm->p;
- 		mpnt->vm_end = STACK_TOP;
-@@ -401,6 +402,12 @@
- 		mpnt->vm_pgoff = 0;
- 		mpnt->vm_file = NULL;
- 		mpnt->vm_private_data = (void *) 0;
-+		vma = find_vma(current->mm, mpnt->vm_start);
-+		if (vma) {
-+			up_write(&current->mm->mmap_sem);
-+			kmem_cache_free(vm_area_cachep, mpnt);
-+			return -ENOMEM;
-+		}
- 		insert_vm_struct(current->mm, mpnt);
- 		current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
- 
diff --git a/sys-kernel/hardened-sources/files/2.4.28-grsec-cmdline-race.patch b/sys-kernel/hardened-sources/files/2.4.28-grsec-cmdline-race.patch
deleted file mode 100644
index a37e92755b15..000000000000
--- a/sys-kernel/hardened-sources/files/2.4.28-grsec-cmdline-race.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.4.28/fs/proc/base.c	2004-11-28 15:44:03.000000000 -0500
-+++ linux-2.4.28-hardened/fs/proc/base.c	2004-11-28 16:02:18.439086184 -0500
-@@ -194,7 +194,7 @@
- 	if (mm)
- 		atomic_inc(&mm->mm_users);
- 	task_unlock(task);
--	if (mm) {
-+	if (mm && mm->arg_end) {
- 		int len = mm->arg_end - mm->arg_start;
- 		if (len > PAGE_SIZE)
- 			len = PAGE_SIZE;
diff --git a/sys-kernel/hardened-sources/files/2.4.28-selinux-binfmt_a.out.patch b/sys-kernel/hardened-sources/files/2.4.28-selinux-binfmt_a.out.patch
deleted file mode 100644
index cd1486f94e02..000000000000
--- a/sys-kernel/hardened-sources/files/2.4.28-selinux-binfmt_a.out.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- linux-2.4.28/fs/binfmt_aout.c	2004-11-28 16:37:25.000000000 -0500
-+++ linux-2.4.28-hardened/fs/binfmt_aout.c	2004-11-28 17:15:50.297381776 -0500
-@@ -39,13 +39,18 @@
- 	NULL, THIS_MODULE, load_aout_binary, load_aout_library, aout_core_dump, PAGE_SIZE
- };
- 
--static void set_brk(unsigned long start, unsigned long end)
-+#define BAD_ADDR(x)	((unsigned long)(x) >= TASK_SIZE)
-+
-+static int set_brk(unsigned long start, unsigned long end)
- {
- 	start = PAGE_ALIGN(start);
- 	end = PAGE_ALIGN(end);
--	if (end <= start)
--		return;
--	do_brk(start, end - start);
-+	if (end > start) {
-+		unsigned long addr = do_brk(start, end - start);
-+		if (BAD_ADDR(addr))
-+			return addr;
-+	}
-+	return 0;
- }
- 
- /*
-@@ -423,7 +428,11 @@
- beyond_if:
- 	set_binfmt(&aout_format);
- 
--	set_brk(current->mm->start_brk, current->mm->brk);
-+	retval = set_brk(current->mm->start_brk, current->mm->brk);
-+	if (retval < 0) {
-+		send_sig(SIGKILL, current, 0);
-+		return retval;
-+	}
- 
- 	retval = setup_arg_pages(bprm); 
- 	if (retval < 0) { 
---- linux-2.4.28/fs/exec.c	2004-11-28 16:37:25.000000000 -0500
-+++ linux-2.4.28-hardened/fs/exec.c	2004-11-28 17:15:50.298381624 -0500
-@@ -388,6 +388,7 @@
- 
- 	down_write(&current->mm->mmap_sem);
- 	{
-+		struct vm_area_struct *vma;
- 		mpnt->vm_mm = current->mm;
- 		mpnt->vm_start = PAGE_MASK & (unsigned long) bprm->p;
- 		mpnt->vm_end = STACK_TOP;
-@@ -404,6 +405,12 @@
- 		mpnt->vm_pgoff = 0;
- 		mpnt->vm_file = NULL;
- 		mpnt->vm_private_data = (void *) 0;
-+		vma = find_vma(current->mm, mpnt->vm_start);
-+		if (vma) {
-+			up_write(&current->mm->mmap_sem);
-+			kmem_cache_free(vm_area_cachep, mpnt);
-+			return -ENOMEM;
-+		}
- 		insert_vm_struct(current->mm, mpnt);
- 		current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
- 
diff --git a/sys-kernel/hardened-sources/files/2.4.28-selinux-cmdline-race.patch b/sys-kernel/hardened-sources/files/2.4.28-selinux-cmdline-race.patch
deleted file mode 100644
index f4a759f56ff1..000000000000
--- a/sys-kernel/hardened-sources/files/2.4.28-selinux-cmdline-race.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.4.28/fs/proc/base.c	2004-11-28 16:37:21.000000000 -0500
-+++ linux-2.4.28-hardened/fs/proc/base.c	2004-11-28 17:10:36.593072080 -0500
-@@ -192,7 +192,7 @@
- 	if (mm)
- 		atomic_inc(&mm->mm_users);
- 	task_unlock(task);
--	if (mm) {
-+	if (mm && mm->arg_end) {
- 		int len = mm->arg_end - mm->arg_start;
- 		if (len > PAGE_SIZE)
- 			len = PAGE_SIZE;
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r5 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r5
deleted file mode 100644
index 8917b2a05e24..000000000000
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
-MD5 12125272b37f4359a042630a2cf1f2ed hardened-patches-2.4-28.5.tar.bz2 578496
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.29 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.29
deleted file mode 100644
index 67abbb48a046..000000000000
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.29
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fcf8b6bb620467f27b657c1c4a60bbff linux-2.4.29.tar.bz2 31124710
-MD5 fc3d104078a444609e323af1c5ece088 hardened-patches-2.4-29.0.tar.bz2 258681
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.30 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.30
deleted file mode 100644
index d14111b1ae83..000000000000
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.30
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 75d8ce40a3668603017cd186909efe8d linux-2.4.30.tar.bz2 31136728
-MD5 12e737234438f81bfc154cfb6078a472 hardened-patches-2.4-30.0.tar.bz2 264923
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.4.28-r5.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.28-r5.ebuild
deleted file mode 100644
index 7385b0ea1cf9..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.28-r5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.4.28-r5.ebuild,v 1.1 2005/03/06 22:34:16 scox Exp $
-
-IUSE="selinux"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-RDEPEND=""
-HGPV=28.5
-HGPV_SRC="http://dev.gentoo.org/~tocharian/kernels/${PN}/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2"
-
-UNIPATCH_STRICTORDER="yes"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2 \
-	${FILESDIR}/2.4.28-grsec-2.1.0-pax-mmap-pgtables.patch"
-
-UNIPATCH_DOCS="${WORKDIR}/patches/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}/0000_README"
-
-# According to the patchset numbering scheme, 31xx patches are grsec related
-# while 32xx are SELinux related.
-
-if use selinux; then
-	UNIPATCH_LIST="${UNIPATCH_LIST} 31"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST} 32"
-fi
-
-DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-
-SRC_URI="${KERNEL_URI} ${HGPV_SRC}"
-KEYWORDS="x86"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.4.29.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.29.ebuild
deleted file mode 100644
index f2ed854fe5d9..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.29.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.4.29.ebuild,v 1.1 2005/03/30 08:04:58 scox Exp $
-
-IUSE=""
-ETYPE="sources"
-inherit kernel-2
-detect_version
-RDEPEND=""
-HGPV=29.0
-HGPV_SRC="http://dev.gentoo.org/~scox/kernels/v2.4/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2"
-
-UNIPATCH_STRICTORDER="yes"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2"
-
-UNIPATCH_DOCS="${WORKDIR}/patches/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}/0000_README"
-
-DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-
-SRC_URI="${KERNEL_URI} ${HGPV_SRC}"
-KEYWORDS="~x86"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.4.30-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.30-r1.ebuild
index 0388c784fe42..f613d53d83aa 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.30-r1.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.4.30-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.4.30-r1.ebuild,v 1.1 2005/04/22 01:33:43 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.4.30-r1.ebuild,v 1.2 2005/04/29 12:28:27 solar Exp $
 
 IUSE=""
 ETYPE="sources"
@@ -19,7 +19,7 @@ UNIPATCH_DOCS="${WORKDIR}/patches/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGP
 DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 
 SRC_URI="${KERNEL_URI} ${HGPV_SRC}"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 pkg_postinst() {
 	postinst_sources
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.4.30.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.30.ebuild
deleted file mode 100644
index 21d18645be16..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.30.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.4.30.ebuild,v 1.1 2005/04/19 01:01:00 solar Exp $
-
-IUSE=""
-ETYPE="sources"
-inherit kernel-2
-detect_version
-RDEPEND=""
-HGPV=30.0
-HGPV_SRC="mirror://gentoo/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2"
-
-UNIPATCH_STRICTORDER="yes"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2"
-
-UNIPATCH_DOCS="${WORKDIR}/patches/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}/0000_README"
-
-DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-
-SRC_URI="${KERNEL_URI} ${HGPV_SRC}"
-KEYWORDS="~x86"
-
-pkg_postinst() {
-	postinst_sources
-}