Fix sigsegv on ppc when sandbox is enabled for bug 80928; thanks to Wormo for the patch.

(Portage version: 2.0.51-r15)

4 files changed, 113 insertions, 4 deletions

diff --git a/dev-libs/dmalloc/ChangeLog b/dev-libs/dmalloc/ChangeLog
index 4c27315e4d17..474ffb246f68 100644
--- a/dev-libs/dmalloc/ChangeLog
+++ b/dev-libs/dmalloc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/dmalloc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/ChangeLog,v 1.19 2005/01/29 15:59:43 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/ChangeLog,v 1.20 2005/02/06 02:11:30 ka0ttic Exp $
+
+  05 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/dmalloc-5.4.2-sandbox.patch, dmalloc-5.4.2.ebuild:
+  Fix sigsegv on ppc when sandbox is enabled for bug 80928; thanks to Wormo
+  for the patch.
 
   29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> dmalloc-5.4.2.ebuild:
   added -amd64, finally closing #79632.
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index 4b296f8f29dc..7672cde735f5 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -1,11 +1,12 @@
-MD5 c1a294e3149313a291b8e2099c450cf8 dmalloc-5.4.2.ebuild 1012
+MD5 3806f346c2c8f1d4d9ea0a9660ec557f dmalloc-5.4.2.ebuild 1051
 MD5 6fccdfe7d00f967c2afaf860082039b3 dmalloc-4.8.2-r1.ebuild 834
 MD5 bc4b0816edfe0d270f37836b094c4407 dmalloc-5.3.0.ebuild 997
-MD5 1b8ac3827d3097bf7c0e4343ccdbcdc8 ChangeLog 2751
+MD5 5870c08dfa38e075aee0b73788f88cdd ChangeLog 2954
 MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
 MD5 ee3cc894963eba0ee4a8a395fd958ba2 files/dmalloc-5.4.2-respect-DESTDIR.diff 4349
 MD5 d7d2c9ed36553b70e9fc9ffae863ff70 files/digest-dmalloc-5.3.0 62
 MD5 df2d7ec5445ffe67bd282af7f73139e0 files/digest-dmalloc-5.4.2 62
+MD5 d2bee893329cf15e900c4b653a533a0c files/dmalloc-5.4.2-sandbox.patch 2961
 MD5 9e69097981f3eb71bc12b8c3b5789b59 files/dmalloc-5.2.4-fpic.patch 1349
 MD5 2944158ef624e5e2d6d2ca9df1abbc64 files/dmalloc-5.3.0-respect-DESTDIR.diff 4338
 MD5 f50369b9728f749d86934c0b728619ef files/dmalloc-5.3.0-fpic.patch 1440
diff --git a/dev-libs/dmalloc/dmalloc-5.4.2.ebuild b/dev-libs/dmalloc/dmalloc-5.4.2.ebuild
index 98a36c62e933..56c3b35355a2 100644
--- a/dev-libs/dmalloc/dmalloc-5.4.2.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.4.2.ebuild,v 1.4 2005/01/29 15:59:43 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.4.2.ebuild,v 1.5 2005/02/06 02:11:30 ka0ttic Exp $
 
 inherit debug eutils
 
@@ -20,6 +20,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-5.3.0-fpic.patch
 	epatch ${FILESDIR}/${P}-respect-DESTDIR.diff
