fix for do_munmap bug to up all soon to be dropped sources

7 files changed, 43 insertions, 10 deletions

diff --git a/sys-kernel/gentoo-dev-sources/ChangeLog b/sys-kernel/gentoo-dev-sources/ChangeLog
index fe02ebf37200..2acc14c5bfbf 100644
--- a/sys-kernel/gentoo-dev-sources/ChangeLog
+++ b/sys-kernel/gentoo-dev-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/gentoo-dev-sources
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.43 2004/02/18 18:09:35 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.44 2004/02/19 19:17:45 johnm Exp $
+
+  19 Feb 2004; John Mylchreest <johnm@gentoo.org>
+  gentoo-dev-sources-2.6.1-r1.ebuild, gentoo-dev-sources-2.6.2-r1.ebuild,
+  files/2.6-do_munmap.patch:
+  security bump for soon to be dropped sources.
 
 *gentoo-dev-sources-2.6.3 (18 Feb 2004)
 
diff --git a/sys-kernel/gentoo-dev-sources/Manifest b/sys-kernel/gentoo-dev-sources/Manifest
index ec05b7bb03bb..3752edb0d36a 100644
--- a/sys-kernel/gentoo-dev-sources/Manifest
+++ b/sys-kernel/gentoo-dev-sources/Manifest
@@ -1,8 +1,9 @@
-MD5 38e9dda07012a3c1c768a0bf72916966 gentoo-dev-sources-2.6.2-r1.ebuild 1352
-MD5 a1962ceb66a56f4c373e1470843d7492 gentoo-dev-sources-2.6.1-r1.ebuild 2213
+MD5 840196a1389d4fb848297d17fc7c3642 gentoo-dev-sources-2.6.1-r2.ebuild 2245
 MD5 a58fa89253a4e1466acfc38031d8374a gentoo-dev-sources-2.6.3.ebuild 1299
-MD5 6dde19e8b8519e2dfb79c995aa4627d5 ChangeLog 8897
+MD5 4d7ab9645def0c3aafd8a90ebe5789ed gentoo-dev-sources-2.6.2-r2.ebuild 1385
+MD5 e6d8ad99b87f1ba42e5e156a561024bc ChangeLog 9099
 MD5 67f88855f6ec6da22268bad74aa10597 metadata.xml 636
 MD5 6b9c1af35601dbf5977952f6d11748d6 files/digest-gentoo-dev-sources-2.6.3 138
-MD5 150fc6d514e8cb2b07a3a7b14b8d92ef files/digest-gentoo-dev-sources-2.6.1-r1 138
-MD5 209cbc1ec89b12bcf89b2e48ef8219a7 files/digest-gentoo-dev-sources-2.6.2-r1 139
+MD5 150fc6d514e8cb2b07a3a7b14b8d92ef files/digest-gentoo-dev-sources-2.6.1-r2 138
+MD5 209cbc1ec89b12bcf89b2e48ef8219a7 files/digest-gentoo-dev-sources-2.6.2-r2 139
+MD5 980949de52189c7d9c1d791b7f5cc27e files/2.6-do_munmap.patch 743
diff --git a/sys-kernel/gentoo-dev-sources/files/2.6-do_munmap.patch b/sys-kernel/gentoo-dev-sources/files/2.6-do_munmap.patch
new file mode 100644
index 000000000000..ea54965b0d43
--- /dev/null
+++ b/sys-kernel/gentoo-dev-sources/files/2.6-do_munmap.patch
@@ -0,0 +1,27 @@
+--- a/mm/mremap.c	Thu Feb 19 11:04:41 2004
++++ b/mm/mremap.c	Thu Feb 19 11:04:41 2004
+@@ -346,7 +346,9 @@
+ 		if ((addr <= new_addr) && (addr+old_len) > new_addr)
+ 			goto out;
+ 
+-		do_munmap(current->mm, new_addr, new_len);
++		ret = do_munmap(current->mm, new_addr, new_len);
++		if (ret)
++			goto out;
+ 	}
+ 
+ 	/*
+@@ -354,9 +356,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);
++		ret = do_munmap(current->mm, addr+new_len, old_len - new_len);
++		if (ret && old_len != new_len)
++			goto out;
++		ret = addr;
+ 		if (!(flags & MREMAP_FIXED) || (new_addr == addr))
+ 			goto out;
+ 		old_len = new_len;
diff --git a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1-r1 b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1-r2
index 278e229f9d2c..278e229f9d2c 100644
--- a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1-r1
+++ b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1-r2
diff --git a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.2-r1 b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.2-r2
index c5855e596d75..c5855e596d75 100644
--- a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.2-r1
+++ b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.2-r2
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r1.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r2.ebuild
index e4bb7e0f3d5e..c7c53c536b66 100644
--- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r1.ebuild
+++ b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r2.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-dev-sources/gentoo-dev-sources-2.6.1-r1.ebuild,v 1.4 2004/02/05 13:32:47 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r2.ebuild,v 1.1 2004/02/19 19:17:45 johnm Exp $
 
 # As this is the example source to use kernel-2.eclass then a very brief explanation is to go here
 #
@@ -22,7 +22,7 @@
 GPV=1.16
 GPV_SRC="mirror://gentoo/genpatches-2.6-${GPV}.tar.bz2"
 
-UNIPATCH_LIST="${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2"
+UNIPATCH_LIST="${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2 ${FILESDIR}/2.6-do_munmap.patch"
 UNIPATCH_DOCS="${WORKDIR}/patches/genpatches-${GPV}/README"
 
 ETYPE="sources"
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.2-r1.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.2-r2.ebuild
index e25563f11265..278efd8274c9 100644
--- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.2-r1.ebuild
+++ b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.2-r2.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-dev-sources/gentoo-dev-sources-2.6.2-r1.ebuild,v 1.1 2004/02/15 18:12:49 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.2-r2.ebuild,v 1.1 2004/02/19 19:17:45 johnm Exp $
 
 #version of gentoo patchset
 GPV=2.21
@@ -10,7 +10,7 @@ GPV_SRC="http://dev.gentoo.org/~johnm/files/genpatches-2.6-${GPV}.tar.bz2"
 RESTRICT="nomirror"
 KEYWORDS="amd64 x86"
 
-UNIPATCH_LIST="${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2"
+UNIPATCH_LIST="${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2  ${FILESDIR}/2.6-do_munmap.patch"
 UNIPATCH_DOCS="${WORKDIR}/patches/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}/README"
 
 ETYPE="sources"