fixup some of the do_brk stuff

9 files changed, 36 insertions, 41 deletions

diff --git a/sys-kernel/xfs-sources/ChangeLog b/sys-kernel/xfs-sources/ChangeLog
index 7a6dff5c171e..6e9826864202 100644
--- a/sys-kernel/xfs-sources/ChangeLog
+++ b/sys-kernel/xfs-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/xfs-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.29 2003/12/01 22:59:57 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.30 2003/12/02 03:17:53 iggy Exp $
+
+  01 Dec 2003; Brian Jackson <iggy@gentoo.org> xfs-sources-2.4.19-r2.ebuild,
+  xfs-sources-2.4.20-r1.ebuild, xfs-sources-2.4.20-r2.ebuild,
+  xfs-sources-2.4.20-r3.ebuild, xfs-sources-2.4.20.ebuild,
+  xfs-sources-2.4.22.ebuild, files/xfs-sources-2.4.20-gcc33.patch:
+  fixup some of the do_brk stuff
 
   01 Dec 2003; Brandon Hale <tseng@gentoo.org> xfs-sources-2.4.19-r2.ebuild,
   xfs-sources-2.4.20-r1.ebuild, xfs-sources-2.4.20-r2.ebuild,
diff --git a/sys-kernel/xfs-sources/Manifest b/sys-kernel/xfs-sources/Manifest
index 9b1f37804d4d..3357d0692250 100644
--- a/sys-kernel/xfs-sources/Manifest
+++ b/sys-kernel/xfs-sources/Manifest
@@ -1,14 +1,14 @@
-MD5 55be1a54633e8b2475cb2398e052c720 xfs-sources-2.4.20-r1.ebuild 2195
-MD5 334aa7829b79935b41ce44ff31c9dc3a xfs-sources-2.4.19-r2.ebuild 2119
-MD5 1431602dd359cebe91c11d201a7ef905 xfs-sources-2.4.20.ebuild 2207
-MD5 eae87a9c038dae40ce89ec900cfb5499 xfs-sources-2.4.20-r3.ebuild 2246
-MD5 ee3b9e923c7e896cc384bc0d68878398 xfs-sources-2.4.22.ebuild 2215
-MD5 7800dd1cf7f03f13006cd6927e643bee xfs-sources-2.4.20-r2.ebuild 2197
-MD5 9b0decc9e7ef7dc6ccd8a5f9d7450cc8 ChangeLog 8214
+MD5 dd6ee1f917d97dff4db5e3ce25c4486d xfs-sources-2.4.20-r1.ebuild 2193
+MD5 db428299389ac834854b0732c5d0bec4 xfs-sources-2.4.19-r2.ebuild 2123
+MD5 7d250d77b5ca14b9e7b5f37d6ab79dd7 xfs-sources-2.4.20.ebuild 2203
+MD5 faa010d557ffbd6f460d09d5475e1a3b xfs-sources-2.4.20-r3.ebuild 2295
+MD5 48e098d9147d10a695585c51a033aa9c xfs-sources-2.4.22.ebuild 2255
+MD5 c5a25d4bbd950fa23086c8b483a0570c xfs-sources-2.4.20-r2.ebuild 2192
+MD5 98c73057ef9d34cc3679108af4e4de33 ChangeLog 8512
 MD5 a728d28dca69f5ae16aab56cd2fc6110 files/digest-xfs-sources-2.4.20 139
 MD5 26b986cdd4c24df8ad3d0f0b21e802be files/digest-xfs-sources-2.4.22 139
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
-MD5 ec7765fb708912e448a36dc6cf7cdce9 files/xfs-sources-2.4.20-gcc33.patch 11801
+MD5 3afd3962750ab6706f9a9878a94cfd8d files/xfs-sources-2.4.20-gcc33.patch 10849
 MD5 b0c3e68e37892be35fc1c33723bbbdc3 files/xfs-sources-2.4.19.patch 497
 MD5 77f3799264c87379da9f7f2b23f20684 files/digest-xfs-sources-2.4.19-r2 142
 MD5 bb367b087129027dd816740e61f0e675 files/digest-xfs-sources-2.4.20-r1 142
diff --git a/sys-kernel/xfs-sources/files/xfs-sources-2.4.20-gcc33.patch b/sys-kernel/xfs-sources/files/xfs-sources-2.4.20-gcc33.patch
index 9090fbb4e67e..e5b31df03c22 100644
--- a/sys-kernel/xfs-sources/files/xfs-sources-2.4.20-gcc33.patch
+++ b/sys-kernel/xfs-sources/files/xfs-sources-2.4.20-gcc33.patch
@@ -129,22 +129,6 @@ diff -u -r linux-2.4.20-xfs-r3/drivers/ide/ide-cd.h linux-2.4.20-xfs-r4/drivers/
  };
  
  
