Fix bug 38354 with an awk script in the ebuild. Thanks to Rick Altherr (kc8apf) for catching this

4 files changed, 94 insertions, 7 deletions

diff --git a/sys-kernel/alpha-sources/ChangeLog b/sys-kernel/alpha-sources/ChangeLog
index c953ea13c9df..f0e1603b3bc5 100644
--- a/sys-kernel/alpha-sources/ChangeLog
+++ b/sys-kernel/alpha-sources/ChangeLog
@@ -1,6 +1,13 @@
 # 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.18 2004/01/06 23:02:34 plasmaroo Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/ChangeLog,v 1.19 2004/02/06 17:25:17 agriffis Exp $
+
+*alpha-sources-2.4.21-r3 (06 Feb 2004)
+
+  06 Feb 2004; Aron Griffis <agriffis@gentoo.org>
+  alpha-sources-2.4.21-r3.ebuild:
+  Fix bug 38354 with an awk script in the ebuild. Thanks to Rick Altherr
+  (kc8apf) for catching this
 
   06 Jan 2004; <plasmaroo@gentoo.org> alpha-sources-2.4.19-r1.ebuild,
   alpha-sources-2.4.19-r2.ebuild, alpha-sources-2.4.20-r1.ebuild,
diff --git a/sys-kernel/alpha-sources/Manifest b/sys-kernel/alpha-sources/Manifest
index 5b82eeeee74b..c771ba293ffb 100644
--- a/sys-kernel/alpha-sources/Manifest
+++ b/sys-kernel/alpha-sources/Manifest
@@ -1,11 +1,13 @@
+MD5 e9ffddaca21b5eeee5beb51f470acb53 ChangeLog 2955
 MD5 04b9cc43c6e54c93b099095e67c7c06a alpha-sources-2.4.19-r2.ebuild 3413
-MD5 8982b442d584bf387714d8aa3673edc1 alpha-sources-2.4.21-r2.ebuild 2039
+MD5 0f867b60e2e52ceb752f7f2779bc061b alpha-sources-2.4.21-r3.ebuild 2604
 MD5 303dc442671ad54b72cba9a280210609 alpha-sources-2.4.20-r2.ebuild 3253
-MD5 0c9274bad5f4146c0a99108d611e25f3 ChangeLog 2729
-MD5 df40eece807d039cba79f477e80ebda2 files/alpha-sources-2.4.19.rtc_fix.patch 4974
+MD5 8982b442d584bf387714d8aa3673edc1 alpha-sources-2.4.21-r2.ebuild 2039
+MD5 e52b0635fe18547f2278f6c4237a6e98 files/digest-alpha-sources-2.4.21-r3 144
 MD5 ef1326d11a9e944b46ded8ed8cd13556 files/digest-alpha-sources-2.4.19-r2 150
 MD5 b8ec46a23797770246c82ec38b1168b0 files/digest-alpha-sources-2.4.20-r2 149
-MD5 d9fdbd53c213583e18020e159a338371 files/digest-alpha-sources-2.4.21-r2 144
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
-MD5 a61e57d5483a06f20da339d91f98fbb8 files/alpha-sources.rtc_fix.patch 6769
+MD5 d9fdbd53c213583e18020e159a338371 files/digest-alpha-sources-2.4.21-r2 144
+MD5 df40eece807d039cba79f477e80ebda2 files/alpha-sources-2.4.19.rtc_fix.patch 4974
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/alpha-sources.CAN-2003-0985.patch 414
+MD5 a61e57d5483a06f20da339d91f98fbb8 files/alpha-sources.rtc_fix.patch 6769
diff --git a/sys-kernel/alpha-sources/alpha-sources-2.4.21-r3.ebuild b/sys-kernel/alpha-sources/alpha-sources-2.4.21-r3.ebuild
new file mode 100644
index 000000000000..e0daa34e9020
--- /dev/null
+++ b/sys-kernel/alpha-sources/alpha-sources-2.4.21-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2004 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-r3.ebuild,v 1.1 2004/02/06 17:25:18 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 the do_brk() vulnerability!"
+	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
+	epatch ${FILESDIR}/${PN}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
+
+	# Fix multi-line literal in include/asm-alpha/xor.h -- see bug 38354
+	# If this script "dies" then that means it's no longer applicable.
+	mv include/asm-alpha/xor.h{,.multiline}
+	awk 'BEGIN     { addnl=0; exitstatus=1 }
+		 /^asm\("/ { addnl=1 }
+		 /^"\)/    { addnl=0 }
+		 addnl && !/\\n\\$/ { sub("$", " \\n\\", $0); exitstatus=0 }
+				   { print }
+         END       { exit exitstatus }' \
+		 <include/asm-alpha/xor.h.multiline >include/asm-alpha/xor.h
+	assert "awk script failed, probably doesn't apply to ${KV}"
+	rm -f include/asm-alpha/xor.h.multiline
+}
diff --git a/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r3 b/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r3
new file mode 100644
index 000000000000..a17dcc489c19
--- /dev/null
+++ b/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r3
@@ -0,0 +1,2 @@
+MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
+MD5 28094d6a3d68f228bda98af459ad1310 patches-2.4.21-alpha-r3.tar.bz2 1696825