security patches and .24 bump

7 files changed, 111 insertions, 17 deletions

diff --git a/sys-kernel/openmosix-sources/ChangeLog b/sys-kernel/openmosix-sources/ChangeLog
index ec26a34fd772..6476209cbc2b 100644
--- a/sys-kernel/openmosix-sources/ChangeLog
+++ b/sys-kernel/openmosix-sources/ChangeLog
@@ -1,6 +1,16 @@
 # 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.66 2004/09/14 16:26:28 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.67 2004/11/10 09:29:52 voxus Exp $
+
+*openmosix-sources-2.4.24-r5 (10 Nov 2004)
+*openmosix-sources-2.4.27-r3 (10 Nov 2004)
+
+  10 Nov 2004; Konstantin Arkhipov <voxus@gentoo.org>
+  -openmosix-sources-2.4.27-r2.ebuild,
+  +openmosix-sources-2.4.27-r3.ebuild,
+  +openmosix-sources-2.4.24-r5.ebuild:
+  Version bump for .24 and fixed security problems,
+  described in bug #68421 and #62524.
 
 *openmosix-sources-2.4.27-r2 (14 Sep 2004)
 
diff --git a/sys-kernel/openmosix-sources/Manifest b/sys-kernel/openmosix-sources/Manifest
index ba9aa87e5336..aa99ec676d52 100644
--- a/sys-kernel/openmosix-sources/Manifest
+++ b/sys-kernel/openmosix-sources/Manifest
@@ -1,18 +1,20 @@
-MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
+MD5 6009e0de9f1abb0d0697e92c20b853ad openmosix-sources-2.4.24-r5.ebuild 3026
+MD5 263d8fce28e2a70a82ab32a4fe7f4797 openmosix-sources-2.4.27-r3.ebuild 1732
 MD5 0af3f3e449f2c0dd116d14e1dfbd68c6 openmosix-sources-2.4.24-r4.ebuild 2705
-MD5 dc9d7440d3aef3b9d225400a1c90df73 openmosix-sources-2.4.27-r2.ebuild 1389
-MD5 a619e0936e9b8079187ce5304e4b9994 ChangeLog 11964
+MD5 4047cf450e6fa1115a14567dfa7fe3c7 ChangeLog 12313
+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
-MD5 bf2b609e8cab6460d220b1267db09826 files/openmosix-sources.CAN-2004-0001.patch 982
+MD5 d1ccc2047be533c992f67270a150a210 files/cmdline-proc-fix.patch 388
 MD5 147fec50180ad91b6260fc7201dcb90f files/openmosix-sources.CAN-2004-0010.patch 6050
-MD5 21f3a4f186017d925067335e24db36a1 files/openmosix-sources.CAN-2004-0109.patch 1877
+MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/openmosix-sources.CAN-2004-0497.patch 707
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/openmosix-sources.CAN-2004-0177.patch 384
+MD5 a9cd98f699342b66141ef055758ef329 files/digest-openmosix-sources-2.4.24-r4 212
+MD5 b5082064acd344757ff6362f7d60a881 files/digest-openmosix-sources-2.4.24-r5 359
+MD5 42009ab1ca8da78b30d2fcd15150f202 files/digest-openmosix-sources-2.4.27-r3 296
+MD5 21f3a4f186017d925067335e24db36a1 files/openmosix-sources.CAN-2004-0109.patch 1877
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/openmosix-sources.CAN-2004-0178.patch 424
-MD5 de75cfa969ed092578d9ddda6c5be334 files/openmosix-sources.CAN-2004-0181.patch 1233
-MD5 dc18e982f8149588a291956481885a8c files/openmosix-sources.CAN-2004-0495.patch 17549
-MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/openmosix-sources.CAN-2004-0497.patch 707
-MD5 0f66013f643c79c97fda489618a4e2fd files/openmosix-sources.CAN-2004-0535.patch 476
 MD5 60d25ff310fc6abfdce39ec9e47345af files/openmosix-sources.CAN-2004-0685.patch 2809
-MD5 d1ccc2047be533c992f67270a150a210 files/cmdline-proc-fix.patch 388
-MD5 a9cd98f699342b66141ef055758ef329 files/digest-openmosix-sources-2.4.24-r4 212
-MD5 1eeaf3d210e623d9bab77870805edd9d files/digest-openmosix-sources-2.4.27-r2 147
+MD5 bf2b609e8cab6460d220b1267db09826 files/openmosix-sources.CAN-2004-0001.patch 982
+MD5 0f66013f643c79c97fda489618a4e2fd files/openmosix-sources.CAN-2004-0535.patch 476
+MD5 dc18e982f8149588a291956481885a8c files/openmosix-sources.CAN-2004-0495.patch 17549
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r5 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r5
new file mode 100644
index 000000000000..e3b64d95ad6f
--- /dev/null
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r5
@@ -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-r2 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.27-r2
deleted file mode 100644
index e89302f11807..000000000000
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.27-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453
-MD5 588ede7cb67cca98b66a9e17d120b8b0 patch-2.4.27-om-migshm-20040914.bz2 250274
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-r3
new file mode 100644
index 000000000000..b667a1620951
--- /dev/null
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.27-r3
@@ -0,0 +1,4 @@
+MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453
+MD5 588ede7cb67cca98b66a9e17d120b8b0 patch-2.4.27-om-migshm-20040914.bz2 250274
+MD5 4b99df79dcc18b17eb41489b96ff9689 linux-2.4.27-CAN-2004-0814.patch 81529
+MD5 5bbbb2201b338ebb74f0bf650b639475 linux-2.4.27-nfs3-xdr.patch.bz2 746
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r5.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r5.ebuild
new file mode 100644
index 000000000000..43d050ed094b
--- /dev/null
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r5.ebuild
@@ -0,0 +1,71 @@
+# 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-r5.ebuild,v 1.1 2004/11/10 09:29:52 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}
+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
+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 ${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-r2.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r3.ebuild
index d484bcd54c0c..19efb6e18301 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r2.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-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.27-r2.ebuild,v 1.1 2004/09/14 16:26:28 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r3.ebuild,v 1.1 2004/11/10 09:29:52 voxus Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -21,7 +21,9 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel, including shared memory migration patch (migshm)"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-		http://dev.gentoo.org/~voxus/om/patch-${OKV}-om-migshm-${TIMESTAMP}.bz2"
+		http://dev.gentoo.org/~voxus/om/patch-${OKV}-om-migshm-${TIMESTAMP}.bz2
+		http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-2.4.27-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.openmosix.org/
@@ -36,5 +38,7 @@ src_unpack() {
 	mv linux-${OKV} linux-${KV} || die
 	cd linux-${KV}
 	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."
 	kernel_universal_unpack
 }