Fixes patching with RSBAC. New patchset.

(Portage version: 2.1_pre10-r2)

5 files changed, 56 insertions, 4 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index 79d1ca126e9c..801a486ffcd5 100644
--- a/sys-kernel/hardened-sources/ChangeLog
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/hardened-sources
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.99 2006/05/13 14:50:59 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.100 2006/05/16 12:18:07 kang Exp $
+
+*hardened-sources-2.4.32-r5 (16 May 2006)
+
+  16 May 2006; Guillaume Destuynder <kang@gentoo.org>
+  +hardened-sources-2.4.32-r5.ebuild:
+  Fixes rsbac common patching (new patch in new -r5 patchset)
 
 *hardened-sources-2.4.32-r4 (13 May 2006)
 
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.32-r3 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.32-r3
index 2d9e5c17ff18..24935255467a 100644
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.32-r3
+++ b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.32-r3
@@ -1,6 +1,6 @@
-MD5 a677eb42895c16e45cc3be666068b387 hardened-patches-2.4-32.3.tar.bz2 764191
-RMD160 d954366e00df97d7bc7c6950e676da9113331922 hardened-patches-2.4-32.3.tar.bz2 764191
-SHA256 5857bdfbed967de627b2a2d0513a2013cd26edce51128af7fc231ab3d37ee84e hardened-patches-2.4-32.3.tar.bz2 764191
+MD5 c616cffee0f344c37fd4e045a7a87054 hardened-patches-2.4-32.3.tar.bz2 46
+RMD160 158842ae715eb8160256936e57764344868b8255 hardened-patches-2.4-32.3.tar.bz2 46
+SHA256 f4fad25a0e7a451ed906b76846efd6d2699a65b40795b29553addc35bf9a75c8 hardened-patches-2.4-32.3.tar.bz2 46
 MD5 38f4d0830e95a20f4bfed17622d5557c linux-2.4.32.tar.bz2 31132159
 RMD160 63ab1a0b18e690170f60de9da7392416311dc609 linux-2.4.32.tar.bz2 31132159
 SHA256 7dace89c3f0850c3d5c32c38c20b600259c314e8cbec29fe3ee59c2fbbee1759 linux-2.4.32.tar.bz2 31132159
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.32-r4 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.32-r4
index 6e8872d2c598..5eb74d0e491d 100644
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.32-r4
+++ b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.32-r4
@@ -1,2 +1,4 @@
 MD5 66493ec7c7c1c0289ffd01b8d43f4df6 hardened-patches-2.4-32.4.tar.bz2 756320
 MD5 38f4d0830e95a20f4bfed17622d5557c linux-2.4.32.tar.bz2 31132159
+RMD160 63ab1a0b18e690170f60de9da7392416311dc609 linux-2.4.32.tar.bz2 31132159
+SHA256 7dace89c3f0850c3d5c32c38c20b600259c314e8cbec29fe3ee59c2fbbee1759 linux-2.4.32.tar.bz2 31132159
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.32-r5 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.32-r5
new file mode 100644
index 000000000000..d79d820ae744
--- /dev/null
+++ b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.32-r5
@@ -0,0 +1,6 @@
+MD5 ec2703b6bfb50fff9685db6015b7cc78 hardened-patches-2.4-32.5.tar.bz2 756963
+RMD160 3435a38368c59dd939d936c3179eb1af11c03529 hardened-patches-2.4-32.5.tar.bz2 756963
+SHA256 a680e6c652b96c1ca2ceca35ca290fe51017a2aed1a504ae6fe4fef2e4c1b2c3 hardened-patches-2.4-32.5.tar.bz2 756963
+MD5 38f4d0830e95a20f4bfed17622d5557c linux-2.4.32.tar.bz2 31132159
+RMD160 63ab1a0b18e690170f60de9da7392416311dc609 linux-2.4.32.tar.bz2 31132159
+SHA256 7dace89c3f0850c3d5c32c38c20b600259c314e8cbec29fe3ee59c2fbbee1759 linux-2.4.32.tar.bz2 31132159
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.4.32-r5.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.32-r5.ebuild
new file mode 100644
index 000000000000..dfba35b0fa8b
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-2.4.32-r5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 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.32-r5.ebuild,v 1.1 2006/05/16 12:18:07 kang Exp $
+
+IUSE="rsbac"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+RDEPEND=""
+HGPV=32.5
+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_setup() {
+	if use rsbac; then
+		UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE}
+		3*.patch
+		6001*.patch"
+	else
+		UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE}
+		4*.patch
+		63*.patch"
+	fi
+	:
+}
+pkg_postinst() {
+	postinst_sources
+}