+ #56479 fix

- .20 'n' .21

9 files changed, 55 insertions, 381 deletions

diff --git a/sys-kernel/openmosix-sources/ChangeLog b/sys-kernel/openmosix-sources/ChangeLog
index f677a1eb9043..d9d4495ca100 100644
--- a/sys-kernel/openmosix-sources/ChangeLog
+++ b/sys-kernel/openmosix-sources/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for sys-kernel/openmosix-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.54 2004/07/06 13:46:37 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.55 2004/07/10 12:36:20 voxus Exp $
+
+*openmosix-sources-2.4.24-r1 (10 Jul 2004)
+
+  10 Jul 2004; Konstantin Arkhipov <voxus@gentoo.org>
+  +openmosix-sources-2.4.24-r1.ebuild,
+  -openmosix-sources-2.4.24.ebuild,
+  -openmosix-sources-2.4.21-r3.ebuild,
+  -openmosix-sources-2.4.20-r8.ebuild:
+  Security update (#56479).
+  Dropped outdated .20 and .21 sources, so migshm
+  exists now only in .26 series.
+
+*openmosix-sources-2.4.22-r11 (10 Jul 2004)
+
+  10 Jul 2004; Konstantin Arkhipov <voxus@gentoo.org>
+  +files/openmosix-sources.CAN-2004-0497.patch,
+  -openmosix-sources-2.4.22-r9.ebuild,
+  -openmosix-sources-2.4.22-r10.ebuild,
+  +openmosix-sources-2.4.22-r11.ebuild:
+  Security update, closing #56479 (for cluster herd).
 
 *openmosix-sources-2.4.22-r10 (06 Jul 2004)
 *openmosix-sources-2.4.24 (06 Jul 2004)
diff --git a/sys-kernel/openmosix-sources/Manifest b/sys-kernel/openmosix-sources/Manifest
index c0a947338e2d..660e0ea58f0d 100644
--- a/sys-kernel/openmosix-sources/Manifest
+++ b/sys-kernel/openmosix-sources/Manifest
@@ -2,13 +2,15 @@ MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
 MD5 5ea60b70de1b033e7becabd5ff7f6b9d openmosix-sources-2.4.20-r8.ebuild 2892
 MD5 7460a5485c7876b383732f0ea24fc86d openmosix-sources-2.4.21-r3.ebuild 3827
 MD5 2549dad8e643b5064a1ec54d4b3b842e openmosix-sources-2.4.26-r2.ebuild 1315
-MD5 65ff2c50e9d6cc87503273c7ede8f5ce ChangeLog 8156
-MD5 b3e6c49e521019d5760cb4e6b9481120 openmosix-sources-2.4.24.ebuild 1983
+MD5 fbc10a15fa36f364f6f380189e46a0c4 openmosix-sources-2.4.24.ebuild 1600
+MD5 d719270c38f6acd032baf555185c5da1 ChangeLog 8458
+MD5 eadd212be100ff3ba11815e819e27913 openmosix-sources-2.4.22-r11.ebuild 1962
 MD5 cc7ba57d573a76a12b9b094cd29e0223 openmosix-sources-2.4.22-r9.ebuild 1964
 MD5 9694770f2558acd2952c791c01722745 openmosix-sources-2.4.26-r1.ebuild 1322
 MD5 ef520fc883edac15db383dba3eb2ba73 openmosix-sources-2.4.26.ebuild 1322
-MD5 e91a596696bf4336a0f131dcf3bdb0c8 openmosix-sources-2.4.22-r10.ebuild 1962
-MD5 70f7eddaa49d8b87b5902e83218561f3 openmosix-sources-2.4.26-r3.ebuild 1315
+MD5 eadd212be100ff3ba11815e819e27913 openmosix-sources-2.4.22-r10.ebuild 1962
+MD5 b19b27d1ca7ee38f918397c1f254a59a openmosix-sources-2.4.26-r3.ebuild 1320
+MD5 fbc10a15fa36f364f6f380189e46a0c4 openmosix-sources-2.4.24-r1.ebuild 1600
 MD5 8ea0ebaf9ea87558abecdc1df6145dc5 files/digest-openmosix-sources-2.4.20-r8 133
 MD5 518e0cc8ace05bda990128ccf3d11c32 files/digest-openmosix-sources-2.4.21-r3 192
 MD5 bfe84c6c799577e10c7b09f0036b33c8 files/digest-openmosix-sources-2.4.26 140
@@ -36,3 +38,6 @@ MD5 0f66013f643c79c97fda489618a4e2fd files/openmosix-sources.CAN-2004-0535.patch
 MD5 199264742137ada4477d69f816dc5454 files/digest-openmosix-sources-2.4.22-r10 134
 MD5 236eba6ddb587f8354b7c4a549e8f374 files/digest-openmosix-sources-2.4.26-r3 147
 MD5 b67048d6f05fa573fda67bdf7a264d0d files/digest-openmosix-sources-2.4.24 136
+MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/openmosix-sources.CAN-2004-0497.patch 707
+MD5 199264742137ada4477d69f816dc5454 files/digest-openmosix-sources-2.4.22-r11 134
+MD5 b67048d6f05fa573fda67bdf7a264d0d files/digest-openmosix-sources-2.4.24-r1 136
diff --git a/sys-kernel/openmosix-sources/files/openmosix-sources.CAN-2004-0497.patch b/sys-kernel/openmosix-sources/files/openmosix-sources.CAN-2004-0497.patch
new file mode 100644
index 000000000000..9503e9efe57b
--- /dev/null
+++ b/sys-kernel/openmosix-sources/files/openmosix-sources.CAN-2004-0497.patch
@@ -0,0 +1,23 @@
+# ChangeSet
+#
+# fs/attr.c
+#   2004/07/03 18:28:30-03:00 marcelo@logos.cnet +1 -0
+#   Thomas Biege: Fix missing DAC check on sys_chown
+# 
+# fs/attr.c
+#   2004/07/03 19:28:29-03:00 marcelo@logos.cnet +1 -1
+#   Add missing bracket to inode_change_ok() fix
+# 
+diff -Nru a/fs/attr.c b.plasmaroo/fs/attr.c
+--- a/fs/attr.c	2004-07-08 17:05:20 -07:00
++++ b.plasmaroo/fs/attr.c	2004-07-08 17:05:20 -07:00
+@@ -35,7 +35,8 @@
+ 
+ 	/* Make sure caller can chgrp. */
+ 	if ((ia_valid & ATTR_GID) &&
+-	    (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid) &&
++	    (current->fsuid != inode->i_uid ||
++	    (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid)) &&
+ 	    !capable(CAP_CHOWN))
+ 		goto error;
+ 
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r8.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r8.ebuild
deleted file mode 100644
index 152239613965..000000000000
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r8.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r8.ebuild,v 1.4 2004/06/24 22:59:31 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
-[ "${PR}" == "r0" ] && KV=${OKV}-openmosix || KV=${OKV}-openmosix-${PR}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-
-# What's in this kernel?
-
-# INCLUDED:
-#   2.4.20, plus:
-#   2.4.20  openmosix-2.4.20-3
-
-DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 mirror://sourceforge/openmosix/openMosix-2.4.20-3.gz"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="-* x86"
-
-
-if [ $ETYPE = "sources" ] && ! 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
-
-[ -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}
-	cat ${DISTDIR}/openMosix-2.4.20-3.gz | gzip -d | patch -p1 || die
-
-	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}.munmap.patch || die "Failed to apply munmap patch!"
-	epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
-
-	# 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:' \
-	    -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
-		Makefile.orig > Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-#	rm Makefile~
-
-	#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 root:root *
-	chmod -R a+r-w+X,u+w *
-}
-
-src_install() {
-	dodir /usr/src
-	echo ">>> Copying sources..."
-	mv ${WORKDIR}/* ${D}/usr/src
-}
-
-pkg_postinst() {
-	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/openmosix-sources/openmosix-sources-2.4.21-r3.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.21-r3.ebuild
deleted file mode 100644
index 69ed8f77312a..000000000000
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.21-r3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.21-r3.ebuild,v 1.4 2004/06/24 22:59:31 agriffis Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-inherit eutils
-
-#we use this next variable to avoid duplicating stuff on cvs
-GFILESDIR=${PORTDIR}/sys-kernel/linux-sources/files
-OKV=2.4.21
-[ "${PR}" == "r0" ] && KV=${OKV}-openmosix || KV=${OKV}-openmosix-${PR}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-
-# What's in this kernel?
-
-# INCLUDED:
-#   2.4.21, plus:
-#   2.4.21  openmosix-2.4.21-1
-#	Experimental Migshm-1.4 threading/shared memory support patch
-
-DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 mirror://sourceforge/openmosix/openMosix-2.4.21-1.bz2 http://mcaserta.com/maask/Migshm-1.4.tgz"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="-* x86"
-
-
-if [ $ETYPE = "sources" ] && ! 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
-
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-	unpack Migshm-1.4.tgz
-	mv linux-${OKV} linux-${KV} || die
-	cd ${S}
-	cat ${DISTDIR}/openMosix-2.4.21-1.bz2 | bzip2 -d | patch -p1 || die
-
-	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!"
-	epatch ${FILESDIR}/${PN}-2.4.20.munmap.patch || die "Failed to apply munmap patch!"
-
-	# 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:' \
-	    -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
-		Makefile.orig > Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-#	rm Makefile~
-
-	# This is the experimental Migshm-1.4 patch...
-	cat ${WORKDIR}/Migshm-1.4/patch-Migshm-2.4.21.tgz | gzip -d | patch -p1 || die
-	rm -rf ${WORKDIR}/Migshm-1.4
-
-	#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 root:root *
-	chmod -R a+r-w+X,u+w *
-}
-
-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
-		echo ">>> Copying sources..."
-		mv ${WORKDIR}/* ${D}/usr/src
-	else
-		#linux-headers
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		rm -rf ${D}/usr/include/linux/modules
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm-i386/* ${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/openmosix-sources/openmosix-sources-2.4.22-r10.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-r10.ebuild
deleted file mode 100644
index 3cfab9f91bea..000000000000
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-r10.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-r10.ebuild,v 1.2 2004/07/06 13:46:37 voxus Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel eutils
-
-OKV="2.4.22"
-[ "${PR}" == "r0" ] && KV=${PV/_/-}-openmosix || KV=${PV/_/-}-openmosix-${PR}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
-BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-#   2.4.22, plus:
-#   2.4.22  openmosix-2.4.22-3
-#			various security patches
-
-DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-mirror://sourceforge/openmosix/openMosix-2.4.22-3.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="-* x86"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-	cd linux-${KV}
-	bzcat ${DISTDIR}/openMosix-2.4.22-3.bz2|patch -p1 || die "-openmosix patch failed"
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!"
-	epatch ${FILESDIR}/${PN}-2.4.20.munmap.patch || die "Failed to apply munmap patch!"
-	epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
-	epatch ${FILESDIR}/${P}.signal_fix.patch || die "Failed to patch signal.c vulnerability."
-	epatch ${FILESDIR}/${P}.pipe_bug.patch || die "Failed to patch pipe-bug."
-
-	for n in `ls ${FILESDIR}/${PN}.CAN-*`;
-	do
-		epatch $n || die "Failed to add " $n;
-	done
-
-	kernel_universal_unpack
-}
-
-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/openmosix-sources/openmosix-sources-2.4.22-r9.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-r9.ebuild
deleted file mode 100644
index 296acce80714..000000000000
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-r9.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-r9.ebuild,v 1.3 2004/06/24 22:59:31 agriffis Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel eutils
-
-OKV="2.4.22"
-[ "${PR}" == "r0" ] && KV=${PV/_/-}-openmosix || KV=${PV/_/-}-openmosix-${PR}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
-BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-#   2.4.22, plus:
-#   2.4.22  openmosix-2.4.22-3
-#			various security patches
-
-DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-mirror://sourceforge/openmosix/openMosix-2.4.22-3.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="-* x86"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-	cd linux-${KV}
-	bzcat ${DISTDIR}/openMosix-2.4.22-3.bz2|patch -p1 || die "-openmosix patch failed"
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!"
-	epatch ${FILESDIR}/${PN}-2.4.20.munmap.patch || die "Failed to apply munmap patch!"
-	epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
-	epatch ${FILESDIR}/${P}.signal_fix.patch || die "Failed to patch signal.c vulnerability."
-	epatch ${FILESDIR}/${P}.pipe_bug.patch || die "Failed to patch pipe-bug."
-
-	for n in `ls ${FILESDIR}/${PN}.CAN-*`;
-	do
-		epatch $n || die "Failed to add " $n;
-	done
-
-	kernel_universal_unpack
-}
-
-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/openmosix-sources/openmosix-sources-2.4.24.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24.ebuild
deleted file mode 100644
index ef3b8165501d..000000000000
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.24.ebuild,v 1.3 2004/07/06 13:46:37 voxus Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel eutils
-
-OKV="2.4.24"
-OMV="om1"
-[ "${PR}" == "r0" ] && KV=${PV/_/-}-openmosix || KV=${PV/_/-}-openmosix-${PR}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
-BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-#   2.4.22, plus:
-#   2.4.22  openmosix-2.4.22-3
-#			various security patches
-
-DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-mirror://sourceforge/openmosix/openMosix-${OKV}-${OMV}.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="-* ~x86"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-	cd linux-${KV}
-	bzcat ${DISTDIR}/openMosix-${OKV}-${OMV}.bz2|patch -p1 || die "-openmosix patch failed"
-
-	for n in `ls ${FILESDIR}/${PN}.CAN-* | egrep -v \(CAN-2004-0394\|CAN-2004-0427\)`;
-	do
-		epatch $n || die "Failed to add " $n;
-	done
-
-	kernel_universal_unpack
-}
-
-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/openmosix-sources/openmosix-sources-2.4.26-r3.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.26-r3.ebuild
index 8969a7258d89..f910446165b5 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.26-r3.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.26-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.26-r3.ebuild,v 1.1 2004/07/06 13:46:37 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.26-r3.ebuild,v 1.2 2004/07/10 12:36:20 voxus Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -25,7 +25,7 @@ PROVIDE="virtual/linux-sources"
 HOMEPAGE="http://www.kernel.org/ http://www.openmosix.org/ http://dev.gentoo.org/~voxus/om/"
 LICENSE="GPL-2"
 SLOT="${KV}"
-KEYWORDS="-*"
+KEYWORDS="-* ~x86"
 
 src_unpack() {
 	unpack linux-${OKV}.tar.bz2