closing bug #73503

5 files changed, 30 insertions, 21 deletions

diff --git a/sys-kernel/openmosix-sources/ChangeLog b/sys-kernel/openmosix-sources/ChangeLog
index ce3e2d0057f7..230e2945f48d 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.74 2004/12/04 16:41:12 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.75 2004/12/06 11:36:36 voxus Exp $
+
+*openmosix-sources-2.4.28-r1 (06 Dec 2004)
+
+  06 Dec 2004; Konstantin Arkhipov <voxus@gentoo.org>:
+  files/openmosix-sources-binfmt_aout.patch,
+  -openmosix-sources-2.4.28.ebuild,
+  +openmosix-sources-2.4.28-r1.ebuild:
+  Updated aout patch and fixed compilation issue with binfmt_aout as module.
+  Closes bug #73503.
 
 *openmosix-sources-2.4.28 (04 Dec 2004)
 *openmosix-sources-2.4.24-r10 (04 Dec 2004)
diff --git a/sys-kernel/openmosix-sources/Manifest b/sys-kernel/openmosix-sources/Manifest
index 8ff02a8064e5..d55437d286ae 100644
--- a/sys-kernel/openmosix-sources/Manifest
+++ b/sys-kernel/openmosix-sources/Manifest
@@ -1,15 +1,16 @@
-MD5 5b34cf143967af2ce943dccf1382246c openmosix-sources-2.4.28.ebuild 1538
-MD5 2c5039eda8236235525fb3d2d086acec ChangeLog 14681
+MD5 5df0ac3ae740e43efbd5219b2b543ced openmosix-sources-2.4.28-r1.ebuild 1538
+MD5 34df0e73391dcc61289fd3e9a9670373 ChangeLog 14999
 MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
 MD5 8e97a3202eaacbd61909de7f1392068f openmosix-sources-2.4.24-r10.ebuild 3282
 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 eb003205dcff506c0ddfd4783862889a files/openmosix-sources-binfmt_aout.patch 1960
 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 e680b98c71a099e1dd8098b513c93068 files/digest-openmosix-sources-2.4.28-r1 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
@@ -21,4 +22,3 @@ 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.28 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.28-r1
index f272a34f15c7..555b76a5d690 100644
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.28
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.28-r1
@@ -1,4 +1,4 @@
 MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
-MD5 be8ccd30612a6f4e6e516d31e56c7048 patch-2.4.28-om-migshm-20041204.bz2 248906
+MD5 492b747a78cc16287c8214f6bd79a951 patch-2.4.28-om-migshm-20041206.bz2 249086
 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
index 03068eb58c1e..3ed7fc3494ea 100644
--- a/sys-kernel/openmosix-sources/files/openmosix-sources-binfmt_aout.patch
+++ b/sys-kernel/openmosix-sources/files/openmosix-sources-binfmt_aout.patch
@@ -1,13 +1,11 @@
-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 @@
+diff -uraN fs.orig/binfmt_aout.c fs/binfmt_aout.c
+--- fs.orig/binfmt_aout.c	2004-12-06 13:40:22.886079000 +0300
++++ fs/binfmt_aout.c	2004-12-06 13:52:16.506592320 +0300
+@@ -43,13 +43,16 @@
  	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);
@@ -17,33 +15,35 @@ diff -urNa fs.orig/binfmt_aout.c fs/binfmt_aout.c
 -	do_brk(start, end - start);
 +	if (end > start) {
 +		unsigned long addr = do_brk(start, end - start);
-+		if (BAD_ADDR(addr))
++		if ((unsigned long) addr >= TASK_SIZE)
 +			return addr;
 +	}
 +	return 0;
  }
  
  /*
-@@ -452,9 +457,14 @@
+@@ -452,9 +455,16 @@
  
  #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);
++#endif /* CONFIG_MOSIX */
 +		retval = set_brk(current->mm->start_brk, current->mm->brk);
 +		if (retval < 0) {
 +			send_sig(SIGKILL, current, 0);
 +			return retval;
 +		}
++#ifdef CONFIG_MOSIX
 +	}
+ #endif /* CONFIG_MOSIX */
+-	set_brk(current->mm->start_brk, current->mm->brk);
  
  #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
+diff -uraN fs.orig/exec.c fs/exec.c
+--- fs.orig/exec.c	2004-12-06 13:40:22.912075000 +0300
++++ fs/exec.c	2004-12-06 13:50:08.776010320 +0300
 @@ -357,6 +357,7 @@
  
  	down_write(&current->mm->mmap_sem);
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.28.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r1.ebuild
index fe141387110f..9bd9d5243f40 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.28.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r1.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.28.ebuild,v 1.1 2004/12/04 16:41:12 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r1.ebuild,v 1.1 2004/12/06 11:36:36 voxus Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
 inherit kernel eutils
 
 OKV="2.4.28"
-TIMESTAMP="20041204"
+TIMESTAMP="20041206"
 [ "${PR}" == "r0" ] && KV=${PV/_/-}-openmosix || KV=${PV/_/-}-openmosix-${PR}
 S=${WORKDIR}/linux-${KV}