new upstream version

5 files changed, 52 insertions, 16 deletions

diff --git a/sys-kernel/selinux-sources/ChangeLog b/sys-kernel/selinux-sources/ChangeLog
index fbfdc318ae7b..482f54d69e81 100644
--- a/sys-kernel/selinux-sources/ChangeLog
+++ b/sys-kernel/selinux-sources/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/selinux-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/selinux-sources/ChangeLog,v 1.19 2003/08/14 18:50:19 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/selinux-sources/ChangeLog,v 1.20 2003/10/03 19:45:32 pebenito Exp $
+
+*selinux-sources-2.4.21-r3 (03 Oct 2003)
+
+  03 Oct 2003; Chris PeBenito <pebenito@gentoo.org>
+  selinux-sources-2.4.21-r2.ebuild, selinux-sources-2.4.21-r3.ebuild:
+  New upstream version.
+
+  02 Oct 2003; Chris PeBenito <pebenito@gentoo.org>
+  selinux-sources-2.4.21-r2.ebuild:
+  Mark stable
 
 *selinux-sources-2.4.21-r2 (14 Aug 2003)
 
diff --git a/sys-kernel/selinux-sources/Manifest b/sys-kernel/selinux-sources/Manifest
index 954910c5b952..c24521593a38 100644
--- a/sys-kernel/selinux-sources/Manifest
+++ b/sys-kernel/selinux-sources/Manifest
@@ -1,6 +1,8 @@
-MD5 6e55a5a8249376e519291515d3c335c5 ChangeLog 2770
+MD5 e5916ba9d57c18cd2439b325274d14d2 ChangeLog 3062
 MD5 f455fbb5d96167058282b93599457a4f metadata.xml 470
+MD5 06c921bad69e68c837ef830bdb27d6bd selinux-sources-2.4.21-r2.ebuild 782
 MD5 95125e727952db5dcd88f65f4d773d97 selinux-sources-2.4.21.ebuild 1713
-MD5 c068c036554d99973914d63d395c5b62 selinux-sources-2.4.21-r2.ebuild 1361
+MD5 48adc9047f2f54235f938d645c83e432 selinux-sources-2.4.21-r3.ebuild 821
 MD5 ba4d23bb69d489a7ae374d964a9eafc5 files/digest-selinux-sources-2.4.21 142
 MD5 a5b316ee2473a6445842f81c9e3eba7d files/digest-selinux-sources-2.4.21-r2 145
+MD5 56fbec935c338a1a14fb6ba9552a5f23 files/digest-selinux-sources-2.4.21-r3 145
diff --git a/sys-kernel/selinux-sources/files/digest-selinux-sources-2.4.21-r3 b/sys-kernel/selinux-sources/files/digest-selinux-sources-2.4.21-r3
new file mode 100644
index 000000000000..156449fea601
--- /dev/null
+++ b/sys-kernel/selinux-sources/files/digest-selinux-sources-2.4.21-r3
@@ -0,0 +1,2 @@
+MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
+MD5 60a0fcb4dce3108b8e52d1782c6e41ed patches-2.4.21-selinux-r3.tar.bz2 222355
diff --git a/sys-kernel/selinux-sources/selinux-sources-2.4.21-r2.ebuild b/sys-kernel/selinux-sources/selinux-sources-2.4.21-r2.ebuild
index d41ef1c52ba8..2f0b1d36feae 100644
--- a/sys-kernel/selinux-sources/selinux-sources-2.4.21-r2.ebuild
+++ b/sys-kernel/selinux-sources/selinux-sources-2.4.21-r2.ebuild
@@ -1,20 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/selinux-sources/selinux-sources-2.4.21-r2.ebuild,v 1.2 2003/09/07 07:26:01 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/selinux-sources/selinux-sources-2.4.21-r2.ebuild,v 1.3 2003/10/03 19:45:32 pebenito Exp $
 
 IUSE="selinux"
 
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
-# *evms*).  Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
 ETYPE="sources"
 inherit kernel
 #KV="2.4.21-selinux"
@@ -25,7 +14,7 @@ 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.nsa.gov/selinux"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="${KV}"
 
 src_unpack() {
diff --git a/sys-kernel/selinux-sources/selinux-sources-2.4.21-r3.ebuild b/sys-kernel/selinux-sources/selinux-sources-2.4.21-r3.ebuild
new file mode 100644
index 000000000000..706c6c38e2b5
--- /dev/null
+++ b/sys-kernel/selinux-sources/selinux-sources-2.4.21-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/selinux-sources/selinux-sources-2.4.21-r3.ebuild,v 1.1 2003/10/03 19:45:32 pebenito Exp $
+
+IUSE="selinux"
+
+ETYPE="sources"
+inherit kernel
+#KV="2.4.21-selinux"
+
+S=${WORKDIR}/linux-${KV}
+DESCRIPTION="LSM patched kernel with SELinux"
+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.nsa.gov/selinux"
+KEYWORDS="~x86 -ppc -alpha -sparc -mips -amd64 -ia64"
+SLOT="${KV}"
+
+src_unpack() {
+	unpack ${A}
+	mv linux-${OKV} linux-${KV} || die
+
+	cd ${KV}
+	kernel_src_unpack
+}
+
+src_install() {
+	kernel_src_install
+
+	dosed 's:-r0::' /usr/src/linux-${KV}/Makefile
+}
+