version bump, closing #72452

8 files changed, 97 insertions, 95 deletions

diff --git a/sys-kernel/openmosix-sources/ChangeLog b/sys-kernel/openmosix-sources/ChangeLog
index 23412dab95ee..ce3e2d0057f7 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.73 2004/12/02 19:55:44 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.74 2004/12/04 16:41:12 voxus Exp $
+
+*openmosix-sources-2.4.28 (04 Dec 2004)
+*openmosix-sources-2.4.24-r10 (04 Dec 2004)
+
+  04 Dec 2004; Konstantin Arkhipov <voxus@gentoo.org>:
+  +files/openmosix-sources-binfmt_aout.patch,
+  +openmosix-sources-2.4.28.ebuild,
+  -openmosix-sources-2.4.24-r9.ebuild:
+  Version bump for migshm patchset, preparing to drop old .24 sources.
 
 *openmosix-sources-2.4.24-r10 (02 Dec 2004)
 *openmosix-sources-2.4.27-r7 (02 Dec 2004)
diff --git a/sys-kernel/openmosix-sources/Manifest b/sys-kernel/openmosix-sources/Manifest
index e26f0b9aafe6..53711c06ab30 100644
--- a/sys-kernel/openmosix-sources/Manifest
+++ b/sys-kernel/openmosix-sources/Manifest
@@ -1,16 +1,16 @@
-MD5 9082dc5b98893e38cbdc1680ddb6be67 openmosix-sources-2.4.24-r9.ebuild 3014
+MD5 e726b0d0514b23eae0ede7e924900d26 openmosix-sources-2.4.28.ebuild 1541
 MD5 59ba421e07d0be23c9e807d42f1a950e openmosix-sources-2.4.27-r7.ebuild 1978
 MD5 3d1cb152f1308aaa635b857da565bcd1 ChangeLog 14348
 MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
-MD5 0f84a67ae1f039990bda41e8d6c82e20 openmosix-sources-2.4.24-r10.ebuild 3093
+MD5 025d3f983e47b0c17cb4681e07210431 openmosix-sources-2.4.24-r10.ebuild 3268
 MD5 de75cfa969ed092578d9ddda6c5be334 files/openmosix-sources.CAN-2004-0181.patch 1233
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/openmosix-sources.CAN-2003-0985.patch 414
 MD5 b0a1f80aff51d6601e8924329023b241 files/openmosix-sources-af_unix.patch 515
+MD5 b3ffecbe6048b65dbd43469f6990a42e files/openmosix-sources-binfmt_aout.patch 1950
 MD5 d1ccc2047be533c992f67270a150a210 files/cmdline-proc-fix.patch 388
 MD5 147fec50180ad91b6260fc7201dcb90f files/openmosix-sources.CAN-2004-0010.patch 6050
 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-r9 359
 MD5 42009ab1ca8da78b30d2fcd15150f202 files/digest-openmosix-sources-2.4.27-r7 296
 MD5 21f3a4f186017d925067335e24db36a1 files/openmosix-sources.CAN-2004-0109.patch 1877
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/openmosix-sources.CAN-2004-0178.patch 424
@@ -23,3 +23,4 @@ MD5 bf2b609e8cab6460d220b1267db09826 files/openmosix-sources.CAN-2004-0001.patch
 MD5 0f66013f643c79c97fda489618a4e2fd files/openmosix-sources.CAN-2004-0535.patch 476
 MD5 9971231cef0a944990e47a3c1e4b717c files/openmosix-sources-2.4.24-smbfs.patch 2790
 MD5 dc18e982f8149588a291956481885a8c files/openmosix-sources.CAN-2004-0495.patch 17549
+MD5 b0feb704b9c5badeead540ae1d80ae84 files/digest-openmosix-sources-2.4.28 296
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r9 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r9
deleted file mode 100644
index e3b64d95ad6f..000000000000
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r9
+++ /dev/null
@@ -1,5 +0,0 @@
-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-r7 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.28
index b667a1620951..f272a34f15c7 100644
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.27-r7
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.28
@@ -1,4 +1,4 @@
-MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453
-MD5 588ede7cb67cca98b66a9e17d120b8b0 patch-2.4.27-om-migshm-20040914.bz2 250274
+MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
+MD5 be8ccd30612a6f4e6e516d31e56c7048 patch-2.4.28-om-migshm-20041204.bz2 248906
 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/files/openmosix-sources-binfmt_aout.patch b/sys-kernel/openmosix-sources/files/openmosix-sources-binfmt_aout.patch
