push out do_brk fix for alpha-sources

4 files changed, 71 insertions, 2 deletions

diff --git a/sys-kernel/alpha-sources/ChangeLog b/sys-kernel/alpha-sources/ChangeLog
index ce03e53feb8e..e15529cd7fce 100644
--- a/sys-kernel/alpha-sources/ChangeLog
+++ b/sys-kernel/alpha-sources/ChangeLog
@@ -1,12 +1,18 @@
 # ChangeLog for sys-kernel/alpha-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/ChangeLog,v 1.14 2003/12/08 23:15:36 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/ChangeLog,v 1.15 2003/12/10 20:31:25 agriffis Exp $
 
   09 Dec 2003; <spider@gentoo.org> alpha-sources-2.4.19-r1.ebuild,
   alpha-sources-2.4.19-r2.ebuild, alpha-sources-2.4.20-r1.ebuild,
   alpha-sources-2.4.20-r2.ebuild:
   changing "chown" to work with new POSIX standard
 
+*alpha-sources-2.4.21-r2 (04 Dec 2003)
+
+  04 Dec 2003; Aron Griffis <agriffis@gentoo.org>
+  alpha-sources-2.4.21-r2.ebuild:
+  Bump rev to push out do_brk fix
+
   04 Dec 2003; Brian Jackson <iggy@gentoo.org> alpha-sources-2.4.21-r1.ebuild:
   Patching needs to be moved to after to kernel_..._unpack...
 
diff --git a/sys-kernel/alpha-sources/Manifest b/sys-kernel/alpha-sources/Manifest
index 40dfcc020f8a..e2c66f087a75 100644
--- a/sys-kernel/alpha-sources/Manifest
+++ b/sys-kernel/alpha-sources/Manifest
@@ -1,12 +1,14 @@
-MD5 ce66bd4460fa1efc14caa695e4ea07c9 ChangeLog 2114
+MD5 477c580e0ce27a788ec8e31df3120961 ChangeLog 2275
 MD5 cb979118d6f6f207e776c075fdc27721 alpha-sources-2.4.19-r1.ebuild 3193
 MD5 33bfab6a4c7cefaf9ab57ff69d678181 alpha-sources-2.4.19-r2.ebuild 3218
 MD5 521b149869556eed316bdf36b965c777 alpha-sources-2.4.20-r1.ebuild 3178
 MD5 05dc63a99167274c2b08276bd6dca610 alpha-sources-2.4.20-r2.ebuild 3057
 MD5 3fd8d4e422ce3d7008f2eb423c8ae8e0 alpha-sources-2.4.21-r1.ebuild 1840
+MD5 47ef3ec84a0c3911d5ead30bb7657212 alpha-sources-2.4.21-r2.ebuild 1844
 MD5 16670f1bb65727ad1fe9fe73fc73e5be files/digest-alpha-sources-2.4.19-r1 149
 MD5 ef1326d11a9e944b46ded8ed8cd13556 files/digest-alpha-sources-2.4.19-r2 150
 MD5 460dfb4e575d23adc1229940ebcac3b8 files/digest-alpha-sources-2.4.20-r1 150
 MD5 b8ec46a23797770246c82ec38b1168b0 files/digest-alpha-sources-2.4.20-r2 149
 MD5 5b44fd1e2632e313a3774ce690891a94 files/digest-alpha-sources-2.4.21-r1 144
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
+MD5 d9fdbd53c213583e18020e159a338371 files/digest-alpha-sources-2.4.21-r2 144
diff --git a/sys-kernel/alpha-sources/alpha-sources-2.4.21-r2.ebuild b/sys-kernel/alpha-sources/alpha-sources-2.4.21-r2.ebuild
new file mode 100644
index 000000000000..5b224fa57d58
--- /dev/null
+++ b/sys-kernel/alpha-sources/alpha-sources-2.4.21-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/alpha-sources-2.4.21-r2.ebuild,v 1.1 2003/12/10 20:31:25 agriffis Exp $
+
+#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+IUSE="build crypt usagi"
+ETYPE="sources"
+inherit kernel
+OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
+EXTRAVERSION="-${PN/-*/}"
+[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+KV="${OKV}${EXTRAVERSION}"
+
+S=${WORKDIR}/linux-${KV}
+
+DESCRIPTION="Full sources for the Gentoo Linux Alpha kernel"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+	mirror://gentoo/patches-${KV}.tar.bz2"
+SLOT="${KV}"
+KEYWORDS="alpha -sparc -x86 -ppc -hppa -mips -arm"
+
+src_unpack() {
+	unpack ${A}
+	mv linux-${OKV} linux-${KV} || die
+	cd ${WORKDIR}/${KV}
+
+	# This is the crypt USE flag, keeps {USAGI/superfreeswan/patch-int/loop-jari}
+	if [ -z "`use crypt`" ]; then
+	    einfo "No Cryptographic support, dropping patches..."
+	    for file in 6* 8* ;do
+		einfo "Dropping ${file}..."
+		rm -f ${file}
+	    done
+	else
+	    einfo "Cryptographic patches will be applied"
+	fi
+
+	# This is the usagi USE flag, keeps USAGI, drops {superfreeswan/patch-int/loop-jari}
+	# Using USAGI will also cause you to drop all iptables ipv6 patches
+	if [ -z "`use usagi`" ]; then
+		einfo "Keeping {superfreeswan/patch-int/loop-jari} patches, dropping USAGI"
+		for file in 6* ;do
+			einfo "Dropping ${file}..."
+			rm -f ${file}
+		done
+	else
+		einfo "Keeping USAGI patch, dropping {superfreeswan/patch-int/loop-jari}"
+		for file in *.ipv6 8* ;do
+			einfo "Dropping ${file}..."
+			rm -f ${file}
+		done
+	fi
+
+	kernel_src_unpack
+
+	cd ${S}
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+}
diff --git a/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r2 b/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r2
new file mode 100644
index 000000000000..c07dfdd82cdf
--- /dev/null
+++ b/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r2
@@ -0,0 +1,2 @@
+MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
+MD5 28094d6a3d68f228bda98af459ad1310 patches-2.4.21-alpha-r2.tar.bz2 1696825