[arch-commits] Commit in ettercap-gtk/trunk (PKGBUILD fix-segmentation-fault.patch)

[Andrea Scarpino]

    Date: Tuesday, December 21, 2010 @ 05:37:25
  Author: andrea
Revision: 103538

upgpkg: ettercap-gtk NG_0.7.3-8
fix segmentation fault on x86_64 and build (FS#21628); remove useless configure option; use package()

Added:
  ettercap-gtk/trunk/fix-segmentation-fault.patch
Modified:
  ettercap-gtk/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   43 ++++++++++++++++++++++++++---------------
 fix-segmentation-fault.patch |   19 ++++++++++++++++++
 2 files changed, 47 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-21 09:31:31 UTC (rev 103537)
+++ PKGBUILD	2010-12-21 10:37:25 UTC (rev 103538)
@@ -1,31 +1,44 @@
 # $Id$
+# Maintainer: Hugo Doria <hugo at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-# Maintainer: Hugo Doria <hugo at archlinux.org>
 
 pkgname=ettercap-gtk
 pkgver=NG_0.7.3
 _origname=ettercap
 _origver=NG-0.7.3
-pkgrel=7
+pkgrel=8
 pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK"
 arch=('i686' 'x86_64')
 url="http://ettercap.sourceforge.net/"
 license=('GPL')
-# Other deps are included by ettercap.
-depends=("ettercap" 'gtk2' 'libtool')
+depends=('ettercap' 'gtk2' 'libtool')
 makedepends=('libnet')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/${_origname}/${_origname}-${_origver}.tar.gz 
-        ettercap.desktop)
-md5sums=('28fb15cd024162c55249888fe1b97820' '6ef18fdd114297d4ed9e5104d309f071')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/${_origname}/${_origname}-${_origver}.tar.gz 
+        'ettercap.desktop'
+        'fix-segmentation-fault.patch')
+md5sums=('28fb15cd024162c55249888fe1b97820'
+        '6ef18fdd114297d4ed9e5104d309f071'
+        'e9cc99f13fd23edaba6cddffc4d0ef34')
 
 build() {
-  cd ${srcdir}/${_origname}-${_origver} || return 1
+  cd ${srcdir}/${_origname}-${_origver}
   unset LDFLAGS
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-plugins --enable-https
-  make || return 1
-  install -D ${srcdir}/${_origname}-${_origver}/src/ettercap \
-             ${pkgdir}/usr/bin/ettercap-gtk || return 1
-  install -D ${srcdir}/ettercap.desktop \
-             ${pkgdir}/usr/share/applications/ettercap.desktop || return 1
+
+  # FS#21628
+  patch -Np1 -i ${srcdir}/fix-segmentation-fault.patch
+
+  libtoolize --force --copy
+  aclocal
+  autoconf
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-plugins
+  sed -i 's/LTDL_SHLIB_EXT/\".so\"/' src/ec_plugins.c
+  make
 }
+
+package() {
+  install -Dm755 ${srcdir}/${_origname}-${_origver}/src/ettercap \
+    ${pkgdir}/usr/bin/ettercap-gtk
+  install -Dm644 ${srcdir}/ettercap.desktop \
+    ${pkgdir}/usr/share/applications/ettercap.desktop
+}

Added: fix-segmentation-fault.patch
===================================================================
--- fix-segmentation-fault.patch	                        (rev 0)
+++ fix-segmentation-fault.patch	2010-12-21 10:37:25 UTC (rev 103538)
@@ -0,0 +1,19 @@
+commit 8cdf08d401d368d5678f9d9c2cf36ddbdef03aec
+Author: Timothy Redaelli <timothy at 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);
+