merging hardened-dev-sources

8 files changed, 36 insertions, 55 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index f55fc86288af..ccc1ad246c01 100644
--- a/sys-kernel/hardened-sources/ChangeLog
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -1,6 +1,14 @@
 # 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.54 2005/04/29 12:28:27 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.55 2005/05/17 19:21:33 johnm Exp $
+
+*hardened-sources-2.6.11-r12 (17 May 2005)
+
+  17 May 2005; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.10-r3.ebuild, -hardened-sources-2.6.11-r1.ebuild,
+  +hardened-sources-2.6.11-r12.ebuild:
+  Cleanup older sources. Update to 2.6.11.10 - fixes several sec vulns. Also
+  merges in genpatches-base
 
   29 Apr 2005; <solar@gentoo.org> -files/2.4.27-CAN-2004-0394.patch,
   -files/2.4.27-cmdline-race.patch,
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.10-r3 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.10-r3
deleted file mode 100644
index 1a01407dff33..000000000000
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.10-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 cffcd2919d9c8ef793ce1ac07a440eda linux-2.6.10.tar.bz2 36533484
-MD5 89a0a45c7e255bdf8cbade61946545b6 hardened-patches-2.6-10.3.tar.bz2 584940
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.11-r1 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.11-r1
deleted file mode 100644
index 05bd8fc78499..000000000000
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.11-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
-MD5 63e55f7477fed719935c94ad8e007306 hardened-patches-2.6-11.2.tar.bz2 195906
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.11-r12 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.11-r12
new file mode 100644
index 000000000000..c9bfccb0510c
--- /dev/null
+++ b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.11-r12
@@ -0,0 +1,3 @@
+MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
+MD5 402c95591493308e222df603a611f1dc hardened-patches-2.6-11.12-extras.tar.bz2 202365
+MD5 fe0ccafbac98e983950cc5e0792bc7f4 genpatches-2.6-11.12-base.tar.bz2 44018
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.10-r3.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.10-r3.ebuild
deleted file mode 100644
index 9cd4160344d3..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.10-r3.ebuild
+++ /dev/null
@@ -1,25 +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.6.10-r3.ebuild,v 1.2 2005/01/24 01:56:13 solar Exp $
-
-IUSE=""
-ETYPE="sources"
-inherit kernel-2
-detect_version
-RDEPEND=""
-HGPV=10.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 \
-			   ${WORKDIR}/patches/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}/0001_README-AC10"
-
-DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-
-SRC_URI="${KERNEL_URI} ${HGPV_SRC}"
-KEYWORDS="x86 amd64"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.11-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.11-r1.ebuild
deleted file mode 100644
index 1b25379375de..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.11-r1.ebuild
+++ /dev/null
@@ -1,25 +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.6.11-r1.ebuild,v 1.1 2005/03/28 14:12:47 tocharian Exp $
-
-IUSE=""
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-HGPV=11.2
-HGPV_SRC="http://dev.gentoo.org/~tseng/kernel/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 \
-			   ${WORKDIR}/patches/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}/0001_README-AC10"
-
-DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-
-SRC_URI="${KERNEL_URI} ${HGPV_SRC}"
-KEYWORDS="x86 ppc amd64"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.11-r12.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.11-r12.ebuild
new file mode 100644
index 000000000000..c37489e6a035
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-2.6.11-r12.ebuild
@@ -0,0 +1,19 @@
+# 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.6.11-r12.ebuild,v 1.1 2005/05/17 19:21:33 johnm Exp $
+
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+GPV=${KV_MAJOR}.${KV_MINOR}-11.12
+HGPV=${GPV}
+GPV_SRC="mirror://gentoo/genpatches-${GPV}-base.tar.bz2"
+HGPV_SRC="mirror://gentoo/hardened-patches-${HGPV}-extras.tar.bz2"
+
+UNIPATCH_LIST="${DISTDIR}/genpatches-${GPV}-base.tar.bz2
+			   ${DISTDIR}/hardened-patches-${HGPV}-extras.tar.bz2"
+DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+
+SRC_URI="${KERNEL_URI} ${HGPV_SRC} ${GPV_SRC}"
+KEYWORDS="x86 ppc amd64"
diff --git a/sys-kernel/hardened-sources/metadata.xml b/sys-kernel/hardened-sources/metadata.xml
index 5fb587b92ec7..9bd0ed49e3a7 100644
--- a/sys-kernel/hardened-sources/metadata.xml
+++ b/sys-kernel/hardened-sources/metadata.xml
@@ -23,5 +23,10 @@
   <name>Adam Mondl</name>
   <description>Maintainer 2.6.x</description>
 </maintainer>
+<maintainer>
+	<email>johnm@gentoo.org</email>
+	<name>John Mylchreest</name>
+	<description>Maintainer 2.6.x, Kernel Liason</description>
+</maintainer>
 <longdescription>This kernel source is the security hardened version of the Linux Kernel.</longdescription>
 </pkgmetadata>