fix 64bit seg fault ( bug #288348 )

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 96 insertions, 1 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/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);
+