net-analyzer/ettercap: some more or less usefull enhancement, avoid

AC_TRY_LINK in configure

3 files changed, 46 insertions, 15 deletions

diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index c73e28f3..b1edb5a4 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,7 +1,7 @@
-AUX ettercap-0.7.3-64bit-casting.patch 591 RMD160 fdee869048dcdb510324e5b173e1e514c2aed2fd SHA1 e53753de80c2fecb1a2d677f6213886e5f272a22 SHA256 7ce23fd163ad8c53c442e789bf9f0db3716c35a5da76dad6687938c34b122897
-AUX ettercap-0.7.3-as-needed.patch 476 RMD160 1c7f5d24a4b77922e6499d048cd8b7b984db6eb4 SHA1 fd137a91ec37a5b1fbfa28fc075191cc92d298c7 SHA256 7722bd2e6f993d45e74ae8b36b200d34e10257fc7b2b8de7f76a6946f7a8046a
-AUX ettercap-0.7.3-autotools.patch 5368 RMD160 2d3ea1962be61aff0584f6b542f8c2e82297314d SHA1 647ca23c2e85fdefca7c650dec6ff1601c448cdf SHA256 9b9df4880b85d125233d6508b03e5912af1e00c4e0a863409a6ad235814eafd4
-AUX ettercap-0.7.3-open_missing_mode.patch 625 RMD160 9bc96776088d33c347bd1bcb2b29b62f9173d348 SHA1 e680a22e24d5f48d1f1604e8d9e55d645cffd117 SHA256 be35690de1d1f70045a97903cfba253923ec0a86d7f7fc6e47e31dee8c03ce0c
-AUX ettercap-BJA-cross-NS_GET32.diff 292 RMD160 9702aebdba4d5786f6df59e43dbbfaa83c0ce4a1 SHA1 b45c6b1624b1a8d6d26026fd7788902fad4ec4ee SHA256 89dcc0b60ee530100b9f14d806bfb1dfc2f1e383ef5fe244025cfdb9847a4f3b
-DIST ettercap-NG-0.7.3.tar.gz 1138643 RMD160 f4e6c0d87b2064b3775e9af60f34575273742616 SHA1 7a2c3f848ca4f39c07fddeb0d6308641265bc4ff SHA256 c74239052d62565c13a82f9bbf217a4fdcce4b34949e361b53bb3f28e3168543
-EBUILD ettercap-0.7.3-r4.ebuild 2010 RMD160 6b81a4547184adde42bff01ab63e726d2068668b SHA1 6ecc4f55a4a6635a02a2e8679a2a388076cbac5a SHA256 eb864035f747c6dff1eb92b4f670b3d7dafd647d656cc9e41aa8281a360b2cc5
+AUX ettercap-0.7.3-64bit-casting.patch 591 SHA256 7ce23fd163ad8c53c442e789bf9f0db3716c35a5da76dad6687938c34b122897 SHA512 9578ae19981c66a459272f01c748f53c4708ad5b5d2a76c6a426e189b387c3244bdaab087d8c22b09f8d2b009c7a0fd4fa9857f37f5de37977f655612d97e432 WHIRLPOOL 1136e0ed1c263e004eec50fcf2f5f1dffa25d04e38aa7a411d6181e097caeb704e4a23f45f414d010d606f56d37af51d75b2142808432b2609313a57b1990298
+AUX ettercap-0.7.3-as-needed.patch 476 SHA256 7722bd2e6f993d45e74ae8b36b200d34e10257fc7b2b8de7f76a6946f7a8046a SHA512 e83b3c59709d92475db09e30b37161c8add430f04c95fa9953e08c90e795d0e908a278e54200769d3d435f77d51e7e1f267a6cc237c825d5a367918f4a9ee2c6 WHIRLPOOL 47ae3f549dcab778edd95c30e844eebee3dc6cf8b8e4bce551b401a9304ae845095faea097523c81397b3216bf6347882d22d6db54cf03158b40e2159fe14907
+AUX ettercap-0.7.3-autotools.patch 5368 SHA256 9b9df4880b85d125233d6508b03e5912af1e00c4e0a863409a6ad235814eafd4 SHA512 2ccde3b57d347db8a9f243aca1953a4f96dd0145048446986f932f0127cd7a5057eb68d56037cf8ed61c666acb54a7299ec21438060c8cd247ddddbefd971ffc WHIRLPOOL c91c0401c518bdc7e528f2d181f72fa042e39ed0c6066bab5933225275d6b8880e40bc302d75d943f4446f375f75bd27bc34444702b76870837fff72e051e3c2
+AUX ettercap-0.7.3-open_missing_mode.patch 625 SHA256 be35690de1d1f70045a97903cfba253923ec0a86d7f7fc6e47e31dee8c03ce0c SHA512 2ff127bdfc75ffc860d554a56de117506318da2d8f1d1d3a36b436f11118cd5cf3ac932ec8cf2428e6efb6094ff8245a49582118b5b418c48cbfec7099d11a09 WHIRLPOOL aec55fc55b977464e4718b5e34645008b1680874945d49f088e5681a5bf252fda4cdf0725183aaa866c95ae19015cd6db3be7d69bf693c5532b667c00a03ceab
+AUX ettercap-BJA-cross-NS_GET32.diff 811 SHA256 d802f4649e107003678b38185db5217b7d079e5443204942bda6040e2926fb52 SHA512 9429cb542ea875cc56a73cfd48f41ce7935be16981c66ddabdb2673a1b7c94dc711cfd1953d8a9c6b5b572c2fea06367469abdbaa01d6d3b85c9aeda203a3b84 WHIRLPOOL bde625babbb1254a28f520ce362f4409776fb8b909d4a6e7061be1ae9f1178d9560d5a764f531e622d217ab8fa955bb3c1add3eee7f26666288761c5c8d7fd56
+DIST ettercap-NG-0.7.3.tar.gz 1138643 SHA256 c74239052d62565c13a82f9bbf217a4fdcce4b34949e361b53bb3f28e3168543
+EBUILD ettercap-0.7.3-r4.ebuild 2081 SHA256 af28a8aabf472330c321178277652fa2fc3eb0fc71e006c98ecf598972a5b485 SHA512 0a0d8364af9eeadbf175e42624b05be243452d1d4965f012aa4ae6550053401d853226044e546077ded1039017b02380fc710dd7493c0ffc0afc353d64603704 WHIRLPOOL 379790d747e46a8a0967f81a5f74ad766b8fcee30cdf2672dd97604d0c1f910839047ea96d02d917c0eaf4b64b0b620f958a30413916d9a6336d6a898df4e14c
diff --git a/net-analyzer/ettercap/ettercap-0.7.3-r4.ebuild b/net-analyzer/ettercap/ettercap-0.7.3-r4.ebuild
index f51ea6e1..0800030f 100644
--- a/net-analyzer/ettercap/ettercap-0.7.3-r4.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.7.3-r4.ebuild
@@ -9,6 +9,8 @@
 
 EAPI=2
 
