Revision bump

6 files changed, 66 insertions, 16 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index 512b36608c8b..c1b47a78869c 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.2 2003/04/09 20:27:52 frogger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.3 2003/04/09 22:05:31 frogger Exp $
+
+*hardened-sources-2.4.20-r1 (09 Apr 2003)
+
+  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
 
 *hardened-sources-2.4.20 (30 Mar 2003)
 
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.20 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.20
index 702732dde3fe..93212441753e 100644
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.20
+++ b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.20
@@ -1,2 +1,2 @@
 MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 8a678d92afb418806ec82c9fad8fee2e patches-2.4.20-hardened.tar.bz2 305146
+MD5 b3ea5794c74b5a9ce63462a5e5bb47b5 systrace-linux-2.4.20-v1.2.diff 75853
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
new file mode 100644
index 000000000000..702732dde3fe
--- /dev/null
+++ b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.20-r1
@@ -0,0 +1,2 @@
+MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
+MD5 8a678d92afb418806ec82c9fad8fee2e patches-2.4.20-hardened.tar.bz2 305146
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
new file mode 100644
index 000000000000..308ae7f1fda9
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-2.4.20-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+IUSE="build"
+
+# OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+ETYPE="sources"
+
+inherit kernel || die
+
+OKV=2.4.20
+EXTRAVERSION=-hardened
+KV=${OKV}${EXTRAVERSION}
+S=${WORKDIR}/linux-${KV}
+DESCRIPTION="Special Security Hardened Gentoo Kernel (don't use this yet, it isn't ready)"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+ 	 mirror://gentoo/patches-${KV}.tar.bz2"
+
+
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/hardened/"
+KEYWORDS="~x86"
+SLOT="${KV}"
+
+src_unpack() {
+	unpack linux-${OKV}.tar.bz2 patches-${KV}.tar.bz2
+	mv linux-${OKV} linux-${KV} || die
+	
+	cd ${KV}
+	kernel_src_unpack
+}
+
+pkg_postinst() {
+	kernel_pkg_postinst
+	einfo "This kernel contains LSM, GRSec2, 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/hardened-sources-2.4.20.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.20.ebuild
index 8938caa62e14..196959c56b78 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.20.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.4.20.ebuild
@@ -17,8 +17,8 @@ EXTRAVERSION=-hardened
 KV=${OKV}${EXTRAVERSION}
 S=${WORKDIR}/linux-${KV}
 DESCRIPTION="Special Security Hardened Gentoo Kernel (don't use this yet, it isn't ready)"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
- 	 mirror://gentoo/patches-${KV}.tar.bz2"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 
+ 	 http://www.citi.umich.edu/u/provos/systrace/systrace-linux-2.4.20-v1.2.diff"
 
 
 HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/hardened/"
@@ -26,17 +26,18 @@ KEYWORDS="~x86"
 SLOT="${KV}"
 
 src_unpack() {
-	unpack linux-${OKV}.tar.bz2 patches-${KV}.tar.bz2
+	unpack linux-${OKV}.tar.bz2
 	mv linux-${OKV} linux-${KV} || die
-	
-	cd ${KV}
-	kernel_src_unpack
+	cd ${S}
+	patch -p1 < ${DISTDIR}/${KPATCH} || die "Cannot find systrace patch"
 }
 
-pkg_postinst() {
-	kernel_pkg_postinst
-	einfo "This kernel contains LSM, GRSec2, 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"
+src_compile() {
+	einfo "You must compile and install this kernel *before* you can emerge and use the systrace userland utilities."
+}
+
+src_install() {
+	dodir /usr/src
+	echo ">>> Copying sources..."
+	mv ${WORKDIR}/linux-${KV} ${D}/usr/src
 }
diff --git a/sys-kernel/hardened-sources/manifest b/sys-kernel/hardened-sources/manifest
index c6a03bb97cd2..46f2e29789ee 100644
--- a/sys-kernel/hardened-sources/manifest
+++ b/sys-kernel/hardened-sources/manifest
@@ -1,3 +1,5 @@
-MD5 5960a86d170c1ad62b56fb99964ba142 hardened-sources-2.4.20.ebuild 1126
+MD5 f9d67e9ab9bee46794e59cb76b070248 hardened-sources-2.4.20.ebuild 1141
+MD5 52a045d829fba8d5f6f9689c60cef62f hardened-sources-2.4.20-r1.ebuild 1066
 MD5 324485faf2d3be3c252b9606ae9b26e3 ChangeLog 548
-MD5 6402fe8dd0793003c2675ae8c0a57afe files/digest-hardened-sources-2.4.20 143
+MD5 6402fe8dd0793003c2675ae8c0a57afe files/digest-hardened-sources-2.4.20-r1 143
+MD5 77b6c798023422b48dc9282b1f667fe3 files/digest-hardened-sources-2.4.20 142