fixup do_brk patch

4 files changed, 31 insertions, 27 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index 16a6b22ed01b..7cd3dc400de8 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.43 2003/12/02 21:49:05 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.44 2003/12/03 16:31:56 iggy Exp $
+
+  03 Dec 2003; Brian Jackson <iggy@gentoo.org>
+  gentoo-sources-2.4.20-r9.ebuild, files/do_brk_fix.patch:
+  fixup do_brk patch
 
 *gentoo-sources-2.4.22-r1 (02 Dec 2003)
 
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index d6edf936a26c..11d5fe620a05 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,34 +1,34 @@
-MD5 da0868db0538f8baebeef3629a13e52b ChangeLog 12016
+MD5 f44bfa5126842e2f7868d584c7f9e6ea gentoo-sources-2.4.19-r10.ebuild 2357
+MD5 48d4543d5b1affb9395a7ab655b72655 gentoo-sources-2.4.20-r9.ebuild 5593
 MD5 1af785c8a3f44b880753f316bb4970f3 gentoo-sources-2.4.22.ebuild 1911
+MD5 7288efba37e71ffde0785010a2d2433f gentoo-sources-2.4.20-r6.ebuild 4955
+MD5 32c2163cad1c7253c80be7b369602b92 gentoo-sources-2.4.20-r8.ebuild 5557
+MD5 688100a8740a8219b8cb91cb4b235abb gentoo-sources-2.4.20-r5.ebuild 4802
 MD5 e78c1e83b00ba40b7000d7cf9fdd565c gentoo-sources-2.4.22-r1.ebuild 1915
+MD5 0f4a6349ebe9186740b6f85ea42e9dad ChangeLog 12139
 MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290
-MD5 32c2163cad1c7253c80be7b369602b92 gentoo-sources-2.4.20-r8.ebuild 5557
-MD5 f44bfa5126842e2f7868d584c7f9e6ea gentoo-sources-2.4.19-r10.ebuild 2357
 MD5 e762158a2758ae895aa519f6d3ccda00 gentoo-sources-2.4.20-r7.ebuild 5377
-MD5 688100a8740a8219b8cb91cb4b235abb gentoo-sources-2.4.20-r5.ebuild 4802
-MD5 7288efba37e71ffde0785010a2d2433f gentoo-sources-2.4.20-r6.ebuild 4955
-MD5 b1e426b49be86a5bf70077df574640f8 gentoo-sources-2.4.20-r9.ebuild 5557
-MD5 6450fd1b19f30aa33866e5e467c0d828 files/gentoo-sources-2.4.20-cs46xx-gcc33.patch 374
-MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783
-MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 13455
+MD5 2ac4fd77e067652901ccf234c9687bb1 files/i810_drm.patch 1247
 MD5 2be721ee04aa311a89ddfe1f3eab2cc0 files/digest-gentoo-sources-2.4.22 149
-MD5 3d5e2a43da16dfc6f02d249ab4d03eb7 files/digest-gentoo-sources-2.4.22-r1 147
-MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r9 145
+MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 13455
+MD5 1326d31d343f60512dfb1376bfe134a2 files/gentoo-sources-2.4.20-sched-interrupt.patch 400
 MD5 9f412f3083cdd87db058dd2f5fbcd103 files/gentoo-sources-2.4.20-ipt-realm.patch 1028
 MD5 d96fe98630a0a160723a67e4ca93dcff files/gentoo-sources-2.4.20-grsec-datasize_fix.patch 1421
-MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r6 145
+MD5 02b1f745c441693b1558b2b6d3f28c45 files/gentoo-sources-2.4.20-mdcount.patch 1345
+MD5 cbd2a33f15a8d2e7ab700a0b45fac377 files/gentoo-sources-2.4.20-grsec-disabled.patch 562
+MD5 3bf2f78421fe7eb5babc154d4ad4dbbd files/security.patch1 14328
 MD5 f308aef282ea75ea55d5c6035dafa100 files/security.patch2 4014
-MD5 1326d31d343f60512dfb1376bfe134a2 files/gentoo-sources-2.4.20-sched-interrupt.patch 400
+MD5 0d1cdff97252338dc5acc37c5f84d7c6 files/security.patch3 3333
+MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783
 MD5 6bd1b3d66aca4f2ae0cfd964caa28cc9 files/gentoo-sources-2.4.20-devfs-snd-fix.patch 1973
-MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r7 145
-MD5 3bf2f78421fe7eb5babc154d4ad4dbbd files/security.patch1 14328
 MD5 857ff623313f874e811763a2db96e831 files/lcall-DoS.patch 885
-MD5 012e8ba5d18dbb8d508ac4955e143e3a files/gentoo-sources-2.4.20-ipt-route.patch 13307
-MD5 cbd2a33f15a8d2e7ab700a0b45fac377 files/gentoo-sources-2.4.20-grsec-disabled.patch 562
-MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r8 145
-MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r5 145
-MD5 2ac4fd77e067652901ccf234c9687bb1 files/i810_drm.patch 1247
-MD5 0d1cdff97252338dc5acc37c5f84d7c6 files/security.patch3 3333
+MD5 a580e6b8c602c2e13fb5de7cc2de65a0 files/do_brk_fix.patch 242
 MD5 8c31359a134b927f7038539e7dd896d4 files/digest-gentoo-sources-2.4.19-r10 146
-MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
-MD5 02b1f745c441693b1558b2b6d3f28c45 files/gentoo-sources-2.4.20-mdcount.patch 1345
+MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r5 145
+MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r6 145
+MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r7 145
+MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r8 145
+MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r9 145
+MD5 3d5e2a43da16dfc6f02d249ab4d03eb7 files/digest-gentoo-sources-2.4.22-r1 147
+MD5 6450fd1b19f30aa33866e5e467c0d828 files/gentoo-sources-2.4.20-cs46xx-gcc33.patch 374
+MD5 012e8ba5d18dbb8d508ac4955e143e3a files/gentoo-sources-2.4.20-ipt-route.patch 13307
diff --git a/sys-kernel/gentoo-sources/files/do_brk_fix.patch b/sys-kernel/gentoo-sources/files/do_brk_fix.patch
index fef1f1e981e2..0f8438861e0d 100644
--- a/sys-kernel/gentoo-sources/files/do_brk_fix.patch
+++ b/sys-kernel/gentoo-sources/files/do_brk_fix.patch
@@ -1,6 +1,6 @@
 --- a/mm/mmap.c Fri Sep 12 06:44:06 2003
 +++ b/mm/mmap.c Thu Oct  2 01:18:19 2003
-@@ -1041,6 +1041,9 @@
+@@ -1248,6 +1248,9 @@
 	if (!len)
 		return addr;
  
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r9.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r9.ebuild
index 3f32eca5be8c..bbfedc4aa8e3 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r9.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.20-r9.ebuild,v 1.1 2003/12/02 19:41:26 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r9.ebuild,v 1.2 2003/12/03 16:31:56 iggy Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -132,7 +132,7 @@ src_unpack() {
 	epatch ${FILESDIR}/gentoo-sources-2.4.20-mdcount.patch
 	epatch ${FILESDIR}/gentoo-sources-2.4.20-devfs-snd-fix.patch
 	epatch ${FILESDIR}/gentoo-sources-2.4.20-ipt-realm.patch
-	epatch ${FILESDIR}/do_brk_fix.patch
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to apply do_brk fix"
 
 }