bump to 2.6.21 and rsbac 1.3.4

(Portage version: 2.1.2.9)

6 files changed, 47 insertions, 46 deletions

diff --git a/sys-kernel/rsbac-sources/ChangeLog b/sys-kernel/rsbac-sources/ChangeLog
index ee91231aa1bf..28402cee87c4 100644
--- a/sys-kernel/rsbac-sources/ChangeLog
+++ b/sys-kernel/rsbac-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/rsbac-sources
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/ChangeLog,v 1.55 2007/02/06 10:49:01 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/ChangeLog,v 1.56 2007/06/08 15:00:49 kang Exp $
+
+*rsbac-sources-2.6.21 (08 Jun 2007)
+
+  08 Jun 2007; Guillaume Destuynder <kang@gentoo.org>
+  -rsbac-sources-2.6.13.ebuild, rsbac-sources-2.6.19-r1.ebuild,
+  +rsbac-sources-2.6.21.ebuild:
+  bump to 1.3.4/2.6.21, 2.6.19-r1 stable on amd64, prune 2.6.13
 
 *rsbac-sources-2.6.19-r1 (06 Feb 2007)
 
diff --git a/sys-kernel/rsbac-sources/files/digest-rsbac-sources-2.6.13 b/sys-kernel/rsbac-sources/files/digest-rsbac-sources-2.6.13
deleted file mode 100644
index 07724c94aa71..000000000000
--- a/sys-kernel/rsbac-sources/files/digest-rsbac-sources-2.6.13
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 560f5fadf59f172973e67939868a4cae linux-2.6.13.tar.bz2 38372729
-RMD160 bed1db170af007d174ca81b65be0b8acbd17b393 linux-2.6.13.tar.bz2 38372729
-SHA256 a44e8aa8544159bb2c7e1b58d155298d202c555dc8844fa9c28e981e686b06b8 linux-2.6.13.tar.bz2 38372729
-MD5 c7d8552f1f4529219e7b3a27f88b7580 rsbac-patches-2.6-13.0.tar.bz2 1589880
-RMD160 df7ae8641a7127305476fce87526cb9027195713 rsbac-patches-2.6-13.0.tar.bz2 1589880
-SHA256 0e59a510bf3808538bcea6fadccf2029c14aab7fe577513ce45ecfa4b759bce1 rsbac-patches-2.6-13.0.tar.bz2 1589880
diff --git a/sys-kernel/rsbac-sources/files/digest-rsbac-sources-2.6.21 b/sys-kernel/rsbac-sources/files/digest-rsbac-sources-2.6.21
new file mode 100644
index 000000000000..c3364bc31187
--- /dev/null
+++ b/sys-kernel/rsbac-sources/files/digest-rsbac-sources-2.6.21
@@ -0,0 +1,9 @@
+MD5 8978fbd718d24cee974aac7d8a50f063 genpatches-2.6.21-4.base.tar.bz2 59921
+RMD160 653f77ebae9433497344ee2908158d7e4c9809bf genpatches-2.6.21-4.base.tar.bz2 59921
+SHA256 ed8a8954faff48523b33ec618566cde0dcc4051f78e530785a867158aa39cf5d genpatches-2.6.21-4.base.tar.bz2 59921
+MD5 1b515f588078dfa7f4bab2634bd17e80 linux-2.6.21.tar.bz2 43997476
+RMD160 b2badf41c61f66b0dda059d99a57c2e2c0ea13f4 linux-2.6.21.tar.bz2 43997476
+SHA256 f187b12d70e0a48ce81f0472dfe9504fb5f0f966be339ac9d57dd2b991a74942 linux-2.6.21.tar.bz2 43997476
+MD5 4c124fb86d03b61c4b57bfb5a0aacbf2 rsbac-patches-2.6.21-1.extras.tar.bz2 572558
+RMD160 36b739adcb65f31c1c9f9d6de2a324601a222b3e rsbac-patches-2.6.21-1.extras.tar.bz2 572558
+SHA256 fe3f29ec103cc604a3941e1b4ed1af03766092ef4b5d96260bbf9fc7f06f3845 rsbac-patches-2.6.21-1.extras.tar.bz2 572558
diff --git a/sys-kernel/rsbac-sources/rsbac-sources-2.6.13.ebuild b/sys-kernel/rsbac-sources/rsbac-sources-2.6.13.ebuild
deleted file mode 100644
index ae876d01c44d..000000000000
--- a/sys-kernel/rsbac-sources/rsbac-sources-2.6.13.ebuild
+++ /dev/null
@@ -1,37 +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/rsbac-sources/rsbac-sources-2.6.13.ebuild,v 1.3 2005/11/17 22:25:32 kang Exp $
-
-IUSE=""
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-#DEPEND=">=sys-apps/rsbac-admin-1.2.4"
-
-# rsbac versions
-RSBACV=1.2.5
-
-# Gentoo rsbac kernel patches
-RGPV=13.0
-RGPV_SRC="http://dev.gentoo.org/~kang/rsbac/patches/${RSBACV}/2.6/rsbac-patches-${KV_MAJOR}.${KV_MINOR}-${RGPV}.tar.bz2"
-UNIPATCH_STRICTORDER="yes"
-UNIPATCH_LIST="${DISTDIR}/rsbac-patches-${KV_MAJOR}.${KV_MINOR}-${RGPV}.tar.bz2"
-UNIPATCH_DOCS="${WORKDIR}/patches/rsbac-patches-${KV_MAJOR}.${KV_MINOR}-${RGPV}/0000_README"
-
-
-HOMEPAGE="http://hardened.gentoo.org/rsbac/"
-DESCRIPTION="RSBAC hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-
-SRC_URI="${KERNEL_URI} ${RGPV_SRC}"
-KEYWORDS="x86 ~amd64"
-
-K_NOUSENAME="yes"
-K_PREPATCHED="yes"
-K_EXTRAEINFO="Guides are available from the Gentoo Documentation Project for
-this kernel
-Please see http://www.gentoo.org/proj/en/hardened/rsbac/quickstart.xml
-And the RSBAC hardened project http://www.gentoo.org/proj/en/hardened/rsbac/
-For help setting up and using RSBAC."
-K_EXTRAEWARN="Read http://rsbac.org/documentation/upgrading.php to
-upgrade from 1.2.4 to 1.2.5!"
diff --git a/sys-kernel/rsbac-sources/rsbac-sources-2.6.19-r1.ebuild b/sys-kernel/rsbac-sources/rsbac-sources-2.6.19-r1.ebuild
index 8aa73a856a7e..f0da1f31917b 100644
--- a/sys-kernel/rsbac-sources/rsbac-sources-2.6.19-r1.ebuild
+++ b/sys-kernel/rsbac-sources/rsbac-sources-2.6.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/rsbac-sources-2.6.19-r1.ebuild,v 1.1 2007/02/06 10:49:01 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/rsbac-sources-2.6.19-r1.ebuild,v 1.2 2007/06/08 15:00:49 kang Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base"
@@ -19,7 +19,7 @@ UNIPATCH_LIST="${DISTDIR}/rsbac-hardened-patches-${HGPV}.extras.tar.bz2"
 DESCRIPTION="RSBAC Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 
 SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 K_EXTRAEINFO="Guides are available from the Gentoo Documentation Project for
 this kernel.
