USE support in hardened-sources

4 files changed, 27 insertions, 5 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index 2556386712ca..8ebd73163568 100644
--- a/sys-kernel/hardened-sources/ChangeLog
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -1,9 +1,15 @@
 # ChangeLog for sys-kernel/hardened-sources
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.4 2003/04/09 22:10:19 frogger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.5 2003/04/12 23:39:26 frogger Exp $
 
 *hardened-sources-2.4.20-r1 (09 Apr 2003)
 
+  12 Apr 2003; Matthew Rickard <frogger@gentoo.org>
+  hardened-sources-2.4.20-r1.ebuild:
+  LSM/SELinux is now patched in when "selinux" is in USE.  Otherwise, GRSecurity
+  is patched in instead.  Ptrace patches for selinux have also been added.  In
+  either case, systrace support will be patched in as well.
+
   09 Apr 2003; Matthew Rickard <frogger@gentoo.org>
   hardened-sources-2.4.20-r1.ebuild, hardened-sources-2.4.20.ebuild, manifest:
   Revision bump for new sources
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.20-r1 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.20-r1
index 702732dde3fe..5dddf064d84e 100644
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.20-r1
+++ b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.20-r1
@@ -1,2 +1,2 @@
 MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 8a678d92afb418806ec82c9fad8fee2e patches-2.4.20-hardened.tar.bz2 305146
+MD5 a4da4356255f137db34cbb228724c1eb patches-2.4.20-hardened-r1.tar.bz2 316580
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.4.20-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.20-r1.ebuild
index 308ae7f1fda9..7edd0766f91a 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.20-r1.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.4.20-r1.ebuild
@@ -10,7 +10,7 @@ ETYPE="sources"
 inherit kernel || die
 
 OKV=2.4.20
-EXTRAVERSION=-hardened
+EXTRAVERSION=-hardened-r1
 KV=${OKV}${EXTRAVERSION}
 S=${WORKDIR}/linux-${KV}
 DESCRIPTION="Special Security Hardened Gentoo Kernel (don't use this yet, it isn't ready)"
@@ -27,12 +27,28 @@ src_unpack() {
 	mv linux-${OKV} linux-${KV} || die
 	
 	cd ${KV}
+	# We can't use LSM/SELinux and GRSec in the same kernel.  If USE=selinux, we will
+	# patch in LSM/SELinux and drop support for GRsec.  Otherwise we will include GRSec.
+	if [ "`use selinux`" ]; then
+		einfo "Enabling SELinux support.  This will drop GRSec support."
+		for file in *grsec*; do
+			einfo "Dropping ${file}.."
+			rm -f ${file}
+		done
+	else
+		einfo "Did not find \"selinux\" in use, building with GRSec support."
+		for file in *lsm* *selinux*; do
+			einfo "Dropping ${file}..."
+			rm -f ${file}
+		done
+	fi
+	
 	kernel_src_unpack
 }
 
 pkg_postinst() {
 	kernel_pkg_postinst
-	einfo "This kernel contains LSM, GRSec2, and Systrace"
+	einfo "This kernel contains LSM/SElinux or GRSecurity, and Systrace"
 	einfo "This is not yet a production ready kernel.  If you experience problems with"
 	einfo "this kernel please report them by assigning bugs on bugs.gentoo.org to"
 	einfo "frogger@gentoo.org"
diff --git a/sys-kernel/hardened-sources/manifest b/sys-kernel/hardened-sources/manifest
index acb8df2d8da4..5630c6786f4a 100644
--- a/sys-kernel/hardened-sources/manifest
+++ b/sys-kernel/hardened-sources/manifest
@@ -1,5 +1,5 @@
 MD5 f9d67e9ab9bee46794e59cb76b070248 hardened-sources-2.4.20.ebuild 1141
 MD5 ea3675324de5d7c75342b60add459fd0 hardened-sources-2.4.20-r1.ebuild 1602
-MD5 6ba109aa9a019ef349bb1b4029b28b50 ChangeLog 1072
+MD5 20b7cfb62f3cff6a84640ac0e21700a2 ChangeLog 1072
 MD5 af924609b3daad940a82ce31f516779a files/digest-hardened-sources-2.4.20-r1 146
 MD5 77b6c798023422b48dc9282b1f667fe3 files/digest-hardened-sources-2.4.20 142