Added a patch to fix pax for 2.4.28. Bumped to 2.4.28-r5, removed older ebuilds.

Package-Manager: portage-2.0.51.19

14 files changed, 50 insertions, 210 deletions

diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index b2e373f7f016..21d3cf499810 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -1,21 +1,12 @@
-MD5 702633ddf986e86b0277631f7dd3fc37 hardened-sources-2.4.28-r4.ebuild 1038
-MD5 c9934b6cd83a90c1bc7668d06729ed81 hardened-sources-2.4.28-r1.ebuild 1027
-MD5 11f6ca3849a8b925c7bc7aacb18f680e hardened-sources-2.4.28-r3.ebuild 1034
-MD5 1241a83b887cacdb51fc36922a0ba878 hardened-sources-2.4.27-r3.ebuild 1039
-MD5 bb76f0841a7ff04e148ab1616369c79d hardened-sources-2.4.28-r2.ebuild 1034
-MD5 ef5812b83231c0d1a74982dce17468f3 hardened-sources-2.4.28.ebuild 1797
+MD5 793dcc5589a9a5204e1a684c7cad7fa9 hardened-sources-2.4.28-r5.ebuild 1091
 MD5 052ed406039bee61dd336d0c26510c30 ChangeLog 12735
 MD5 3f27e55312920e3241f47b70f2ef6242 hardened-sources-2.6.10-r3.ebuild 908
 MD5 0a473e60c059cb41c96a6bbcbff84769 metadata.xml 459
 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 3cfa2f10ac7a4d62112f84dcb047b050 files/digest-hardened-sources-2.4.27-r3 145
-MD5 fcf28c7e79f13550bec1b88ead0be365 files/digest-hardened-sources-2.4.28-r1 145
-MD5 bf22baab393ca4ea4f1a2dcbe51b4442 files/digest-hardened-sources-2.4.28-r2 145
-MD5 5679d140de1f7b19b33d721f8f74ec0a files/digest-hardened-sources-2.4.28-r3 145
-MD5 13c5cbb90bda8da4e4922d1e1477a712 files/digest-hardened-sources-2.4.28-r4 145
+MD5 13c5cbb90bda8da4e4922d1e1477a712 files/digest-hardened-sources-2.4.28-r5 145
 MD5 376d0153645489845937a4ffd83e761b files/2.4.28-grsec-cmdline-race.patch 352
