6 files changed, 125 insertions, 12 deletions
diff --git a/sys-kernel/alpha-sources/ChangeLog b/sys-kernel/alpha-sources/ChangeLog
index f0e1603b3bc5..b5806bc6b767 100644
--- a/sys-kernel/alpha-sources/ChangeLog
+++ b/sys-kernel/alpha-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/alpha-sources
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/ChangeLog,v 1.20 2004/02/18 18:07:49 plasmaroo Exp $
+
+*alpha-sources-2.4.21-r4 (18 Feb 2004)
+
+  18 Feb 2004; <plasmaroo@gentoo.org> alpha-sources-2.4.21-r4.ebuild,
+  files/alpha-sources.munmap.patch:
+  Added the patch for the mremap/munmap vulnerability. Bug #42024.
 
 *alpha-sources-2.4.21-r3 (06 Feb 2004)
 
diff --git a/sys-kernel/alpha-sources/Manifest b/sys-kernel/alpha-sources/Manifest
index 12c98b6ce9c7..26c0fab31166 100644
--- a/sys-kernel/alpha-sources/Manifest
+++ b/sys-kernel/alpha-sources/Manifest
@@ -1,13 +1,16 @@
-MD5 e9ffddaca21b5eeee5beb51f470acb53 ChangeLog 2955
+MD5 6cc12c00e8297686f87e7be8209fb113 ChangeLog 3170
+MD5 5a716136b5d83659e53436eac841128f alpha-sources-2.4.21-r4.ebuild 2689
+MD5 8982b442d584bf387714d8aa3673edc1 alpha-sources-2.4.21-r2.ebuild 2039
 MD5 04b9cc43c6e54c93b099095e67c7c06a alpha-sources-2.4.19-r2.ebuild 3413
 MD5 75930f5747d67f6b5d0da1bcd692d0f5 alpha-sources-2.4.21-r3.ebuild 2599
 MD5 303dc442671ad54b72cba9a280210609 alpha-sources-2.4.20-r2.ebuild 3253
-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 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
 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
+MD5 174438d215b70cad5ffb00ca8123c062 files/alpha-sources.munmap.patch 837
+MD5 b8ec46a23797770246c82ec38b1168b0 files/digest-alpha-sources-2.4.20-r2 149
+MD5 e77a93fdf26f06cf3ea5080b27211725 files/alpha-sources.CAN-2003-0985.patch 414
+MD5 e52b0635fe18547f2278f6c4237a6e98 files/digest-alpha-sources-2.4.21-r3 144
+MD5 e52b0635fe18547f2278f6c4237a6e98 files/digest-alpha-sources-2.4.21-r4 144
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
diff --git a/sys-kernel/alpha-sources/alpha-sources-2.4.21-r4.ebuild b/sys-kernel/alpha-sources/alpha-sources-2.4.21-r4.ebuild
new file mode 100644
index 000000000000..cf953919fb6d
--- /dev/null
+++ b/sys-kernel/alpha-sources/alpha-sources-2.4.21-r4.ebuild
@@ -0,0 +1,77 @@
+# 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-r4.ebuild,v 1.1 2004/02/18 18:07:49 plasmaroo 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/r4/r3}.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/r4/r1}
+
+	# 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!"
+	epatch ${FILESDIR}/${PN}.munmap.patch || die "Failed to apply munmap patch!"
+
+	# 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/alpha-sources.munmap.patch b/sys-kernel/alpha-sources/files/alpha-sources.munmap.patch
new file mode 100644
index 000000000000..e120b35b7adb
--- /dev/null
+++ b/sys-kernel/alpha-sources/files/alpha-sources.munmap.patch
@@ -0,0 +1,27 @@
+diff -ur linux-2.4.25-rc3/mm/mremap.c linux-2.4.25-rc4/mm/mremap.c
+--- linux-2.4.25-rc3/mm/mremap.c	2004-02-18 13:56:01.000000000 +0000
++++ linux-2.4.25-rc4/mm/mremap.c	2004-02-18 13:49:08.000000000 +0000
+@@ -258,16 +258,20 @@
+ 		if ((addr <= new_addr) && (addr+old_len) > new_addr)
+ 			goto out;
+ 
+-		do_munmap(current->mm, new_addr, new_len);
++		ret = do_munmap(current->mm, new_addr, new_len);
++		if (ret && new_len)
++			goto out;
+ 	}
+ 
+ 	/*
+ 	 * Always allow a shrinking remap: that just unmaps
+ 	 * the unnecessary pages..
+ 	 */
+-	ret = addr;
+ 	if (old_len >= new_len) {
+-		do_munmap(current->mm, addr+new_len, old_len - new_len);
++		ret = do_munmap(current->mm, addr+new_len, old_len - new_len);
++		if (ret && old_len != new_len)
++			goto out;
++		ret = addr;
+ 		if (!(flags & MREMAP_FIXED) || (new_addr == addr))
+ 			goto out;
+ 	}
diff --git a/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r4 b/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r4
new file mode 100644
index 000000000000..a17dcc489c19
--- /dev/null
+++ b/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r4
@@ -0,0 +1,2 @@
+MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
+MD5 28094d6a3d68f228bda98af459ad1310 patches-2.4.21-alpha-r3.tar.bz2 1696825
diff --git a/sys-kernel/gentoo-dev-sources/Manifest b/sys-kernel/gentoo-dev-sources/Manifest
index ddd1c2709585..ec05b7bb03bb 100644
--- a/sys-kernel/gentoo-dev-sources/Manifest
+++ b/sys-kernel/gentoo-dev-sources/Manifest
@@ -1,10 +1,8 @@
-MD5 cd0826af3f7e4962cdc5316f56f3459b gentoo-dev-sources-2.6.3_rc4.ebuild 1297
 MD5 38e9dda07012a3c1c768a0bf72916966 gentoo-dev-sources-2.6.2-r1.ebuild 1352
-MD5 bf5f28c5248be9ba2e2ffc24cb5dcf2b gentoo-dev-sources-2.6.3_rc3.ebuild 1325
 MD5 a1962ceb66a56f4c373e1470843d7492 gentoo-dev-sources-2.6.1-r1.ebuild 2213
-MD5 1cd2c2811f1675d7d937e58c06d23816 ChangeLog 8638
+MD5 a58fa89253a4e1466acfc38031d8374a gentoo-dev-sources-2.6.3.ebuild 1299
+MD5 6dde19e8b8519e2dfb79c995aa4627d5 ChangeLog 8897
 MD5 67f88855f6ec6da22268bad74aa10597 metadata.xml 636
+MD5 6b9c1af35601dbf5977952f6d11748d6 files/digest-gentoo-dev-sources-2.6.3 138
 MD5 150fc6d514e8cb2b07a3a7b14b8d92ef files/digest-gentoo-dev-sources-2.6.1-r1 138
 MD5 209cbc1ec89b12bcf89b2e48ef8219a7 files/digest-gentoo-dev-sources-2.6.2-r1 139
-MD5 0d0fa6c2244791874b8f75bdc65d183e files/digest-gentoo-dev-sources-2.6.3_rc3 203
-MD5 c95efd131f3a2171e7bd1585741b4f6c files/digest-gentoo-dev-sources-2.6.3_rc4 203