closing #70681

9 files changed, 43 insertions, 97 deletions

diff --git a/sys-kernel/openmosix-sources/ChangeLog b/sys-kernel/openmosix-sources/ChangeLog
index 5e560c1de18a..f4864f6cfbf6 100644
--- a/sys-kernel/openmosix-sources/ChangeLog
+++ b/sys-kernel/openmosix-sources/ChangeLog
@@ -1,6 +1,17 @@
 # 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.71 2004/11/25 14:59:37 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.72 2004/11/27 16:33:57 voxus Exp $
+
+*openmosix-sources-2.4.24-r9 (27 Nov 2004)
+*openmosix-sources-2.4.27-r6 (27 Nov 2004)
+
+  27 Nov 2004; Konstantin Arkhipov <voxus@gentoo.org>:
+  files/openmosix-sources-binfmt_elf.patch,
+  -openmosix-sources-2.4.24-r8.ebuild,
+  -openmosix-sources-2.4.27-r5.ebuild,
+  +openmosix-sources-2.4.24-r9.ebuild,
+  +openmosix-sources-2.4.27-r6.ebuild:
+  Updated binfmt_elf.patch, .24-r9 goes stable.
 
 *openmosix-sources-2.4.24-r8 (25 Nov 2004)
 *openmosix-sources-2.4.27-r5 (25 Nov 2004)
diff --git a/sys-kernel/openmosix-sources/Manifest b/sys-kernel/openmosix-sources/Manifest
index abaa71d91ea2..b08d68625916 100644
--- a/sys-kernel/openmosix-sources/Manifest
+++ b/sys-kernel/openmosix-sources/Manifest
@@ -1,6 +1,5 @@
-MD5 d1606f018e7e4c41cef1c26a860d1612 openmosix-sources-2.4.24-r8.ebuild 3015
-MD5 496d925424a1fa62617d6c740386e8b9 openmosix-sources-2.4.24-r7.ebuild 2935
-MD5 2d42be9afaa678c28581ce436200923f openmosix-sources-2.4.27-r5.ebuild 1852
+MD5 2d42be9afaa678c28581ce436200923f openmosix-sources-2.4.27-r6.ebuild 1852
+MD5 4df9fadc3e79e04dc17b7f8025d5cd25 openmosix-sources-2.4.24-r9.ebuild 3014
 MD5 a751e13610c65ca8ca41f0dd7d89483c ChangeLog 13606
 MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
 MD5 de75cfa969ed092578d9ddda6c5be334 files/openmosix-sources.CAN-2004-0181.patch 1233
@@ -9,14 +8,13 @@ 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-r7 359
-MD5 b5082064acd344757ff6362f7d60a881 files/digest-openmosix-sources-2.4.24-r8 359
-MD5 42009ab1ca8da78b30d2fcd15150f202 files/digest-openmosix-sources-2.4.27-r5 296
+MD5 b5082064acd344757ff6362f7d60a881 files/digest-openmosix-sources-2.4.24-r9 359
+MD5 42009ab1ca8da78b30d2fcd15150f202 files/digest-openmosix-sources-2.4.27-r6 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
 MD5 fa0b3a0117ce4a5701403bb7f1c5acdf files/openmosix-sources.CAN-2004-0841-fix_ldisc_switch.patch 878