new file mode 100644
index 000000000000..03068eb58c1e
--- /dev/null
+++ b/sys-kernel/openmosix-sources/files/openmosix-sources-binfmt_aout.patch
@@ -0,0 +1,67 @@
+diff -urNa fs.orig/binfmt_aout.c fs/binfmt_aout.c
+--- fs.orig/binfmt_aout.c	2004-12-04 18:13:19.000000000 +0300
++++ fs/binfmt_aout.c	2004-12-04 18:43:46.804200744 +0300
+@@ -43,13 +43,18 @@
+ 	NULL, THIS_MODULE, load_aout_binary, load_aout_library, aout_core_dump, PAGE_SIZE
+ };
+ 
+-static void set_brk(unsigned long start, unsigned long end)
++#define BAD_ADDR(x)	((unsigned long)(x) >= TASK_SIZE)
++
++static int set_brk(unsigned long start, unsigned long end)
+ {
+ 	start = PAGE_ALIGN(start);
+ 	end = PAGE_ALIGN(end);
+-	if (end <= start)
+-		return;
+-	do_brk(start, end - start);
++	if (end > start) {
++		unsigned long addr = do_brk(start, end - start);
++		if (BAD_ADDR(addr))
++			return addr;
++	}
++	return 0;
+ }
+ 
+ /*
+@@ -452,9 +457,14 @@
+ 
+ #ifdef CONFIG_MOSIX
+ 	/* if DEPUTY, the REMOTE already did "set_brk" in aout_remote_init_mm */
+-	if(!(current->mosix.dflags & DDEPUTY))
++	if(!(current->mosix.dflags & DDEPUTY)) {
+ #endif /* CONFIG_MOSIX */
+-	set_brk(current->mm->start_brk, current->mm->brk);
++		retval = set_brk(current->mm->start_brk, current->mm->brk);
++		if (retval < 0) {
++			send_sig(SIGKILL, current, 0);
++			return retval;
++		}
++	}
+ 
+ #ifdef CONFIG_MOSIX
+ 	if(current->mosix.dflags & DDEPUTY)
+diff -urNa fs.orig/exec.c fs/exec.c
+--- fs.orig/exec.c	2004-12-04 18:13:19.000000000 +0300
++++ fs/exec.c	2004-12-04 18:41:51.679702328 +0300
+@@ -357,6 +357,7 @@
+ 
+ 	down_write(&current->mm->mmap_sem);
+ 	{
++		struct vm_area_struct *vma;
+ 		mpnt->vm_mm = current->mm;
+ 		mpnt->vm_start = PAGE_MASK & (unsigned long) bprm->p;
+ 		mpnt->vm_end = STACK_TOP;
+@@ -366,6 +367,12 @@
+ 		mpnt->vm_pgoff = 0;
+ 		mpnt->vm_file = NULL;
+ 		mpnt->vm_private_data = (void *) 0;
++		vma = find_vma(current->mm, mpnt->vm_start);
++		if (vma) {
++			up_write(&current->mm->mmap_sem);
++			kmem_cache_free(vm_area_cachep, mpnt);
++			return -ENOMEM;
++		}
+ 		insert_vm_struct(current->mm, mpnt);
+ 		current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
+ 	}
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r10.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r10.ebuild
index c7d586c05b0b..d2349d351794 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r10.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r10.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.24-r10.ebuild,v 1.1 2004/12/02 19:55:44 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r10.ebuild,v 1.2 2004/12/04 16:41:12 voxus Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -29,7 +29,7 @@ PROVIDE="virtual/linux-sources"
 HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/"
 LICENSE="GPL-2"
 SLOT="${KV}"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 IUSE=""
 
 src_unpack() {
@@ -64,6 +64,12 @@ src_unpack() {
 }
 
 pkg_postinst() {
+	einfo
+	ewarn "openmosix-sources <2.4.28 is obsoleted due to security reasons"
+	ewarn "and will be dropped from tree soon"
+	ewarn "please, take a look at >=openmosix-sources-2.4.28"
+	einfo
+
 	[ "$ETYPE" = "headers" ] && return
 	if [ ! -e ${ROOT}usr/src/linux ]
 	then
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r9.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r9.ebuild
deleted file mode 100644
index 4986f1f9d153..000000000000
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r9.ebuild
+++ /dev/null
@@ -1,72 +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-r9.ebuild,v 1.1 2004/11/27 16:33:57 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}/${PN}.CAN-2003-0985.patch || die "Security patch failed"
-	epatch ${FILESDIR}/${PN}.CAN-2004-0001.patch || die "Security patch failed"
-	epatch ${FILESDIR}/${PN}.CAN-2004-0010.patch || die "Security patch failed"
-	epatch ${FILESDIR}/${PN}.CAN-2004-0109.patch || die "Security patch failed"
-	epatch ${FILESDIR}/${PN}.CAN-2004-0177.patch || die "Security patch failed"
-	epatch ${FILESDIR}/${PN}.CAN-2004-0178.patch || die "Security patch failed"
-	epatch ${FILESDIR}/${PN}.CAN-2004-0181.patch || die "Security patch failed"
-	epatch ${FILESDIR}/${PN}.CAN-2004-0495.patch || die "Security patch failed"
-	epatch ${FILESDIR}/${PN}.CAN-2004-0497.patch || die "Security patch failed"
-	epatch ${FILESDIR}/${PN}.CAN-2004-0535.patch || die "Security patch failed"
-	epatch ${FILESDIR}/${PN}.CAN-2004-0685.patch || die "Security patch failed"
-	epatch ${FILESDIR}/cmdline-proc-fix.patch || die "Security patch failed"
-	epatch ${FILESDIR}/${PN}-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 ${FILESDIR}/${PN}.CAN-2004-0841-fix_ldisc_switch.patch || die "Antipatch failed."
-	epatch ${DISTDIR}/linux-2.4.27-nfs3-xdr.patch.bz2 || die "Failed to add nfs3-xdk patch"
-	epatch ${FILESDIR}/${PN}-${PV}-smbfs.patch || die "Failed to add smbfs 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-r7.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.28.ebuild
index 533f2de6fece..fe141387110f 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r7.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.28.ebuild
@@ -1,13 +1,13 @@
 # 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-r7.ebuild,v 1.1 2004/12/02 19:55:44 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.28.ebuild,v 1.1 2004/12/04 16:41:12 voxus Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
 inherit kernel eutils
 
-OKV="2.4.27"
-TIMESTAMP="20040914"
+OKV="2.4.28"
+TIMESTAMP="20041204"
 [ "${PR}" == "r0" ] && KV=${PV/_/-}-openmosix || KV=${PV/_/-}-openmosix-${PR}
 S=${WORKDIR}/linux-${KV}
 
@@ -25,10 +25,11 @@ SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 PROVIDE="virtual/linux-sources"
 HOMEPAGE="http://www.kernel.org/
 		http://www.openmosix.org/
+		http://openmosix.snarc.org/
 		http://dev.gentoo.org/~voxus/om/"
 LICENSE="GPL-2"
 SLOT="${KV}"
-KEYWORDS="-*"
+KEYWORDS="-* ~x86"
 IUSE=""
 
 src_unpack() {
@@ -36,11 +37,6 @@ 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 ${FILESDIR}/${PN}.CAN-2004-0841-fix_ldisc_switch.patch || die "fix for CAN-2004-0814 patch failed."
-	epatch ${DISTDIR}/linux-${PV}-nfs3-xdr.patch.bz2 || die "security patch for nfs3-xdk failed."
-	epatch ${FILESDIR}/${PN}-binfmt_elf.patch || die "Security patch for binfmt_elf failed."
-	epatch ${FILESDIR}/${PN}-${PV}-smbfs.patch || die "Security aptch for smbfs failed."
-	epatch ${FILESDIR}/${PN}-af_unix.patch || die "Security patch for af_unix failed."
+	epatch ${FILESDIR}/${PN}-binfmt_aout.patch || die "Security patch for binfmt_aout failed."
 	kernel_universal_unpack
 }