diff --git a/sys-kernel/rsbac-sources/rsbac-sources-2.6.21.ebuild b/sys-kernel/rsbac-sources/rsbac-sources-2.6.21.ebuild
new file mode 100644
index 000000000000..ad5de6d28d97
--- /dev/null
+++ b/sys-kernel/rsbac-sources/rsbac-sources-2.6.21.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/rsbac-sources-2.6.21.ebuild,v 1.1 2007/06/08 15:00:49 kang Exp $
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="4"
+
+inherit kernel-2 unipatch-001
+detect_version
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/rsbac-admin-1.3.1"
+
+HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1
+#HGPV_URI="mirror://gentoo/hardened-patches-${HGPV}.extras.tar.bz2"
+HGPV_URI="mirror://gentoo/rsbac-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_LIST="${DISTDIR}/rsbac-patches-${HGPV}.extras.tar.bz2"
+DESCRIPTION="RSBAC Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+KEYWORDS="~amd64 ~x86"
+
+K_EXTRAEINFO="Guides are available from the Gentoo Documentation Project for
+this kernel.
+Please see http://www.gentoo.org/proj/en/hardened/rsbac/quickstart.xml
+And the RSBAC hardened project http://www.gentoo.org/proj/en/hardened/rsbac/
+For help setting up and using RSBAC."