Add fix for gcc4; bug 152093

Package-Manager: portage-2.1.2_rc3-r6

diff --git a/dev-util/injectso/ChangeLog b/dev-util/injectso/ChangeLog
index 7d54de1495082370d915e153ffa75f9bf1d77f09..af386fbfbee73935610e816679eb38d177278899 100644 (file)
--- 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/Manifest b/dev-util/injectso/Manifest
index fc429c6b1aa033652aa0aefff8569dfb31450f47..ea2ac026dc05925bbed83145b1e36c9f3d1b348a 100644 (file)
--- a/dev-util/injectso/Manifest
+++ b/dev-util/injectso/Manifest
@@ -1,16 +1,20 @@
-DIST injectso-0.2.tar.gz 80367
-EBUILD injectso-0.2.ebuild 921 RMD160 a7576429c7e5480c3490311a121fbd1385ba49c8 SHA1 c303b397ab1e7a6b2eb77cbb88c3f9daf82e86e1 SHA256 259516768b325d212a0df98a1ea64697999db2f28651a5a109592afaa0aff1dc
-MD5 8328e31452284e09ab78a3f5a7623605 injectso-0.2.ebuild 921
-RMD160 a7576429c7e5480c3490311a121fbd1385ba49c8 injectso-0.2.ebuild 921
-SHA256 259516768b325d212a0df98a1ea64697999db2f28651a5a109592afaa0aff1dc injectso-0.2.ebuild 921
-MISC ChangeLog 520 RMD160 73627f7320128da8e599e0accb5e6c3b2ccd59ae SHA1 ed27a95b846680bf8197afeceb854883b981db34 SHA256 7ff4fefd7d9237ed3c5b7bd1e8cccd66a6409bfc756a45cda2b9987f64e47775
-MD5 9c426919ef78671fca10799f09c5650c ChangeLog 520
-RMD160 73627f7320128da8e599e0accb5e6c3b2ccd59ae ChangeLog 520
-SHA256 7ff4fefd7d9237ed3c5b7bd1e8cccd66a6409bfc756a45cda2b9987f64e47775 ChangeLog 520
+AUX injectso-0.2-gcc4.patch 1502 RMD160 2c2ae021a716b66a46313ecabf71eb5449198a20 SHA1 8745053abe2a29df042a5ae1235cc684a27536f5 SHA256 abaf4787f9d0553bf27a4e526f4887618135d42093a22166e39859e2c6be9dfd
+MD5 3ff863791d02f779e3f012e77906f905 files/injectso-0.2-gcc4.patch 1502
+RMD160 2c2ae021a716b66a46313ecabf71eb5449198a20 files/injectso-0.2-gcc4.patch 1502
+SHA256 abaf4787f9d0553bf27a4e526f4887618135d42093a22166e39859e2c6be9dfd files/injectso-0.2-gcc4.patch 1502
+DIST injectso-0.2.tar.gz 80367 RMD160 f2234ea0d3d6fbbc2fb6cba774962ae2bb454478 SHA1 9abef1df89499a35a6653be093a630a7c4ddce85 SHA256 86ed5a565b200987649f97d7851229c076e37c2ddfedbb27bc8483bd7203e7a6
+EBUILD injectso-0.2.ebuild 963 RMD160 628e80e74f72143ff230ea59fb79c5eec1f1dfe0 SHA1 81419c09ffd2b0b467ea0f5bd9691d06824e97b4 SHA256 b181852da5a9a63e7dbb6febd7d969ff9338ac139c0b38548ed70cb720b7ade3
+MD5 7602620f72753aa2df0cfe818d30b87b injectso-0.2.ebuild 963
+RMD160 628e80e74f72143ff230ea59fb79c5eec1f1dfe0 injectso-0.2.ebuild 963
+SHA256 b181852da5a9a63e7dbb6febd7d969ff9338ac139c0b38548ed70cb720b7ade3 injectso-0.2.ebuild 963
+MISC ChangeLog 671 RMD160 5e2c6fec641a2221d439eea8978595741ed95acd SHA1 4900fda3ed15820dd8d3fa84737d6c63de7633ce SHA256 00a6c6a249d1796658192c92171014f9f398cca983e86dadc1ed932cdc80da17
+MD5 f1ef878bbb85a3a4a9b47c40f5639e37 ChangeLog 671
+RMD160 5e2c6fec641a2221d439eea8978595741ed95acd ChangeLog 671
+SHA256 00a6c6a249d1796658192c92171014f9f398cca983e86dadc1ed932cdc80da17 ChangeLog 671
 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
 MD5 c667f921ee8d48ce17ebef0f8d601ea4 metadata.xml 210
 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 metadata.xml 210
 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 metadata.xml 210
-MD5 cf7b11b8ab62086605986efcd1bec0d9 files/digest-injectso-0.2 63
-RMD160 81d09152d9dbfdc6fdb03523a00f71576bc3b454 files/digest-injectso-0.2 63
-SHA256 fb4ad9656709905d7f7276e2991d335cf4e5a69250b9a2a3544eab6d7c90c92c files/digest-injectso-0.2 63
+MD5 735f811d50cc185e7d76510b31463e2c files/digest-injectso-0.2 235
+RMD160 eed68cb8396c5ad14fc9e5840d3f1a3a80e57f83 files/digest-injectso-0.2 235
+SHA256 05bdc54a444f218f774ea20d6f004a4cd2bc0e78eb8500ae45b02ca60353ccb9 files/digest-injectso-0.2 235

diff --git a/dev-util/injectso/files/digest-injectso-0.2 b/dev-util/injectso/files/digest-injectso-0.2
index bc97f107f76d858a6184785dfe89934334f4c1e0..731de5a2b150550a9e85b7f55e861923fbe816b7 100644 (file)
--- 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 (file)
index 0000000..d619692
--- /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 f903ead2827276f344a603ee4e32822a11468414..7b5d806b648213cd770df07003b40edd6708ee48 100644 (file)
--- 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() {