Add fix for gcc4; bug 152093

(Portage version: 2.1.2_rc3-r6)

4 files changed, 49 insertions, 8 deletions

diff --git a/dev-util/injectso/ChangeLog b/dev-util/injectso/ChangeLog
index 7d54de149508..af386fbfbee7 100644
--- a/dev-util/injectso/ChangeLog
+++ b/dev-util/injectso/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/injectso
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/injectso/ChangeLog,v 1.5 2004/09/05 07:48:18 swegener Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/injectso/ChangeLog,v 1.6 2006/12/17 22:47:09 masterdriverz Exp $
+
+  17 Dec 2006; Charlie Shepherd <masterdriverz@gentoo.org>
+  +files/injectso-0.2-gcc4.patch, injectso-0.2.ebuild:
+  Add fix for gcc4; bug 152093
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
diff --git a/dev-util/injectso/files/digest-injectso-0.2 b/dev-util/injectso/files/digest-injectso-0.2
index bc97f107f76d..731de5a2b150 100644
--- a/dev-util/injectso/files/digest-injectso-0.2
+++ b/dev-util/injectso/files/digest-injectso-0.2
@@ -1 +1,3 @@
 MD5 5bfef51891073e6309a11c7f36ba095e injectso-0.2.tar.gz 80367
+RMD160 f2234ea0d3d6fbbc2fb6cba774962ae2bb454478 injectso-0.2.tar.gz 80367
+SHA256 86ed5a565b200987649f97d7851229c076e37c2ddfedbb27bc8483bd7203e7a6 injectso-0.2.tar.gz 80367
diff --git a/dev-util/injectso/files/injectso-0.2-gcc4.patch b/dev-util/injectso/files/injectso-0.2-gcc4.patch
new file mode 100644
index 000000000000..d6196928b4f7
--- /dev/null
+++ b/dev-util/injectso/files/injectso-0.2-gcc4.patch
@@ -0,0 +1,32 @@
+diff -x 'config*' -ur /var/tmp/portage/dev-util/injectso-0.2/work/injectso-0.2/procdbg.c /tmp/injectso-0.2/procdbg.c
+--- /var/tmp/portage/dev-util/injectso-0.2/work/injectso-0.2/procdbg.c	2002-07-13 06:06:00.000000000 +0100
++++ /tmp/injectso-0.2/procdbg.c	2006-12-17 22:20:59.000000000 +0000
+@@ -146,7 +146,7 @@
+ 
+    /* Now subtract the amount of space we need for the                     */
+    /* data to be pushed                                                    */
+-   (unsigned long) pvEsp -= iSize;
++   pvEsp -= (unsigned long) iSize;
+ 
+    /* Round it to a multiple of 8 (if it isn't already)                    */
+    /* (We use 8 since Sparc requires double word alignment)                */
+@@ -241,7 +241,7 @@
+          ptProcStatus->regs.eax = EINTR;
+       } else {
+          show_debug(3, "Restoring EIP to retry\n");
+-         (unsigned long) ptProcStatus->regs.eip = (unsigned long) ptProcStatus->regs.eip - 2; 
++         ptProcStatus->regs.eip = (unsigned long) ptProcStatus->regs.eip - 2; 
+          ptProcStatus->regs.eax = ptProcStatus->regs.orig_eax;
+       }
+    }
+diff -x 'config*' -ur /var/tmp/portage/dev-util/injectso-0.2/work/injectso-0.2/readargs.c /tmp/injectso-0.2/readargs.c
+--- /var/tmp/portage/dev-util/injectso-0.2/work/injectso-0.2/readargs.c	2002-06-30 10:45:47.000000000 +0100
++++ /tmp/injectso-0.2/readargs.c	2006-12-17 22:19:54.000000000 +0000
+@@ -115,7 +115,6 @@
+             }
+             iError = 1;
+             break;
+-         default:
+       }
+    }
+ 
diff --git a/dev-util/injectso/injectso-0.2.ebuild b/dev-util/injectso/injectso-0.2.ebuild
index f903ead28272..7b5d806b6482 100644
--- a/dev-util/injectso/injectso-0.2.ebuild
+++ b/dev-util/injectso/injectso-0.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/injectso/injectso-0.2.ebuild,v 1.8 2004/07/14 23:45:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/injectso/injectso-0.2.ebuild,v 1.9 2006/12/17 22:47:09 masterdriverz Exp $
+
+inherit eutils
 
 DESCRIPTION="Inject shared libraries into running processes under Solaris and Linux"
 HOMEPAGE="http://www.securereality.com.au/"
@@ -11,11 +13,12 @@ LICENSE="GPL-2"
 KEYWORDS="x86"
 IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND=""
 
-src_compile() {
-	econf || die
-	emake || die
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
 }
 
 src_install() {