+WANT_AUTOCONF="latest"
+
 inherit autotools flag-o-matic libtool
 
 MY_P="${PN}-NG-${PV}"
@@ -42,8 +44,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-autotools.patch
 	epatch "${FILESDIR}"/${PN}-BJA-cross-NS_GET32.diff
 
-	NO_FAIL=1 eautoreconf
-	eautoconf
+	rm -rvf aclocal.m4 config.guess config.sub configure ltmain.sh
+
+	eautoreconf
 }
 
 src_configure() {
diff --git a/net-analyzer/ettercap/files/ettercap-BJA-cross-NS_GET32.diff b/net-analyzer/ettercap/files/ettercap-BJA-cross-NS_GET32.diff
index f9825a69..07b87c77 100644
--- a/net-analyzer/ettercap/files/ettercap-BJA-cross-NS_GET32.diff
+++ b/net-analyzer/ettercap/files/ettercap-BJA-cross-NS_GET32.diff
@@ -1,11 +1,39 @@
---- acinclude.m4.ori	2011-07-19 21:59:06.000000000 +0200
-+++ acinclude.m4	2011-07-19 21:59:26.000000000 +0200
-@@ -179,7 +179,7 @@
+--- acinclude.m4.ori	2012-01-13 20:02:14.709313803 +0100
++++ acinclude.m4	2012-01-13 20:01:32.170081917 +0100
+@@ -179,23 +179,20 @@
  [
     AC_CHECK_HEADERS(arpa/nameser.h)
     AC_MSG_CHECKING(for NS_GET32)
 -   AC_TRY_RUN([
-+   AC_TRY_LINK([
-       #include <arpa/nameser.h>
+-      #include <arpa/nameser.h>
+-
+-      int main()
+-      {
+-         int i;
+-         char *p = "\x01\x02\x03\x04";
+-         NS_GET32(i, p);
+-
+-         return 0;
+-      }
+-   ],
+-   [  AC_MSG_RESULT(yes)
+-      AC_DEFINE(HAVE_NS_GET,1) ],
+-   [  AC_MSG_RESULT(no); ]
++   AC_LINK_IFELSE(
++     [AC_LANG_PROGRAM(
++      [[#include <arpa/nameser.h>]],
++      [[int i;
++        char *p = "\x01\x02\x03\x04";
++        NS_GET32(i, p);
++        
++        return 0;
++      ]]
++     )],
++     [AC_MSG_RESULT(yes)
++      AC_DEFINE(HAVE_NS_GET,1)],
++     [AC_MSG_RESULT(no)]
+    )
+-
+ ])
  
-       int main()
+ dnl