binfmt_elf fix, closing bug #70681

6 files changed, 92 insertions, 5 deletions

diff --git a/sys-kernel/openmosix-sources/ChangeLog b/sys-kernel/openmosix-sources/ChangeLog
index ae7ce2a06572..d57a9e1eb710 100644
--- a/sys-kernel/openmosix-sources/ChangeLog
+++ b/sys-kernel/openmosix-sources/ChangeLog
@@ -1,6 +1,15 @@
 # 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.68 2004/11/12 07:30:29 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.69 2004/11/15 16:52:16 voxus Exp $
+
+*openmosix-sources-2.4.24-r6 (15 Nov 2004)
+*openmosix-sources-2.4.27-r4 (15 Nov 2004)
+
+  15 Nov 2004; Konstantin Arkhipov <voxus@gentoo.org>:
+  -openmosix-sources-2.4.27-r3.ebuild,
+  +openmosix-sources-2.4.27-r4.ebuild,
+  +openmosix-sources-2.4.24-r6.ebuild:
+  Security patch for binfmt_elf, closing bug #70681.
 
   12 Nov 2004; Konstantin Arkhipov <voxus@gentoo.org>:
   -openmosix-sources-2.4.24-r4.ebuild:
diff --git a/sys-kernel/openmosix-sources/Manifest b/sys-kernel/openmosix-sources/Manifest
index 662ae4a8ffbe..38d3621d4ec0 100644
--- a/sys-kernel/openmosix-sources/Manifest
+++ b/sys-kernel/openmosix-sources/Manifest
@@ -1,6 +1,7 @@
+MD5 07c7631eaa875064c1a3b87e9f13f6f4 openmosix-sources-2.4.24-r6.ebuild 2990
+MD5 4525215d8c3ac219d706b183ade9620f openmosix-sources-2.4.27-r4.ebuild 1712
 MD5 4f7f2233424ab09566d8bb96c0ebd181 openmosix-sources-2.4.24-r5.ebuild 2903
-MD5 b37565827dcf1140f2dc9f3c87e0e533 openmosix-sources-2.4.27-r3.ebuild 1610
-MD5 917504c0e2e261a06c4ec1af60d216de ChangeLog 12511
+MD5 aa23dd5a8e850583a184c69e4c6febb4 ChangeLog 12824
 MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
 MD5 de75cfa969ed092578d9ddda6c5be334 files/openmosix-sources.CAN-2004-0181.patch 1233
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/openmosix-sources.CAN-2003-0985.patch 414
@@ -9,7 +10,8 @@ MD5 147fec50180ad91b6260fc7201dcb90f files/openmosix-sources.CAN-2004-0010.patch
 MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/openmosix-sources.CAN-2004-0497.patch 707
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/openmosix-sources.CAN-2004-0177.patch 384
 MD5 b5082064acd344757ff6362f7d60a881 files/digest-openmosix-sources-2.4.24-r5 359
-MD5 42009ab1ca8da78b30d2fcd15150f202 files/digest-openmosix-sources-2.4.27-r3 296
+MD5 b5082064acd344757ff6362f7d60a881 files/digest-openmosix-sources-2.4.24-r6 359
+MD5 42009ab1ca8da78b30d2fcd15150f202 files/digest-openmosix-sources-2.4.27-r4 296
 MD5 21f3a4f186017d925067335e24db36a1 files/openmosix-sources.CAN-2004-0109.patch 1877
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/openmosix-sources.CAN-2004-0178.patch 424
 MD5 60d25ff310fc6abfdce39ec9e47345af files/openmosix-sources.CAN-2004-0685.patch 2809
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r6 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r6
new file mode 100644
index 000000000000..e3b64d95ad6f
--- /dev/null
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r6
@@ -0,0 +1,5 @@
+MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
+MD5 1c9bc4f32a9fc793cb8f0a6d0f910cb7 openMosix-2.4.24-2.bz2 588330
+MD5 7e0e9f3d57bcc1b1bb7900ada383c129 linux-2.4.23-CAN-2004-0415.patch 89319
+MD5 d4c051e7c6062704be85192e25e2f5b2 linux-2.4.26-CAN-2004-0814.patch 81508
+MD5 5bbbb2201b338ebb74f0bf650b639475 linux-2.4.27-nfs3-xdr.patch.bz2 746
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.27-r3 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.27-r4
index b667a1620951..b667a1620951 100644
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.27-r3
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.27-r4
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r6.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r6.ebuild
new file mode 100644
index 000000000000..ab8f65957537
--- /dev/null
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r6.ebuild
@@ -0,0 +1,70 @@
+# 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-r6.ebuild,v 1.1 2004/11/15 16:52:16 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="2"
+[ "${PR}" == "r0" ] && KV=${PV/_/-}-openmosix || KV=${PV/_/-}-openmosix-${PR}
+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
+http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-2.4.23-CAN-2004-0415.patch
+http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-2.4.26-CAN-2004-0814.patch
+mirror://gentoo/linux-2.4.27-nfs3-xdr.patch.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"
+IUSE=""
+
+src_unpack() {
+	unpack linux-${OKV}.tar.bz2
+	mv linux-${OKV} linux-${KV} || die
+	cd linux-${KV}
+
+	epatch ${DISTDIR}/openMosix-${OKV}-${OMV}.bz2 || die "openMosix patch failed"
+
+	epatch ${FILESDIR}/openmosix-sources.CAN-2003-0985.patch || die "Security patch failed"
+	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0001.patch || die "Security patch failed"
+	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0010.patch || die "Security patch failed"
+	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0109.patch || die "Security patch failed"
+	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0177.patch || die "Security patch failed"
+	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0178.patch || die "Security patch failed"
+	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0181.patch || die "Security patch failed"
+	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0495.patch || die "Security patch failed"
+	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0497.patch || die "Security patch failed"
+	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0535.patch || die "Security patch failed"
+	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0685.patch || die "Security patch failed"
+	epatch ${FILESDIR}/cmdline-proc-fix.patch || die "Security patch failed"
+	epatch ${FILESDIR}/openmosix-sources-binfmt_elf.patch || die "Security patch failed"
+
+	epatch ${DISTDIR}/linux-2.4.23-CAN-2004-0415.patch || die "Failed to add CAN-2004-0415"
+	epatch ${DISTDIR}/linux-2.4.26-CAN-2004-0814.patch || die "Failed to add CAN-2004-0814"
+	epatch ${DISTDIR}/linux-2.4.27-nfs3-xdr.patch.bz2 || die "Failed to add nfs3-xdk patch"
+
+	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.27-r3.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r4.ebuild
index b8dd04380c95..9feb4282fe5f 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r3.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r4.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.27-r3.ebuild,v 1.2 2004/11/12 07:30:29 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r4.ebuild,v 1.1 2004/11/15 16:52:16 voxus Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -38,5 +38,6 @@ src_unpack() {
 	epatch ${DISTDIR}/patch-${OKV}-om-migshm-${TIMESTAMP}.bz2 || die "openMosix patch failed."
 	epatch ${DISTDIR}/linux-${PV}-CAN-2004-0814.patch || die "security patch for CAN-2004-0814 failed."
 	epatch ${DISTDIR}/linux-${PV}-nfs3-xdr.patch.bz2 || die "security patch for nfs3-xdk failed."
+	epatch ${FILESDIR}/openmosix-sources-binfmt_elf.patch || die "Security patch for binfmt_elf failed."
 	kernel_universal_unpack
 }