* pipe-bug and #53969 fixed, masked for a while

4 files changed, 79 insertions, 1 deletions

diff --git a/sys-kernel/openmosix-sources/ChangeLog b/sys-kernel/openmosix-sources/ChangeLog
index fd633b254897..13782b53df3b 100644
--- a/sys-kernel/openmosix-sources/ChangeLog
+++ b/sys-kernel/openmosix-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/openmosix-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.46 2004/06/14 20:01:13 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.47 2004/06/16 13:01:48 voxus Exp $
+
+*openmosix-sources-2.4.22-r9 (16 Jun 2004)
+
+  16 Jun 2004; Konstantin Arkhipov <voxus@gentoo.org>
+  +files/openmosix-sources-2.4.22.pipe_bug.patch,
+  +openmosix-sources-2.4.22-r9.ebuild:
+  Pipe-bug and #53969 fixed.
 
 *openmosix-sources-2.4.22-r7 (14 Jun 2004)
 *openmosix-sources-2.4.22-r8 (14 Jun 2004)
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22-r9 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22-r9
new file mode 100644
index 000000000000..c3ed47ac2831
--- /dev/null
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22-r9
@@ -0,0 +1,2 @@
+MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
+MD5 68224fe261b75cdfd84882df2ae6bb12 openMosix-2.4.22-3.bz2 249126
diff --git a/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.22.pipe_bug.patch b/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.22.pipe_bug.patch
new file mode 100644
index 000000000000..4c7dc47fd0f8
--- /dev/null
+++ b/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.22.pipe_bug.patch
@@ -0,0 +1,11 @@
+--- mm/filemap.c	2004-06-14 23:15:29.000000000 +0400
++++ mm/filemap.c.fixed	2004-06-16 10:48:32.000000000 +0400
+@@ -3226,7 +3226,7 @@
+ 	err = written ? written : status;
+ out:
+ 
+-	up(&inode->i_sem);
++//	up(&inode->i_sem); <- it's a pipe-bug
+ 	return err;
+ fail_write:
+ 	status = -EFAULT;
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
new file mode 100644
index 000000000000..7667fb2371d7
--- /dev/null
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-r9.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/06/16 13:01:48 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
+}