Version bump; old versions removed due to security issues.

18 files changed, 45 insertions, 381 deletions

diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index 1cac545fd3e0..a1ae39955f48 100644
--- a/sys-kernel/usermode-sources/ChangeLog
+++ b/sys-kernel/usermode-sources/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/usermode-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.34 2004/05/30 23:53:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.35 2004/06/03 22:20:09 plasmaroo Exp $
+
+*usermode-sources-2.4.26 (03 Jun 2004)
+
+  03 Jun 2004; <plasmaroo@gentoo.org> -usermode-sources-2.4.20-r2.ebuild,
+  -usermode-sources-2.4.21-r1.ebuild, -usermode-sources-2.4.22-r2.ebuild,
+  -usermode-sources-2.4.23-r1.ebuild, -usermode-sources-2.4.23-r2.ebuild,
+  +usermode-sources-2.4.26.ebuild, -usermode-sources-2.6.1-r1.ebuild,
+  -usermode-sources-2.6.3-r2.ebuild, +usermode-sources-2.6.6.ebuild,
+  +files/usermode-sources-2.4.26.CAN-2004-0394.patch:
+  Version bump; old versions removed due to security issues.
 
   31 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   usermode-sources-2.4.23-r1.ebuild, usermode-sources-2.4.23-r2.ebuild,
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.20-r2 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.20-r2
deleted file mode 100644
index 49a3f84e6b8a..000000000000
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.20-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 b1de50959d189c716ecd9855aca42cc0 uml-patch-2.4.20-1.bz2 173948
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.21-r1 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.21-r1
deleted file mode 100644
index 4b058ccb1871..000000000000
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.21-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
-MD5 1b100f4ccebf08ac431f53c3e407d485 uml-patch-2.4.21-1.bz2 181003
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.22-r2 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.22-r2
deleted file mode 100644
index 69c15fc88a04..000000000000
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.22-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
-MD5 555e7ff2f04bdeb49e24371b7f246709 uml-patch-2.4.22-5.bz2 184079
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.23-r1 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.23-r1
deleted file mode 100644
index 247c9d35a604..000000000000
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.23-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 642af5ab5e1fc63685fde85e9ae601e4 linux-2.4.23.tar.bz2 29832609
-MD5 19e5bffd9627aa234e15879a2d35147e uml-patch-2.4.23-1.bz2 189174
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.23-r2 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.23-r2
deleted file mode 100644
index 3e9480d6c7c4..000000000000
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.23-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 642af5ab5e1fc63685fde85e9ae601e4 linux-2.4.23.tar.bz2 29832609
-MD5 c286b6b4d32defe49c2cff85d7b212cc uml-patch-2.4.23-2.bz2 189513
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26
new file mode 100644
index 000000000000..97aed2c6379a
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26
@@ -0,0 +1,2 @@
+MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
+MD5 e4fbac714d28cd9bcc877dfcfd5bfe57 uml-patch-2.4.26-1.bz2 204818
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.1-r1 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.1-r1
deleted file mode 100644
index d9fd020ff9af..000000000000
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fa82d1e4be518261b2eeb78eabf9cca7 linux-2.6.1.tar.bz2 33240033
-MD5 2252eb7106624fe5fc9e77159d369c78 uml-patch-2.6.1-1.bz2 96069
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.3-r2 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.3-r2
deleted file mode 100644
index 4648c8799288..000000000000
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.3-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6063a7e424355ec52e0cb559fb99034d linux-2.6.3.tar.bz2 34271622
-MD5 c3f42dd778e100b82f2012eb837ee50a uml-patch-2.6.3-rc2-1.bz2 98835
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6
new file mode 100644
index 000000000000..97a9c9ea6e86
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6
@@ -0,0 +1,2 @@
+MD5 5218790bc3db41e77a7422969639a9ad linux-2.6.6.tar.bz2 34896138
+MD5 ac6131657b587aba2d306d3708142ec6 uml-patch-2.6.6-1.bz2 104357
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.4.26.CAN-2004-0394.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.4.26.CAN-2004-0394.patch
new file mode 100644
index 000000000000..273f1a52046f
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.4.26.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/usermode-sources/usermode-sources-2.4.20-r2.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.20-r2.ebuild
deleted file mode 100644
index ceaf776f0142..000000000000
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.20-r2.ebuild
+++ /dev/null
@@ -1,72 +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/usermode-sources/usermode-sources-2.4.20-r2.ebuild,v 1.3 2004/04/27 22:09:39 agriffis Exp $
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel eutils
-
-# we use this next variable to avoid duplicating stuff on cvs
-GFILESDIR=${PORTDIR}/sys-kernel/linux-sources/files
-OKV=${PV}
-KV=${PVR}
-UML_PATCH="uml-patch-${PV}-`echo ${PR}|sed -e 's:r\([0-9]\+\):\1:'`"
-S=${WORKDIR}/linux-${KV}
-EXTRAVERSION=${PR}
-
-# What's in this kernel?
-
-# INCLUDED:
-#	User mode linux patch
-#	http://user-mode-linux.sourceforge.net
-#	UML clashes with the current Gentoo patch, so I've ignored it for now.
-
-DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2"
-HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="x86 -ppc -sparc -alpha"
-
-# 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 dev-lang/perl"
-RDEPEND=">=sys-libs/ncurses-5.2"
-
-[ -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}
-	bzcat ${DISTDIR}/${UML_PATCH}.bz2 | patch -d ${S} -p1
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch 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!"
-	kernel_universal_unpack
-
-	echo "Preparing for compilation..."
-
-	# Fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R 0:0 *
-	chmod -R a+r-w+X,u+w *
-
-}
-
-src_compile() {
-	ewarn "Nothing to compile.  That's up to the user"
-}
-
-src_install() {
-		dodir /usr/src/uml
-		cd ${S}
-		echo ">>> Copying sources..."
-		mv ${WORKDIR}/* ${D}/usr/src/uml
-		cd ${D}/usr/src/uml
-		ln -sf linux-${KV} linux
-}
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.21-r1.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.21-r1.ebuild
deleted file mode 100644
index 8975098f3b94..000000000000
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.21-r1.ebuild
+++ /dev/null
@@ -1,70 +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/usermode-sources/usermode-sources-2.4.21-r1.ebuild,v 1.4 2004/04/27 22:09:39 agriffis Exp $
-
-ETYPE="sources"
-inherit kernel eutils
-
-UML_VERSION="${PV}"
-UML_PATCH="uml-patch-2.4.21-1"
-
-S=${WORKDIR}/linux-${PV}
-
-# we patch against vanilla-sources only
-
-DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2
-mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2"
-HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
-LICENSE="GPL-2"
-SLOT="${UML_VERSION}"
-KEYWORDS="x86 -ppc -sparc -alpha"
-EXTRAVERSION=${PR}
-
-#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 dev-lang/perl"
-RDEPEND=">=sys-libs/ncurses-5.2"
-
-src_unpack() {
-
-	cd ${WORKDIR}
-	unpack linux-${PV}.tar.bz2
-	if [ "${PV}" != "${UML_VERSION}" ]; then
-		mv linux-${PV} linux-${UML_VERSION} || die
-	fi
-	cd ${S}
-	bzcat ${DISTDIR}/${UML_PATCH}.bz2 | patch -p1
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!"
-	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
-	epatch ${FILESDIR}/${PN}-2.4.20.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
-	kernel_universal_unpack
-
-	echo "Preparing for compilation..."
-
-	# Fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R 0:0 *
-	chmod -R a+r-w+X,u+w *
-
-}
-
-src_compile() {
-	ewarn "Nothing to compile.  That's up to the user"
-}
-
-src_install() {
-		mkdir -p ${D}/usr/src/uml
-		cd ${WORKDIR}
-		mv linux-${UML_VERSION} ${D}/usr/src/uml/
-}
-
-pkg_postinst() {
-	# create linux symlink
-	if [ ! -e ${ROOT}usr/src/uml/linux ]
-	then
-		rm -f ${ROOT}usr/src/uml/linux
-		ln -sf ${ROOT}usr/src/uml/linux-${PV} ${ROOT}usr/src/uml/linux
-	fi
-}
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.22-r2.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.22-r2.ebuild
deleted file mode 100644
index 30dc1c9657eb..000000000000
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.22-r2.ebuild
+++ /dev/null
@@ -1,70 +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/usermode-sources/usermode-sources-2.4.22-r2.ebuild,v 1.2 2004/04/27 22:09:39 agriffis Exp $
-
-ETYPE="sources"
-inherit kernel eutils
-
-UML_VERSION="${PV}"
-UML_PATCH="uml-patch-2.4.22-5"
-
-S=${WORKDIR}/linux-${PV}
-
-# we patch against vanilla-sources only
-
-DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2
-mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2"
-HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
-LICENSE="GPL-2"
-SLOT="${UML_VERSION}"
-KEYWORDS="x86 -ppc -sparc -alpha"
-EXTRAVERSION=${PR}
-
-#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 dev-lang/perl"
-RDEPEND=">=sys-libs/ncurses-5.2"
-
-src_unpack() {
-
-	cd ${WORKDIR}
-	unpack linux-${PV}.tar.bz2
-	if [ "${PV}" != "${UML_VERSION}" ]; then
-		mv linux-${PV} linux-${UML_VERSION} || die
-	fi
-	cd ${S}
-	bzcat ${DISTDIR}/${UML_PATCH}.bz2 | patch -p1
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch 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!"
-	kernel_universal_unpack
-
-	echo "Preparing for compilation..."
-
-	# Fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R 0:0 *
-	chmod -R a+r-w+X,u+w *
-
-}
-
-src_compile() {
-	ewarn "Nothing to compile.  That's up to the user"
-}
-
-src_install() {
-		mkdir -p ${D}/usr/src/uml
-		cd ${WORKDIR}
-		mv linux-${UML_VERSION} ${D}/usr/src/uml/
-}
-
-pkg_postinst() {
-	# create linux symlink
-	if [ ! -e ${ROOT}usr/src/uml/linux ]
-	then
-		rm -f ${ROOT}usr/src/uml/linux
-		ln -sf ${ROOT}usr/src/uml/linux-${PV} ${ROOT}usr/src/uml/linux
-	fi
-}
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.23-r1.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.23-r1.ebuild
deleted file mode 100644
index cbbb880a381c..000000000000
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.23-r1.ebuild
+++ /dev/null
@@ -1,64 +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/usermode-sources/usermode-sources-2.4.23-r1.ebuild,v 1.3 2004/05/30 23:53:42 pvdabeel Exp $
-
-ETYPE="sources"
-inherit kernel eutils
-
-UML_PATCH="uml-patch-2.4.23-1"
-
-# we patch against vanilla-sources only
-DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2
-mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2"
-HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="x86 -ppc"
-EXTRAVERSION=${PR}
-
-# 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 dev-lang/perl"
-RDEPEND=">=sys-libs/ncurses-5.2"
-
-S=${WORKDIR}/linux-${PV}
-
-src_unpack() {
-	# unpack vanilla sources
-	cd ${WORKDIR}
-	unpack linux-${PV}.tar.bz2
-
-	# apply usermode patch
-	cd ${S}
-	epatch ${DISTDIR}/${UML_PATCH}.bz2
-
-	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
-	epatch ${FILESDIR}/${PN}-2.4.22.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
-
-	kernel_universal_unpack
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	mkdir -p ${D}/usr/src/uml
-
-	# fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R root:root *
-	chmod -R a+r-w+X,u+w *
-
-	mv linux-${PV} ${D}/usr/src/uml/
-}
-
-pkg_postinst() {
-	# create linux symlink
-	if [ ! -e ${ROOT}usr/src/uml/linux ]
-	then
-		rm -f ${ROOT}usr/src/uml/linux
-		ln -sf ${ROOT}usr/src/uml/linux-${PV} ${ROOT}usr/src/uml/linux
-	fi
-}
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.23-r2.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.26.ebuild
index 69b7d3bac617..5972ba53c9a7 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.23-r2.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.4.26.ebuild
@@ -1,64 +1,55 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.23-r2.ebuild,v 1.3 2004/05/30 23:53:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.26.ebuild,v 1.1 2004/06/03 22:20:09 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel eutils
 
-UML_PATCH="uml-patch-2.4.23-2"
+UML_PATCH="uml-patch-2.4.26-1"
 
-# we patch against vanilla-sources only
 DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2
-mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2"
+	mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2"
 HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
 LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="x86 -ppc"
-EXTRAVERSION=${PR}
+SLOT="${PV}-${PR}"
+KEYWORDS="~x86 -ppc"
+EXTRAVERSION="-uml1"
+RESTRICT="nomirror"
 
 # 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 dev-lang/perl"
 RDEPEND=">=sys-libs/ncurses-5.2"
 
-S=${WORKDIR}/linux-${PV}
+S=${WORKDIR}/linux-${PV}${EXTRAVERSION}
 
 src_unpack() {
-	# unpack vanilla sources
 	cd ${WORKDIR}
 	unpack linux-${PV}.tar.bz2
 
-	# apply usermode patch
-	cd ${S}
+	mv linux-${PV} ${S} && cd ${S}
 	epatch ${DISTDIR}/${UML_PATCH}.bz2
-
-	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
-	epatch ${FILESDIR}/${PN}-2.4.22.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
-
+	epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
 	kernel_universal_unpack
 }
 
-src_compile() {
-	true
-}
-
 src_install() {
 	mkdir -p ${D}/usr/src/uml
 
-	# fix silly permissions in tarball
+	# Fix permissions
 	cd ${WORKDIR}
 	chown -R root:root *
 	chmod -R a+r-w+X,u+w *
 
-	mv linux-${PV} ${D}/usr/src/uml/
+	mv linux-${PV}${EXTRAVERSION} ${D}/usr/src/uml/
 }
 
 pkg_postinst() {
-	# create linux symlink
+	# Create linux symlink
 	if [ ! -e ${ROOT}usr/src/uml/linux ]
 	then
 		rm -f ${ROOT}usr/src/uml/linux
-		ln -sf ${ROOT}usr/src/uml/linux-${PV} ${ROOT}usr/src/uml/linux
+		ln -sf ${ROOT}usr/src/uml/linux-${PV}${EXTRAVERSION} ${ROOT}usr/src/uml/linux
 	fi
 }
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.1-r1.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.1-r1.ebuild
deleted file mode 100644
index ecaad0d343a7..000000000000
--- a/sys-kernel/usermode-sources/usermode-sources-2.6.1-r1.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/usermode-sources/usermode-sources-2.6.1-r1.ebuild,v 1.4 2004/05/30 23:53:42 pvdabeel Exp $
-
-K_NOUSENAME="yes"
-ETYPE="sources"
-inherit kernel-2 eutils
-
-UML_PATCH="uml-patch-2.6.1-1"
-
-# we patch against vanilla-sources only
-DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${PV}.tar.bz2
-mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2"
-HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="x86 -ppc"
-EXTRAVERSION=${PR}
-
-# 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 dev-lang/perl"
-RDEPEND=">=sys-libs/ncurses-5.2"
-
-S=${WORKDIR}/linux-${PV}
-
-src_unpack() {
-	# unpack vanilla sources
-	cd ${WORKDIR}
-	unpack linux-${PV}.tar.bz2
-
-	# apply usermode patch
-	cd ${S}
-	epatch ${DISTDIR}/${UML_PATCH}.bz2
-
-	universal_unpack
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	mkdir -p ${D}/usr/src/uml
-
-	# fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R root:root *
-	chmod -R a+r-w+X,u+w *
-
-	mv linux-${PV} ${D}/usr/src/uml/
-}
-
-pkg_postinst() {
-	# create linux symlink
-	if [ ! -e ${ROOT}usr/src/uml/linux ]
-	then
-		rm -f ${ROOT}usr/src/uml/linux
-		ln -sf ${ROOT}usr/src/uml/linux-${PV} ${ROOT}usr/src/uml/linux
-	fi
-}
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.3-r2.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.6.ebuild
index eec99aa707ca..9d3ade8e1079 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.6.3-r2.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.6.6.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.3-r2.ebuild,v 1.2 2004/05/30 23:53:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.6.ebuild,v 1.1 2004/06/03 22:20:09 plasmaroo Exp $
 
 K_NOUSENAME="yes"
 ETYPE="sources"
 
 inherit kernel-2
-UML_PATCH="uml-patch-2.6.3-rc2-1"
+UML_PATCH="uml-patch-2.6.6-1"
 OKV="${PV}"
-EXTRAVERSION="-${UML_PATCH//-*-/}-${PR}"
+EXTRAVERSION="-${UML_PATCH//-*-/}"
 KV="${OKV}${EXTRAVERSION}"
 S="${WORKDIR}/linux-${KV}"
 IUSE=""
 
-UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2 ${FILESDIR}/${P}.CAN-2004-0109.patch"
+UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2"
 
 DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${PV}.tar.bz2
 	mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2"
 HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
 SLOT="${KV}"
-KEYWORDS="x86 -ppc"
+KEYWORDS="~x86 ~ppc"
 RESTRICT="nomirror"