-MD5 8652613a5ac92aa0ad7fdf0cc6c01716 files/digest-hardened-sources-2.4.28 339
+MD5 b1f723b1661a3fcbe79e921ddfe40584 files/2.4.28-grsec-2.1.0-pax-mmap-pgtables.patch 1202
 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
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
new file mode 100644
index 000000000000..baf4907aba34
--- /dev/null
+++ b/sys-kernel/hardened-sources/files/2.4.28-grsec-2.1.0-pax-mmap-pgtables.patch
@@ -0,0 +1,44 @@
+--- 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/digest-hardened-sources-2.4.27-r3 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.27-r3
deleted file mode 100644
index 3097089a21cc..000000000000
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.27-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453
-MD5 5edd985d9c2c185e0810b217f0a8de76 hardened-patches-2.4-27.2.tar.bz2 524970
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28
deleted file mode 100644
index ee8bbc233480..000000000000
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
-MD5 89087134d26519e7137d7ab621addb3f hardened-patches-2.4-28.1.tar.bz2 528257
-MD5 c8502dbcfa95cbf109bf5476d2f1ac3e hardened-sources-grsec-2.4.28-CAN-2004-0814.patch.gz 21048
-MD5 11e8db635b8230337a73179881cad6d0 hardened-sources-selinux-2.4.28-CAN-2004-0814.patch.gz 21043
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r1 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r1
deleted file mode 100644
index 95fb8a9b4e50..000000000000
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
-MD5 6958c44326313d81007c0bcc2fc602cc hardened-patches-2.4-28.2.tar.bz2 573565
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r2 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r2
deleted file mode 100644
index 7a1993b10d39..000000000000
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
-MD5 b1afe28a997834ad11d3d534503801a1 hardened-patches-2.4-28.3.tar.bz2 575101
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r3 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r3
deleted file mode 100644
index f6a0325290ff..000000000000
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
-MD5 11ee500c00d17b3d90c1e5b7bff49c99 hardened-patches-2.4-28.4.tar.bz2 577340
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r4 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r5
index 8917b2a05e24..8917b2a05e24 100644
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r4
+++ b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r5
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.4.27-r3.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.27-r3.ebuild
deleted file mode 100644
index afbbc27af084..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.27-r3.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.27-r3.ebuild,v 1.3 2005/01/24 01:56:13 solar Exp $
-
-IUSE="selinux"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-RDEPEND=""
-HGPV=27.2
-HGPV_SRC="http://dev.gentoo.org/~scox/kernels/v2.4/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2"
-
-UNIPATCH_STRICTORDER="yes"
-
-# According to the patchset numbering scheme, 31xx patches are grsec related
-# while 32xx are SELinux related.
-
-if use selinux; then
-	UNIPATCH_EXCLUDE="31"
-else
-	UNIPATCH_EXCLUDE="32"
-fi
-
-UNIPATCH_LIST=" ${DISTDIR}/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2 \
-				${FILESDIR}/${OKV}*.patch"
-
-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 -ppc"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.4.28-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.28-r1.ebuild
deleted file mode 100644
index 922811e193aa..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.28-r1.ebuild
+++ /dev/null
@@ -1,35 +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-r1.ebuild,v 1.4 2005/01/24 01:56:13 solar Exp $
-
-IUSE="selinux"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-RDEPEND=""
-HGPV=28.2
-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"
-
-# According to the patchset numbering scheme, 31xx and 41xx patches are grsec related
-# while 32xx and 42xx are SELinux related.
-
-if use selinux; then
-	UNIPATCH_LIST="${UNIPATCH_LIST} 31 41"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST} 32 42"
-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.28-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.28-r2.ebuild
deleted file mode 100644
index 442f21d906eb..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.28-r2.ebuild
+++ /dev/null
@@ -1,35 +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-r2.ebuild,v 1.3 2005/01/24 01:56:13 solar Exp $
-
-IUSE="selinux"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-RDEPEND=""
-HGPV=28.3
-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"
-
-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.28-r3.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.28-r3.ebuild
deleted file mode 100644
index 9ca2ae57711c..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.28-r3.ebuild
+++ /dev/null
@@ -1,35 +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-r3.ebuild,v 1.3 2005/01/24 01:56:13 solar Exp $
-
-IUSE="selinux"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-RDEPEND=""
-HGPV=28.4
-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"
-
-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.28-r4.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.28-r5.ebuild
index adc44e35d69e..7385b0ea1cf9 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.28-r4.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.4.28-r5.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.28-r4.ebuild,v 1.3 2005/01/27 06:31:15 tocharian Exp $
+# $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"
@@ -12,7 +12,8 @@ HGPV_SRC="http://dev.gentoo.org/~tocharian/kernels/${PN}/hardened-patches-${KV_M
 
 UNIPATCH_STRICTORDER="yes"
 
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2"
+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"
 
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.4.28.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.28.ebuild
deleted file mode 100644
index 42ac28fb2bfc..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.28.ebuild
+++ /dev/null
@@ -1,43 +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.ebuild,v 1.9 2005/01/24 01:56:13 solar Exp $
-
-IUSE="selinux"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-RDEPEND=""
-HGPV=28.1
-HGPV_SRC="mirror://gentoo/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2 \
-	  mirror://gentoo/${PN}-grsec-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-CAN-2004-0814.patch.gz \
-	  mirror://gentoo/${PN}-selinux-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-CAN-2004-0814.patch.gz"
-
-UNIPATCH_STRICTORDER="yes"
-
-UNIPATCH_LIST=" ${DISTDIR}/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2 \
-				${DISTDIR}/${PN}-grsec-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-CAN-2004-0814.patch.gz \
-				${DISTDIR}/${PN}-selinux-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-CAN-2004-0814.patch.gz \
-				${FILESDIR}/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-grsec-cmdline-race.patch \
-				${FILESDIR}/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-selinux-cmdline-race.patch \
-				${FILESDIR}/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-grsec-binfmt_a.out.patch \
-				${FILESDIR}/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-selinux-binfmt_a.out.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 ${PN}-grsec ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-grsec"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST} 32 ${PN}-selinux ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-selinux"
-fi
-
-DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-
-SRC_URI="${KERNEL_URI} ${HGPV_SRC}"
-KEYWORDS="x86"
-
-pkg_postinst() {
-	postinst_sources
-}