-diff -u -r linux-2.4.20-xfs-r3/drivers/net/bcm4400/b44.h linux-2.4.20-xfs-r4/drivers/net/bcm4400/b44.h
---- linux-2.4.20-xfs-r3/drivers/net/bcm4400/b44.h	2003-10-11 11:38:33.000000000 +0200
-+++ linux-2.4.20-xfs-r4/drivers/net/bcm4400/b44.h	2003-10-11 11:48:41.000000000 +0200
-@@ -1079,10 +1079,10 @@
- /******************************************************************************/
- 
- #define REG_RD(pDevice, OffsetName)                                         \
--        __raw_readl(&((pDevice)->pMemView->##OffsetName))
-+        __raw_readl(&((pDevice)->pMemView->OffsetName))
- 
- #define REG_WR(pDevice, OffsetName, Value32)                                \
--        (void) __raw_writel(Value32, &((pDevice)->pMemView->##OffsetName))
-+        (void) __raw_writel(Value32, &((pDevice)->pMemView->OffsetName))
- 
- #define REG_RD_OFFSET(pDevice, Offset)                                      \
-     __raw_readl(((LM_UINT8 *) (pDevice)->pMemView + Offset))
 diff -u -r linux-2.4.20-xfs-r3/drivers/net/fealnx.c linux-2.4.20-xfs-r4/drivers/net/fealnx.c
 --- linux-2.4.20-xfs-r3/drivers/net/fealnx.c	2003-10-11 11:38:33.000000000 +0200
 +++ linux-2.4.20-xfs-r4/drivers/net/fealnx.c	2003-10-11 11:54:07.000000000 +0200
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.19-r2.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.19-r2.ebuild
index 84da67fb8b72..f5f506416f84 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.19-r2.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.19-r2.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/xfs-sources/xfs-sources-2.4.19-r2.ebuild,v 1.10 2003/12/01 22:59:57 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.19-r2.ebuild,v 1.11 2003/12/02 03:17:53 iggy Exp $
 
 IUSE="build crypt"
 
@@ -52,8 +52,9 @@ src_unpack() {
 	# This is the latest release of ACPI from 
 	# http://www.sourceforge.net/projects/acpi	
 	[ `use acpi4linux` ] || rm 70*
-	
+
 	#IMPORTANT! Root Exploit!
-    epatch ${FILESDIR}/do_brk_fix.patch
+	cd ${S}
+	epatch ${FILESDIR}/do_brk_fix.patch
 	kernel_src_unpack
 }
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r1.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r1.ebuild
index a608cdd75a54..75ce1d3fc297 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r1.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r1.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/xfs-sources/xfs-sources-2.4.20-r1.ebuild,v 1.6 2003/12/01 22:59:57 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.20-r1.ebuild,v 1.7 2003/12/02 03:17:53 iggy Exp $
 
 IUSE="build crypt"
 
@@ -62,7 +62,7 @@ src_unpack() {
 	else
 		einfo "Cryptographic support enabled..."
 	fi
-	
+
 	#IMPORTANT! Root Exploit!
 	epatch ${FILESDIR}/do_brk_fix.patch
 	kernel_src_unpack
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r2.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r2.ebuild
index 89e65a69ec90..5c665072fce9 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r2.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r2.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/xfs-sources/xfs-sources-2.4.20-r2.ebuild,v 1.6 2003/12/01 22:59:57 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.20-r2.ebuild,v 1.7 2003/12/02 03:17:53 iggy Exp $
 
 IUSE="build crypt"
 
@@ -62,8 +62,8 @@ src_unpack() {
 	else
 		einfo "Cryptographic support enabled..."
 	fi
-	
+
 	#IMPORTANT! Root Exploit!
-    epatch ${FILESDIR}/do_brk_fix.patch
+	epatch ${FILESDIR}/do_brk_fix.patch
 	kernel_src_unpack
 }
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild
index 5fadff76c4ae..c25fb6d25b97 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.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/xfs-sources/xfs-sources-2.4.20-r3.ebuild,v 1.7 2003/12/01 22:59:57 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild,v 1.8 2003/12/02 03:17:53 iggy Exp $
 
 IUSE="build crypt"
 
@@ -64,8 +64,10 @@ src_unpack() {
 	fi
 
 	#IMPORTANT! Root Exploit!
-	epatch ${FILESDIR}/do_brk_fix.patch	
-	kernel_src_unpack
+	cd ${S}
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
 	epatch ${FILESDIR}/xfs-sources-2.4.20-gcc33.patch
 
+	kernel_src_unpack
+
 }
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20.ebuild
index e0c342951072..d36700de0eb8 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.20.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/xfs-sources/xfs-sources-2.4.20.ebuild,v 1.5 2003/12/01 22:59:57 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.20.ebuild,v 1.6 2003/12/02 03:17:53 iggy Exp $
 
 IUSE="build crypt"
 
@@ -64,6 +64,6 @@ src_unpack() {
 	fi
 
 	#IMPORTANT! Root Exploit!
-    epatch ${FILESDIR}/do_brk_fix.patch
+	epatch ${FILESDIR}/do_brk_fix.patch
 	kernel_src_unpack
 }
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.22.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.22.ebuild
index 7755fcead786..694a940d2495 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.22.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.22.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/xfs-sources/xfs-sources-2.4.22.ebuild,v 1.2 2003/12/01 22:59:57 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.22.ebuild,v 1.3 2003/12/02 03:17:53 iggy Exp $
 
 IUSE="build crypt"
 
@@ -62,8 +62,10 @@ src_unpack() {
 	else
 		einfo "Cryptographic support enabled..."
 	fi
-	
+
 	#IMPORTANT! Root Exploit!
-	epatch ${FILESDIR}/do_brk_fix.patch
+	cd ${S}
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
 	kernel_src_unpack
 }