diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-15 11:25:44 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-15 11:25:44 -0300 |
| commit | d3a18c96784861f4671d9575d71cb96041bc4fab (patch) | |
| tree | 27e73dccc79fb400f2bd2a855fd523dd8e704db8 /extra/ettercap | |
| parent | 1b8314826a584ddba121a6cb764efd44c784c53e (diff) | |
| parent | 4784cc8068c68b6fc23c2bd0ee8158b2a924f5f4 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dopewars/PKGBUILD
community/flightgear/PKGBUILD
extra/bmp/PKGBUILD
extra/qemu/PKGBUILD
extra/sbcl/PKGBUILD
Diffstat (limited to 'extra/ettercap')
| -rw-r--r-- | extra/ettercap/01_pointers_and_ints_dont_mix.diff | 7 | ||||
| -rw-r--r-- | extra/ettercap/PKGBUILD | 8 | ||||
| -rw-r--r-- | extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/extra/ettercap/01_pointers_and_ints_dont_mix.diff b/extra/ettercap/01_pointers_and_ints_dont_mix.diff index bf7022266..65571309c 100644 --- a/extra/ettercap/01_pointers_and_ints_dont_mix.diff +++ b/extra/ettercap/01_pointers_and_ints_dont_mix.diff @@ -1,12 +1,13 @@ See debian bug #521857, patch from Timothy Redaelli <timothy@redaelli.eu> +Revised by Robert Edmonds <edmonds@debian.org> ---- ettercap-0.7.3.orig/src/protocols/ec_tcp.c -+++ ettercap-0.7.3/src/protocols/ec_tcp.c +--- a/src/protocols/ec_tcp.c ++++ b/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); ++ opt_end = (u_char *)(((u_char *)tcp) + tcp->off * 4); DECODED_LEN = (u_int32)(tcp->off * 4); diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD index 4c26f1985..34d86d7e1 100644 --- a/extra/ettercap/PKGBUILD +++ b/extra/ettercap/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 134606 2011-08-06 11:42:31Z giovanni $ +# $Id: PKGBUILD 135334 2011-08-12 21:28:33Z giovanni $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=ettercap pkgver=NG_0.7.3 _origver=NG-0.7.3 -pkgrel=17 +pkgrel=18 pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console" arch=('i686' 'x86_64' 'mips64el') url="http://ettercap.sourceforge.net/" @@ -18,8 +18,8 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_origver}.tar. 01_pointers_and_ints_dont_mix.diff ettercap-NG-0.7.3_dns_support_on_x86_64.patch) md5sums=('28fb15cd024162c55249888fe1b97820' - 'ad235cd90aaa3e168575d06efac4d862' - 'f3d66186eece056a6d71453f9f288623') + 'c8f2b004f69ac3522ffebb530478b324' + 'd44f80292afcefdc13cba9a30c6391d6') build() { cd ${srcdir}/${pkgname}-${_origver} diff --git a/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch b/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch index ed455a878..1754f2e3d 100644 --- a/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch +++ b/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch @@ -14,7 +14,7 @@ else - if false; then -+if true; then ++ if true; then HAVE_DN_EXPAND_TRUE= HAVE_DN_EXPAND_FALSE='#' else |