fix 64bit seg fault ( bug #288348 )

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 99 insertions, 2 deletions

diff --git a/net-analyzer/ettercap/ChangeLog b/net-analyzer/ettercap/ChangeLog
index 595d3d9be361..df8529d0ac66 100644
--- a/net-analyzer/ettercap/ChangeLog
+++ b/net-analyzer/ettercap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/ettercap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ettercap/ChangeLog,v 1.75 2009/09/27 14:34:39 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ettercap/ChangeLog,v 1.76 2009/10/17 18:27:12 hwoarang Exp $
+
+*ettercap-0.7.3-r4 (17 Oct 2009)
+
+  17 Oct 2009; Markos Chandras <hwoarang@gentoo.org>
+  +ettercap-0.7.3-r4.ebuild, +files/ettercap-0.7.3-64bit-casting.patch:
+  Revision bump which fixes segmentation fault on 64bit arches ( bug #288348
+  ).
+  Thanks to Timothy Redaelli <timothy@redaelli.eu> for the patch
 
   27 Sep 2009; Brent Baude <ranger@gentoo.org> ettercap-0.7.3-r3.ebuild:
   Marking ettercap-0.7.3-r3 ppc64 for bug 277296
diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 0a837c0da71b..63e977496d82 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,7 +1,9 @@
+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-open_missing_mode.patch 625 RMD160 9bc96776088d33c347bd1bcb2b29b62f9173d348 SHA1 e680a22e24d5f48d1f1604e8d9e55d645cffd117 SHA256 be35690de1d1f70045a97903cfba253923ec0a86d7f7fc6e47e31dee8c03ce0c
 DIST ettercap-NG-0.7.3.tar.gz 1138643 RMD160 f4e6c0d87b2064b3775e9af60f34575273742616 SHA1 7a2c3f848ca4f39c07fddeb0d6308641265bc4ff SHA256 c74239052d62565c13a82f9bbf217a4fdcce4b34949e361b53bb3f28e3168543
 EBUILD ettercap-0.7.3-r2.ebuild 1609 RMD160 7d706e68550d31c90d87f57490fd79669cb819f3 SHA1 f25dcb74141bb78409f94770cd884c4b57530010 SHA256 63f600d4561c630636826d3ff4b90f26d60f91a5a957b012ad1168299fa1ef5d
 EBUILD ettercap-0.7.3-r3.ebuild 1725 RMD160 916aec20e3f4e132111c616c0cd4b0077da62539 SHA1 e2de81cb08a4577f52b79b2acf844cb5f2d83b77 SHA256 19421abc8be216b2edd6256e88b00ac2784e91e3bcc71beb7182195a1e8713ec
-MISC ChangeLog 8952 RMD160 13c0cdb7d671b19bb29faf42ef2f76876eb60dcd SHA1 b22d9c59dd39c123788a8ca50766e49a104e3f2a SHA256 5260be21dd5705f8e24299e2c3b19983afd857e37788690f986924934fde7f63
+EBUILD ettercap-0.7.3-r4.ebuild 1875 RMD160 984b125fea4de05b835e25ce4bbefea664349ae1 SHA1 fe7b3caa481e13e78176b57506495f64536133e5 SHA256 a7cd10fa35041c0850090d6c1ef4471dffa645f36cbe212dd0c1aa9ac5957049
+MISC ChangeLog 9261 RMD160 eae0a28811d9a20323b7541fcae5b35bb52fe238 SHA1 2010126eb9461cfe604a7a95e968a26d5fc08ac6 SHA256 0353f384ed648d403e4e2b69dd509482884c9933892baa2e0c720541cd272989
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
diff --git a/net-analyzer/ettercap/ettercap-0.7.3-r4.ebuild b/net-analyzer/ettercap/ettercap-0.7.3-r4.ebuild
new file mode 100644
index 000000000000..2439f4ba11b7
--- /dev/null
+++ b/net-analyzer/ettercap/ettercap-0.7.3-r4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ettercap/ettercap-0.7.3-r4.ebuild,v 1.1 2009/10/17 18:27:12 hwoarang Exp $
+
+# the actual version is "NG-0.7.0" but I suppose portage people will not be
+# happy with it (as for the 0.6.b version), so let's set it to "0.7.0".
+# since 'ettercap NG' has to be intended as an upgrade to 0.6.x series and not as
+# a new project or branch, this will be fine...
+
+WANT_AUTOMAKE="1.8"
+
+# libtool is needed because it provides libltdl (needed for plugins)
+inherit autotools flag-o-matic libtool
+
+MY_P="${PN}-NG-${PV}"
+DESCRIPTION="A suite for man in the middle attacks and network mapping"
+HOMEPAGE="http://ettercap.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug gtk ncurses ssl"
+
+RDEPEND=">=net-libs/libnet-1.1.2.1-r1
+	net-libs/libpcap
+	ncurses? ( sys-libs/ncurses )
+	ssl? ( dev-libs/openssl )
+	gtk? ( >=x11-libs/gtk+-2.2.2 )"
+DEPEND=${RDEPEND}
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -e 's:-Werror ::' -i configure.in
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-open_missing_mode.patch
+	#patch from Timothy Redaelli <timothy@redaelli.eu> which fixes crash
+	# on 64bit CPU systems
+	epatch "${FILESDIR}"/${P}-64bit-casting.patch
+	eautoreconf
+}
+
+src_compile() {
+	strip-flags
+
+	append-flags "-DLTDL_SHLIB_EXT='\".so\"'" #272681
+
+	local myconf
+	if use ssl; then
+		myconf="${myconf} --with-openssl=/usr"
+	else
+		myconf="${myconf} --without-openssl"
+	fi
+
+	econf ${myconf} \
+		$(use_enable gtk) \
+		$(use_enable debug) \
+		$(use_with ncurses)
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+}
diff --git a/net-analyzer/ettercap/files/ettercap-0.7.3-64bit-casting.patch b/net-analyzer/ettercap/files/ettercap-0.7.3-64bit-casting.patch
new file mode 100644
index 000000000000..3f0c7bf7912c
--- /dev/null
+++ b/net-analyzer/ettercap/files/ettercap-0.7.3-64bit-casting.patch
@@ -0,0 +1,19 @@
+commit 8cdf08d401d368d5678f9d9c2cf36ddbdef03aec
+Author: Timothy Redaelli <timothy@redaelli.eu>
+Date:   Tue Jun 23 09:16:27 2009 +0000
+
+    Fix a crash in 64 bit CPUs
+
+diff --git a/src/protocols/ec_tcp.c b/src/protocols/ec_tcp.c
+index ea0c997..be8f3e0 100644
+--- a/src/protocols/ec_tcp.c
++++ b/src/protocols/ec_tcp.c
+@@ -116,7 +116,7 @@ FUNC_DECODER(decode_tcp)
+    tcp = (struct tcp_header *)DECODE_DATA;
+    
+    opt_start = (u_char *)(tcp + 1);
+-   opt_end = (u_char *)((int)tcp + tcp->off * 4);
++   opt_end = (u_char *)(tcp + tcp->off * 4);
+ 
+    DECODED_LEN = (u_int32)(tcp->off * 4);
+