+	epatch ${FILESDIR}/${P}-sandbox.patch
 }
 
 src_compile() {
diff --git a/dev-libs/dmalloc/files/dmalloc-5.4.2-sandbox.patch b/dev-libs/dmalloc/files/dmalloc-5.4.2-sandbox.patch
new file mode 100644
index 000000000000..ea3a8eb3602e
--- /dev/null
+++ b/dev-libs/dmalloc/files/dmalloc-5.4.2-sandbox.patch
@@ -0,0 +1,102 @@
+diff -Naur dmalloc-5.4.2.orig/configure dmalloc-5.4.2/configure
+--- dmalloc-5.4.2.orig/configure	2005-02-04 17:33:49.922306392 -0800
++++ dmalloc-5.4.2/configure	2005-02-04 17:59:03.332233112 -0800
+@@ -5443,7 +5443,7 @@
+   heap_p += size;
+   return pnt;
+ }
+-char *calloc (int number, int size) {
++static char *calloc (int number, int size) {
+   char *start, *pnt, *end;
+   if (main_b) _exit(0);
+   /* it should be already 0s */
+@@ -5453,7 +5453,7 @@
+   while (pnt < end) { *pnt++ = '\0'; }
+   return start;
+ }
+-char *realloc (char *old_pnt, int new_size) {
++static char *realloc (char *old_pnt, int new_size) {
+   char *start, *pnt, *end;
+   if (main_b) _exit(0);
+   start = malloc (new_size);
+@@ -5717,14 +5717,14 @@
+ static char heap_mem[102400], *heap_p = heap_mem;
+ free (char *pnt) {
+ }
+-char *malloc (int size) {
++static char *malloc (int size) {
+   char *pnt;
+   getenv("PATH");
+   pnt = heap_p;
+   heap_p += size;
+   return pnt;
+ }
+-char *calloc (int number, int size) {
++static char *calloc (int number, int size) {
+   char *start, *pnt, *end;
+   getenv("PATH");
+   /* it should be already 0s */
+@@ -5734,7 +5734,7 @@
+   while (pnt < end) { *pnt++ = '\0'; }
+   return start;
+ }
+-char *realloc (char *old_pnt, int new_size) {
++static char *realloc (char *old_pnt, int new_size) {
+   char *start, *pnt, *end;
+   getenv("PATH");
+   start = malloc (new_size);
+diff -Naur dmalloc-5.4.2.orig/configure.ac dmalloc-5.4.2/configure.ac
+--- dmalloc-5.4.2.orig/configure.ac	2005-02-04 17:54:41.131093744 -0800
++++ dmalloc-5.4.2/configure.ac	2005-02-04 16:36:10.5.4.25872 -0800
+@@ -330,14 +330,14 @@
+ static int main_b = 0;
+ static char heap_mem[102400], *heap_p = heap_mem;
+ free () { if (main_b) _exit(0); }
+-char *malloc (int size) {
++static char *malloc (int size) {
+   char *pnt;
+   if (main_b) _exit(0);
+   pnt = heap_p;
+   heap_p += size;
+   return pnt;
+ }
+-char *calloc (int number, int size) {
++static char *calloc (int number, int size) {
+   char *start, *pnt, *end;
+   if (main_b) _exit(0);
+   /* it should be already 0s */
+@@ -347,7 +347,7 @@
+   while (pnt < end) { *pnt++ = '\0'; }
+   return start;
+ }
+-char *realloc (char *old_pnt, int new_size) {
++static char *realloc (char *old_pnt, int new_size) {
+   char *start, *pnt, *end;
+   if (main_b) _exit(0);
+   start = malloc (new_size);
+@@ -388,14 +388,14 @@
+ static char heap_mem[102400], *heap_p = heap_mem;
+ free (char *pnt) {
+ }
+-char *malloc (int size) {
++static char *malloc (int size) {
+   char *pnt;
+   getenv("PATH");
+   pnt = heap_p;
+   heap_p += size;
+   return pnt;
+ }
+-char *calloc (int number, int size) {
++static char *calloc (int number, int size) {
+   char *start, *pnt, *end;
+   getenv("PATH");
+   /* it should be already 0s */
+@@ -405,7 +405,7 @@
+   while (pnt < end) { *pnt++ = '\0'; }
+   return start;
+ }
+-char *realloc (char *old_pnt, int new_size) {
++static char *realloc (char *old_pnt, int new_size) {
+   char *start, *pnt, *end;
+   getenv("PATH");
+   start = malloc (new_size);