Added patches for the CAN-2004-0075, CAN-2004-0133, CAN-2004-0181, CAN-2004-0394, and CAN-2004-0427 vulnerabilities. Bug #47881. Old versions of sources removed.

18 files changed, 125 insertions, 461 deletions

diff --git a/sys-kernel/alpha-sources/ChangeLog b/sys-kernel/alpha-sources/ChangeLog
index e380464563f2..dac7be5a0ae2 100644
--- a/sys-kernel/alpha-sources/ChangeLog
+++ b/sys-kernel/alpha-sources/ChangeLog
@@ -1,11 +1,22 @@
 # 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.24 2004/04/27 21:57:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/ChangeLog,v 1.25 2004/05/28 21:26:07 plasmaroo Exp $
+
+*alpha-sources-2.4.21-r7 (28 May 2004)
+
+  28 May 2004; <plasmaroo@gentoo.org> -alpha-sources-2.4.19-r2.ebuild,
+  -alpha-sources-2.4.20-r2.ebuild, -alpha-sources-2.4.21-r2.ebuild,
+  -alpha-sources-2.4.21-r3.ebuild, -alpha-sources-2.4.21-r4.ebuild,
+  -alpha-sources-2.4.21-r5.ebuild, +alpha-sources-2.4.21-r7.ebuild,
+  +files/alpha-sources...patch:
+  Added patches for the CAN-2004-0075, CAN-2004-0133, CAN-2004-0181,
+  CAN-2004-0394, and CAN-2004-0427 vulnerabilities. Bug #47881. Old
+  versions of sources removed.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
   alpha-sources-2.4.19-r2.ebuild, alpha-sources-2.4.20-r2.ebuild,
   alpha-sources-2.4.21-r2.ebuild, alpha-sources-2.4.21-r3.ebuild:
-  Add inherit eutils
+  Add inherit eutils.
 
 *alpha-sources-2.4.21-r6 (17 Apr 2004)
 
