[arch-commits] Commit in ettercap/repos (3 files)

[Ionut Biru]

    Date: Friday, February 5, 2010 @ 20:24:16
  Author: ibiru
Revision: 67298

Merged revisions 67296 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/ettercap/trunk

........
  r67296 | ibiru | 2010-02-06 03:22:52 +0200 (Sat, 06 Feb 2010) | 2 lines
  
  upgpkg: ettercap NG_0.7.3-14
      FS#17596 fix segfaults when trying to scan for hosts, debian patch
........

Added:
  ettercap/repos/extra-x86_64/01_pointers_and_ints_dont_mix.diff
    (from rev 67296, ettercap/trunk/01_pointers_and_ints_dont_mix.diff)
Modified:
  ettercap/repos/extra-x86_64/	(properties)
  ettercap/repos/extra-x86_64/PKGBUILD

------------------------------------+
 01_pointers_and_ints_dont_mix.diff |   12 ++++++++++++
 PKGBUILD                           |   14 ++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)


Property changes on: ettercap/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /ettercap/trunk:1-54012
   + /ettercap/trunk:1-67297

Copied: ettercap/repos/extra-x86_64/01_pointers_and_ints_dont_mix.diff (from rev 67296, ettercap/trunk/01_pointers_and_ints_dont_mix.diff)
===================================================================
--- extra-x86_64/01_pointers_and_ints_dont_mix.diff	                        (rev 0)
+++ extra-x86_64/01_pointers_and_ints_dont_mix.diff	2010-02-06 01:24:16 UTC (rev 67298)
@@ -0,0 +1,12 @@
+See debian bug #521857, patch from Timothy Redaelli <timothy at redaelli.eu>
+
+--- ettercap-0.7.3.orig/src/protocols/ec_tcp.c
++++ ettercap-0.7.3/src/protocols/ec_tcp.c
+@@ -116,7 +116,7 @@
+    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);

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2010-02-06 01:23:27 UTC (rev 67297)
+++ extra-x86_64/PKGBUILD	2010-02-06 01:24:16 UTC (rev 67298)
@@ -5,7 +5,7 @@
 pkgname=ettercap
 pkgver=NG_0.7.3
 _origver=NG-0.7.3
-pkgrel=13
+pkgrel=14
 pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
 arch=('i686' 'x86_64')
 url="http://ettercap.sourceforge.net/"
@@ -13,15 +13,21 @@
 depends=('ncurses' 'openssl' 'libpcap>=1.0.0' 'zlib' 'pcre' 'libtool>=2.2.4' 'libnet')
 makedepends=('libnet')
 options=(!libtool)
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$_origver.tar.gz)
-md5sums=('28fb15cd024162c55249888fe1b97820')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$_origver.tar.gz
+	01_pointers_and_ints_dont_mix.diff)
+md5sums=('28fb15cd024162c55249888fe1b97820'
+         'ad235cd90aaa3e168575d06efac4d862')
 
 build() {
   cd ${srcdir}/${pkgname}-${_origver}
+
+  export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
+  patch -Np1 -i ${srcdir}/01_pointers_and_ints_dont_mix.diff || return 1
+
   ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-plugins \
       --enable-https --disable-gtk
   make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+  make DESTDIR=$pkgdir install || return 1
   cd plug-ins
   make || return 1
   make DESTDIR=${pkgdir} install || return 1