-MD5 24c53f49954dab29cfc172d4a3ba1a31 files/openmosix-sources-binfmt_elf.patch 1928
+MD5 915e8d7a0618736caa44d96968015467 files/openmosix-sources-binfmt_elf.patch 2346
 MD5 1e1fe7bb98c80db4644f4b7fd7dd5d32 files/openmosix-sources-2.4.27-smbfs.patch 3434
 MD5 bf2b609e8cab6460d220b1267db09826 files/openmosix-sources.CAN-2004-0001.patch 982
 MD5 0f66013f643c79c97fda489618a4e2fd files/openmosix-sources.CAN-2004-0535.patch 476
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r8 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r8
deleted file mode 100644
index e3b64d95ad6f..000000000000
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r8
+++ /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.24-r7 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r9
index e3b64d95ad6f..e3b64d95ad6f 100644
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r7
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r9
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.27-r5 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.27-r6
index b667a1620951..b667a1620951 100644
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.27-r5
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.27-r6
diff --git a/sys-kernel/openmosix-sources/files/openmosix-sources-binfmt_elf.patch b/sys-kernel/openmosix-sources/files/openmosix-sources-binfmt_elf.patch
index 534e4c064a52..9f4f44ee78f5 100644
--- a/sys-kernel/openmosix-sources/files/openmosix-sources-binfmt_elf.patch
+++ b/sys-kernel/openmosix-sources/files/openmosix-sources-binfmt_elf.patch
@@ -1,6 +1,7 @@
---- linux-2.4.27/fs/binfmt_elf.c	2004-11-10 12:25:16 -08:00
-+++ linux-2.4.27-plasmaroo/fs/binfmt_elf.c	2004-11-10 12:25:16 -08:00
-@@ -335,9 +335,12 @@
+diff -ur linux-2.4.27/fs/binfmt_elf.c linux-2.4.27.plasmaroo/fs/binfmt_elf.c
+--- linux-2.4.27/fs/binfmt_elf.c	2004-04-14 14:05:40.000000000 +0100
++++ linux-2.4.27.plasmaroo/fs/binfmt_elf.c	2004-11-19 21:30:26.745410824 +0000
+@@ -299,9 +299,12 @@
  		goto out;
  
  	retval = kernel_read(interpreter,interp_elf_ex->e_phoff,(char *)elf_phdata,size);
@@ -15,7 +16,7 @@
  
  	eppnt = elf_phdata;
  	for (i=0; i<interp_elf_ex->e_phnum; i++, eppnt++) {
-@@ -532,8 +535,11 @@
+@@ -475,8 +478,11 @@
  		goto out;
  
  	retval = kernel_read(bprm->file, elf_ex.e_phoff, (char *) elf_phdata, size);
@@ -28,7 +29,17 @@
  		
  	files = current->files;		/* Refcounted so ok */
  	retval = unshare_files();
-@@ -580,8 +586,14 @@
+@@ -513,7 +519,8 @@
+ 			 */
+ 
+ 			retval = -ENOMEM;
+-			if (elf_ppnt->p_filesz > PATH_MAX)
++			if (elf_ppnt->p_filesz > PATH_MAX || 
++			    elf_ppnt->p_filesz == 0)
+ 				goto out_free_file;
+ 			elf_interpreter = (char *) kmalloc(elf_ppnt->p_filesz,
+ 							   GFP_KERNEL);
+@@ -523,8 +530,16 @@
  			retval = kernel_read(bprm->file, elf_ppnt->p_offset,
  					   elf_interpreter,
  					   elf_ppnt->p_filesz);
@@ -36,15 +47,17 @@
 +			if (retval != elf_ppnt->p_filesz) {
 +				if (retval >= 0)
 +					retval = -EIO;
- 				goto out_free_interp;
++				goto out_free_interp;
 +			}
 +			/* make sure path is NULL terminated */
-+			elf_interpreter[elf_ppnt->p_filesz - 1] = '\0';
++			retval = -EINVAL;
++			if (elf_interpreter[elf_ppnt->p_filesz - 1] != '\0')
+ 				goto out_free_interp;
 +
  			/* If the program interpreter is one of these two,
  			 * then assume an iBCS2 image. Otherwise assume
  			 * a native linux image.
-@@ -616,8 +628,11 @@
+@@ -543,8 +558,11 @@
  			if (IS_ERR(interpreter))
  				goto out_free_interp;
  			retval = kernel_read(interpreter, 0, bprm->buf, BINPRM_BUF_SIZE);
@@ -56,8 +69,8 @@
 +			}
  
  			/* Get the exec headers */
- 			loc->interp_ex = *((struct exec *) bprm->buf);
-@@ -776,8 +791,10 @@
+ 			interp_ex = *((struct exec *) bprm->buf);
+@@ -682,8 +700,10 @@
  		}
  
  		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, elf_prot, elf_flags);
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r7.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r7.ebuild
deleted file mode 100644
index 9c354d4bf2b9..000000000000
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r7.ebuild
+++ /dev/null
@@ -1,71 +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-r7.ebuild,v 1.1 2004/11/16 11:49:08 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"
-
-	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-r8.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r9.ebuild
index c2cdcf7afddb..4986f1f9d153 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r8.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r9.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-r8.ebuild,v 1.1 2004/11/25 14:59:37 voxus Exp $
+# $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"
@@ -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() {
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r5.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r6.ebuild
index cd662434d6bf..2f27229fe130 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r5.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r6.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-r5.ebuild,v 1.1 2004/11/25 14:59:37 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r6.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"