diff --git a/sys-kernel/alpha-sources/alpha-sources-2.4.19-r2.ebuild b/sys-kernel/alpha-sources/alpha-sources-2.4.19-r2.ebuild
deleted file mode 100644
index 4cf722348388..000000000000
--- a/sys-kernel/alpha-sources/alpha-sources-2.4.19-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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.19-r2.ebuild,v 1.15 2004/04/27 21:57:02 agriffis Exp $
-
-inherit eutils
-
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-#we use this next variable to avoid duplicating stuff on cvs
-GFILESDIR=${PORTDIR}/sys-kernel/linux-sources/files
-OKV=2.4.19
-KV=${PVR}
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-
-# What's in this kernel?
-
-# INCLUDED:
-#
-# super page patch by Naohiki Shimizu. increases load performance
-# cia fix of qlogic isp scsi on alcor boards
-# xfs filesystem patches
-
-
-DESCRIPTION="Full sources for the Gentoo Linux Alpha kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 http://www.tuxnetwork.de/gentoo/linux-gentoo-alpha-${KV}.patch.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="alpha"
-
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND=">=sys-devel/binutils-2.11.90.0.31"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl virtual/modutils sys-devel/make"
-fi
-
-GENTOOPATCH=${DISTDIR}/linux-gentoo-alpha-${KV}.patch.bz2
-
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-	cd ${S}
-	pwd
-	bzcat ${GENTOOPATCH} | patch -p1 || die # Patch the kernel
-
-	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}/${P}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
-
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	make mrproper || die
-
-	#this file is required for other things to build properly, so we autogenerate it
-	make include/linux/version.h || die
-
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R 0:0 *
-	chmod -R a+r-w+X,u+w *
-
-	# Gentoo Linux uses /boot, so fix 'make install' to work properly
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-		Makefile.orig >Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-}
-
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		yes "" | make oldconfig
-		echo "Ignore any errors from the yes command above."
-	fi
-}
-
-src_install() {
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		cd ${S}
-		echo ">>> Copying sources..."
-		mv ${WORKDIR}/* ${D}/usr/src
-	else
-		#linux-headers
-		yes "" | make oldconfig
-		echo "Ignore any errors from the yes command above."
-		make dep
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm-alpha/* ${D}/usr/include/asm
-	fi
-}
-
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
-		true
-	fi
-}
-
-pkg_postinst() {
-	[ "$ETYPE" = "headers" ] && return
-	if [ ! -e ${ROOT}usr/src/linux ]
-	then
-		rm -f ${ROOT}usr/src/linux
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux
-	fi
-}
diff --git a/sys-kernel/alpha-sources/alpha-sources-2.4.20-r2.ebuild b/sys-kernel/alpha-sources/alpha-sources-2.4.20-r2.ebuild
deleted file mode 100644
index af511d8c61c9..000000000000
--- a/sys-kernel/alpha-sources/alpha-sources-2.4.20-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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.20-r2.ebuild,v 1.12 2004/04/27 21:57:02 agriffis Exp $
-
-inherit eutils
-
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-#we use this next variable to avoid duplicating stuff on cvs
-GFILESDIR=${PORTDIR}/sys-kernel/linux-sources/files
-OKV=2.4.20
-KV=${PVR}
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-
-DESCRIPTION="Full sources for the Gentoo Linux Alpha kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 http://www.tuxnetwork.de/gentoo/linux-gentoo-alpha-${KV}.patch.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="alpha -sparc -x86 -ppc"
-
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND=">=sys-devel/binutils-2.11.90.0.31"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl virtual/modutils sys-devel/make"
-fi
-
-GENTOOPATCH=${DISTDIR}/linux-gentoo-alpha-${KV}.patch.bz2
-
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-	cd ${S}
-	pwd
-	bzcat ${GENTOOPATCH} | patch -p1 || die # Patch the kernel
-
-	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!"
-
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	make mrproper || die
-
-	#this file is required for other things to build properly, so we autogenerate it
-	make include/linux/version.h || die
-
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R 0:0 *
-	chmod -R a+r-w+X,u+w *
-
-	# Gentoo Linux uses /boot, so fix 'make install' to work properly
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-		Makefile.orig >Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-}
-
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		yes "" | make oldconfig
-		echo "Ignore any errors from the yes command above."
-	fi
-}
-
-src_install() {
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		cd ${S}
-		echo ">>> Copying sources..."
-		mv ${WORKDIR}/* ${D}/usr/src
-	else
-		#linux-headers
-		yes "" | make oldconfig
-		echo "Ignore any errors from the yes command above."
-		make dep
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm-alpha/* ${D}/usr/include/asm
-	fi
-}
-
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
-		true
-	fi
-}
-
-pkg_postinst() {
-	[ "$ETYPE" = "headers" ] && return
-	if [ ! -e ${ROOT}usr/src/linux ]
-	then
-		rm -f ${ROOT}usr/src/linux
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux
-	fi
-}
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
deleted file mode 100644
index ddf83513539e..000000000000
--- a/sys-kernel/alpha-sources/alpha-sources-2.4.21-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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-r2.ebuild,v 1.4 2004/04/27 21:57:02 agriffis Exp $
-
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-IUSE="build crypt usagi"
-ETYPE="sources"
-inherit kernel eutils
-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 "
-
-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!"
-
-}
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
deleted file mode 100644
index 2617d40ab4d3..000000000000
--- a/sys-kernel/alpha-sources/alpha-sources-2.4.21-r3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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.4 2004/04/27 21:57:02 agriffis Exp $
-
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-IUSE="build crypt usagi"
-ETYPE="sources"
-inherit kernel eutils
-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 "
-
-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/alpha-sources-2.4.21-r4.ebuild b/sys-kernel/alpha-sources/alpha-sources-2.4.21-r4.ebuild
deleted file mode 100644
index e58d60beb10a..000000000000
--- a/sys-kernel/alpha-sources/alpha-sources-2.4.21-r4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.3 2004/04/12 16:36:22 aliz Exp $
-
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-IUSE="build crypt usagi"
-ETYPE="sources"
-inherit kernel eutils
-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 "
-
-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/alpha-sources-2.4.21-r5.ebuild b/sys-kernel/alpha-sources/alpha-sources-2.4.21-r7.ebuild
index a19c4f59ba73..418959b1d4e0 100644
--- a/sys-kernel/alpha-sources/alpha-sources-2.4.21-r5.ebuild
+++ b/sys-kernel/alpha-sources/alpha-sources-2.4.21-r7.ebuild
@@ -1,8 +1,8 @@
 # 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-r5.ebuild,v 1.1 2004/04/15 07:56:31 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/alpha-sources-2.4.21-r7.ebuild,v 1.1 2004/05/28 21:26:07 plasmaroo Exp $
 
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+# OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 IUSE="build crypt usagi"
 ETYPE="sources"
@@ -16,14 +16,14 @@ 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/5/3}.tar.bz2"
+	mirror://gentoo/patches-${KV/7/3}.tar.bz2"
 SLOT="${KV}"
-KEYWORDS="alpha -sparc -x86 -ppc -hppa -mips"
+KEYWORDS="~alpha -sparc -x86 -ppc -hppa -mips"
 
 src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die
-	cd ${WORKDIR}/${KV/5/1}
+	cd ${WORKDIR}/${KV/7/1}
 
 	# This is the crypt USE flag, keeps {USAGI/superfreeswan/patch-int/loop-jari}
 	if [ -z "`use crypt`" ]; then
@@ -59,7 +59,15 @@ 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}.CAN-2004-0010.patch || die "Failed to add the CAN-2004-0010 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0075.patch || die "Failed to add the CAN-2004-0075 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0133.patch || die "Failed to add the CAN-2004-0133 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0177.patch || die "Failed to add the CAN-2004-0177 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0178.patch || die "Failed to add the CAN-2004-0178 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0181.patch || die "Failed to add the CAN-2004-0181 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!"
 	epatch ${FILESDIR}/${PN}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
 	epatch ${FILESDIR}/${PN}.munmap.patch || die "Failed to apply munmap patch!"
 
diff --git a/sys-kernel/alpha-sources/files/alpha-sources.CAN-2004-0075.patch b/sys-kernel/alpha-sources/files/alpha-sources.CAN-2004-0075.patch
new file mode 100644
index 000000000000..5c397deb9c46
--- /dev/null
+++ b/sys-kernel/alpha-sources/files/alpha-sources.CAN-2004-0075.patch
@@ -0,0 +1,25 @@
+--- linux-2.4.23/drivers/usb/vicam.c	2004-01-26 16:56:32.000000000 +0000
++++ linux-2.4.25/drivers/usb/vicam.c	2004-04-20 18:15:53.000000000 +0100
+@@ -601,12 +601,19 @@
+ 	case VIDIOCSWIN:
+ 		{
+ 
+-			struct video_window *vw = (struct video_window *) arg;
+-			DBG("VIDIOCSWIN %d x %d\n", vw->width, vw->height);
++			struct video_window vw;
+ 
+-			if ( vw->width != 320 || vw->height != 240 )
++			if (copy_from_user(&vw, arg, sizeof(vw)))
++			{
+ 				retval = -EFAULT;
++				break;
++			}
++
++			DBG("VIDIOCSWIN %d x %d\n", vw->width, vw->height);
+ 			
++			if ( vw.width != 320 || vw.height != 240 )
++				retval = -EFAULT;
++
+ 			break;
+ 		}
+ 
diff --git a/sys-kernel/alpha-sources/files/alpha-sources.CAN-2004-0133.patch b/sys-kernel/alpha-sources/files/alpha-sources.CAN-2004-0133.patch
new file mode 100644
index 000000000000..c756bc328bf2
--- /dev/null
+++ b/sys-kernel/alpha-sources/files/alpha-sources.CAN-2004-0133.patch
@@ -0,0 +1,11 @@
+--- linux-2.4.22/fs/xfs/xfs_log.c.can-2004-0133	2004-03-23 12:28:11.000000000 -0700
++++ linux-2.4.22/fs/xfs/xfs_log.c	2004-03-23 12:58:59.000000000 -0700
+@@ -1251,7 +1251,7 @@
+ 			  kmem_zalloc(sizeof(xlog_in_core_t), KM_SLEEP);
+ 		iclog = *iclogp;
+ 		iclog->hic_data = (xlog_in_core_2_t *)
+-			  kmem_alloc(iclogsize, KM_SLEEP);
++			  kmem_zalloc(iclogsize, KM_SLEEP);
+ 
+ 		iclog->ic_prev = prev_iclog;
+ 		prev_iclog = iclog;
diff --git a/sys-kernel/alpha-sources/files/alpha-sources.CAN-2004-0181.patch b/sys-kernel/alpha-sources/files/alpha-sources.CAN-2004-0181.patch
new file mode 100644
index 000000000000..5f7f1441b268
--- /dev/null
+++ b/sys-kernel/alpha-sources/files/alpha-sources.CAN-2004-0181.patch
@@ -0,0 +1,38 @@
+--- linux-2.4.22/fs/jfs/jfs_logmgr.c.jfs-sec	2004-03-23 12:30:35.000000000 -0700
++++ linux-2.4.22/fs/jfs/jfs_logmgr.c	2004-03-23 13:01:51.000000000 -0700
+@@ -1693,7 +1693,7 @@
+ 		if (lbuf == 0)
+ 			goto error;
+ 		lbuf->l_bh.b_data = lbuf->l_ldata =
+-		    (char *) __get_free_page(GFP_KERNEL);
++		    (char *) get_zeroed_page(GFP_KERNEL);
+ 		if (lbuf->l_ldata == 0) {
+ 			kfree(lbuf);
+ 			goto error;
+--- linux-2.4.22/fs/jfs/jfs_metapage.c.jfs-sec	2004-03-23 12:30:48.000000000 -0700
++++ linux-2.4.22/fs/jfs/jfs_metapage.c	2004-03-23 13:01:51.000000000 -0700
+@@ -375,6 +375,10 @@
+ 		}
+ 		mp->data = kmap(mp->page) + page_offset;
+ 	}
++
++	if (new)
++		memset(mp->data, 0, PSIZE);
++
+ 	jfs_info("__get_metapage: returning = 0x%p", mp);
+ 	return mp;
+ 
+--- linux-2.4.22/fs/jfs/super.c.jfs-sec	2004-03-23 12:31:10.000000000 -0700
++++ linux-2.4.22/fs/jfs/super.c	2004-03-23 13:01:51.000000000 -0700
+@@ -423,10 +423,10 @@
+ 
+ 	if ((flags & (SLAB_CTOR_VERIFY | SLAB_CTOR_CONSTRUCTOR)) ==
+ 	    SLAB_CTOR_CONSTRUCTOR) {
++		memset(jfs_ip, 0, sizeof(struct jfs_inode_info));
+ 		INIT_LIST_HEAD(&jfs_ip->anon_inode_list);
+ 		init_rwsem(&jfs_ip->rdwrlock);
+ 		init_MUTEX(&jfs_ip->commit_sem);
+-		jfs_ip->atlhead = 0;
+ 		jfs_ip->active_ag = -1;
+ 	}
+ }
diff --git a/sys-kernel/alpha-sources/files/alpha-sources.CAN-2004-0394.patch b/sys-kernel/alpha-sources/files/alpha-sources.CAN-2004-0394.patch
new file mode 100644
index 000000000000..273f1a52046f
--- /dev/null
+++ b/sys-kernel/alpha-sources/files/alpha-sources.CAN-2004-0394.patch
@@ -0,0 +1,11 @@
+--- linux-2.4.22-oM3-orig/kernel/panic.c	Tue Mar 30 15:37:18 2004
++++ linux-2.4.22-oM3-mod/kernel/panic.c	Mon May 17 18:44:01 2004
+@@ -51,7 +51,7 @@
+ 
+ 	bust_spinlocks(1);
+ 	va_start(args, fmt);
+-	vsprintf(buf, fmt, args);
++	vsnprintf(buf, sizeof(buf), fmt, args);
+ 	va_end(args);
+ 	printk(KERN_EMERG "Kernel panic: %s\n",buf);
+ 	if (in_interrupt())
diff --git a/sys-kernel/alpha-sources/files/alpha-sources.CAN-2004-0427.patch b/sys-kernel/alpha-sources/files/alpha-sources.CAN-2004-0427.patch
new file mode 100644
index 000000000000..ddc9610f67f8
--- /dev/null
+++ b/sys-kernel/alpha-sources/files/alpha-sources.CAN-2004-0427.patch
@@ -0,0 +1,14 @@
+diff -Nar -U 4 linux-2.4.25/kernel/fork.c linux-2.4.25-new/kernel/fork.c
+--- linux-2.4.25/kernel/fork.c	2004-02-18 05:36:32.000000000 -0800
++++ linux-2.4.25-new/kernel/fork.c	2004-04-07 17:43:29.000000000 -0700
+@@ -825,8 +825,10 @@
+ bad_fork_cleanup_namespace:
+ 	exit_namespace(p);
+ bad_fork_cleanup_mm:
+ 	exit_mm(p);
++	if (p->active_mm)
++		mmdrop(p->active_mm);
+ bad_fork_cleanup_sighand:
+ 	exit_sighand(p);
+ bad_fork_cleanup_fs:
+ 	exit_fs(p); /* blocking */
diff --git a/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.19-r2 b/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.19-r2
deleted file mode 100644
index fbfbc6fdc1c3..000000000000
--- a/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.19-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2bb60b7594a416f2c593923ce446160b linux-2.4.19.tar.bz2 26042494
-MD5 c56bf9e2db21e55e40ce5224359623da linux-gentoo-alpha-2.4.19-r2.patch.bz2 834096
diff --git a/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.20-r2 b/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.20-r2
deleted file mode 100644
index 9eb8475dc9d2..000000000000
--- a/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.20-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 2742104
-MD5 329aca4c4fec2cafca4cd7b16bd09ed5 linux-gentoo-alpha-2.4.20-r2.patch.bz2 218060
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
deleted file mode 100644
index c07dfdd82cdf..000000000000
--- a/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
-MD5 28094d6a3d68f228bda98af459ad1310 patches-2.4.21-alpha-r2.tar.bz2 1696825
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
deleted file mode 100644
index a17dcc489c19..000000000000
--- a/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-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/alpha-sources/files/digest-alpha-sources-2.4.21-r5 b/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r5
deleted file mode 100644
index a17dcc489c19..000000000000
--- a/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-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/alpha-sources/files/digest-alpha-sources-2.4.21-r3 b/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r7
index a17dcc489c19..a17dcc489c19 100644
--- 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-r7