Updated the ebuild as the tarballed patches weren't being initially applied.

3 files changed, 38 insertions, 10 deletions

diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 65cfc37c05ff..8fa3cf1cbae8 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,5 +1,5 @@
 MD5 ffd484ead2329348e3122cd2e70dcc8c ChangeLog 14999
-MD5 9da78e0f4a3d91aa980660767169bbf9 gentoo-sources-2.4.19-r11.ebuild 2504
+MD5 3d8ad6e27089077c302b968b621aaa00 gentoo-sources-2.4.19-r11.ebuild 2502
 MD5 a3da87be5a8a003c8a741747ca12672f gentoo-sources-2.4.20-r12.ebuild 5440
 MD5 af17640381fe454755d0a54e5bf85473 gentoo-sources-2.4.22-r4.ebuild 1966
 MD5 9eaf2835f8242a58af89b897f1ee9438 metadata.xml 350
@@ -16,6 +16,7 @@ MD5 e77a93fdf26f06cf3ea5080b27211725 files/gentoo-sources-2.4.CAN-2003-0985.patc
 MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 13455
 MD5 180cbe4b3ff8f173552bca65b345beaa files/digest-gentoo-sources-2.4.22-r5 147
 MD5 174438d215b70cad5ffb00ca8123c062 files/gentoo-sources-2.4.munmap.patch 837
+MD5 032ff70c5895cc1a2dfbe2a58ebde1f7 files/gentoo-sources-2.4.19-munmap.patch 819
 MD5 21ebf0ddc4b8ec4013470c4d243cd03b files/gentoo-sources-2.4.20-munmap.patch 826
 MD5 2a73b1add24b1ae8364e7ca8e267fac1 files/digest-gentoo-sources-2.4.20-r12 146
 MD5 8bc44a4c2cec1ebcfb4a08b4cc28a162 files/digest-gentoo-sources-2.4.22-r4 147
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.19-munmap.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.19-munmap.patch
new file mode 100644
index 000000000000..d2cf4f4303f4
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.19-munmap.patch
@@ -0,0 +1,27 @@
+--- linux-2.4.20-openmosix-r8/mm/mremap.c~	2004-02-18 22:33:57.000000000 +0000
++++ linux-2.4.20-openmosix-r8/mm/mremap.c	2004-02-18 22:35:01.000000000 +0000
+@@ -266,7 +266,9 @@
+ 		if ((addr <= new_addr) && (addr+old_len) > new_addr)
+ 			goto out;
+ 
+-		do_munmap(current->mm, new_addr, new_len, 1);
++		ret = do_munmap(current->mm, new_addr, new_len, 1);
++		if (ret && new_len)
++			goto out;
+ 	}
+ 
+ 	/*
+@@ -274,9 +276,11 @@
+ 	 * the unnecessary pages..
+ 	 * do_munmap does all the needed commit accounting
+ 	 */
+-	ret = addr;
+ 	if (old_len >= new_len) {
+-		do_munmap(current->mm, addr+new_len, old_len - new_len, 1);
++		ret = do_munmap(current->mm, addr+new_len, old_len - new_len, 1);
++		if (ret && old_len != new_len)
++			goto out;
++		ret = addr;
+ 		if (!(flags & MREMAP_FIXED) || (new_addr == addr))
+ 			goto out;
+ 	}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r11.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r11.ebuild
index c52da94590ff..11f65803bd45 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r11.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r11.ebuild,v 1.1 2004/02/23 23:02:57 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r11.ebuild,v 1.2 2004/02/24 20:37:26 plasmaroo Exp $
 
 IUSE="build crypt xfs acpi4linux"
 
@@ -43,14 +43,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die
 
-	cd linux-${KV}
-	patch -p1 < ${FILESDIR}/lcall-DoS.patch || die "lcall-DoS patch failed"
-	patch -p1 < ${FILESDIR}/i810_drm.patch || die "i810_drm patch failed"
-	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to apply do_brk() patch!"
-	epatch ${FILESDIR}/${PN}-2.4.20-munmap.patch || die "Failed to apply munmap patch!"
-	cd ..
-
-	cd ${KV}
+	cd ${KV/11/10}
 	# Kill patches we aren't suppposed to use, don't worry about 
 	# failures, if they aren't there that is a good thing!
 
@@ -65,4 +58,11 @@ src_unpack() {
 	[ `use acpi4linux` ] || rm 70*
 
 	kernel_src_unpack
+
+	cd linux-${KV}
+	patch -p1 < ${FILESDIR}/lcall-DoS.patch || die "lcall-DoS patch failed"
+	patch -p1 < ${FILESDIR}/i810_drm.patch || die "i810_drm patch failed"
+	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to apply do_brk() patch!"
+	epatch ${FILESDIR}/${P}-munmap.patch || die "Failed to apply munmap patch!"
+	cd ..
 }