Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/curlftpfs/PKGBUILD
	core/libcap/PKGBUILD
	core/libsasl/PKGBUILD
	core/udev/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/dbus/PKGBUILD
	extra/fluidsynth/PKGBUILD
	extra/mercurial/PKGBUILD
	extra/redland/PKGBUILD
	extra/soprano/PKGBUILD
	multilib/lib32-curl/PKGBUILD
	multilib/lib32-freetype2/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/wine/PKGBUILD

2 files changed, 74 insertions, 20 deletions

diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD
index 02c688d17..4c26f1985 100644
--- a/extra/ettercap/PKGBUILD
+++ b/extra/ettercap/PKGBUILD
@@ -1,36 +1,51 @@
-# $Id: PKGBUILD 75608 2010-04-01 23:02:08Z giovanni $
+# $Id: PKGBUILD 134606 2011-08-06 11:42:31Z giovanni $
+# Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Kevin Piche <kevin@archlinux.org>
 
 pkgname=ettercap
 pkgver=NG_0.7.3
 _origver=NG-0.7.3
-pkgrel=15
+pkgrel=17
 pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ettercap.sourceforge.net/"
 license=('GPL')
-depends=('ncurses' 'openssl' 'libpcap>=1.0.0' 'zlib' 'pcre' 'libtool>=2.2.4' 'libnet')
-makedepends=('libnet')
+depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet')
+makedepends=('libnet' 'pkgconfig')
+backup=('etc/etter.conf')
 options=(!libtool)
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$_origver.tar.gz
-	01_pointers_and_ints_dont_mix.diff)
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_origver}.tar.gz"
+        01_pointers_and_ints_dont_mix.diff
+        ettercap-NG-0.7.3_dns_support_on_x86_64.patch)
 md5sums=('28fb15cd024162c55249888fe1b97820'
-         'ad235cd90aaa3e168575d06efac4d862')
+         'ad235cd90aaa3e168575d06efac4d862'
+         'f3d66186eece056a6d71453f9f288623')
 
 build() {
   cd ${srcdir}/${pkgname}-${_origver}
+  unset LDFLAGS
 
-  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=$pkgdir install || return 1
-  cd plug-ins
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  chmod 755 ${pkgdir}/usr/lib/ettercap/*
-  chmod 755 ${pkgdir}/usr/bin/ettercap
+  libtoolize --force --copy
+  aclocal
+  autoconf
+
+  patch -Np1 -i ${srcdir}/01_pointers_and_ints_dont_mix.diff
+
+  [ "$CARCH" = "x86_64" ] && patch -Np1 -i ${srcdir}/ettercap-NG-0.7.3_dns_support_on_x86_64.patch
+
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+              --mandir=/usr/share/man \
+              --datarootdir=/usr/share \
+              --enable-plugins \
+              --enable-https \
+              --disable-gtk
+  sed -i 's/LTDL_SHLIB_EXT/\".so\"/' src/ec_plugins.c
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${_origver}
+
+  make DESTDIR=${pkgdir} install
 }
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
new file mode 100644
index 000000000..ed455a878
--- /dev/null
+++ b/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch
@@ -0,0 +1,39 @@
+--- a/configure	2011-08-06 12:50:26.000000000 +0200
++++ b/configure	2011-08-06 13:01:56.000000000 +0200
+@@ -15732,7 +15732,7 @@
+ if ${ac_cv_search_dn_expand+:} false; then :
+ 
+ else
+-  ac_cv_search_dn_expand=no
++  ac_cv_search_dn_expand='-lresolv'
+ fi
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+@@ -15790,14 +15790,14 @@
+  ac_ec_dns=yes
+ 
+ else
+-   if false; then
++if true; then
+   HAVE_DN_EXPAND_TRUE=
+   HAVE_DN_EXPAND_FALSE='#'
+ else
+   HAVE_DN_EXPAND_TRUE='#'
+   HAVE_DN_EXPAND_FALSE=
+ fi
+- ac_ec_dns=no
++ ac_ec_dns=yes
+ fi
+ 
+ 
+--- a/src/ec_log.c	2004-09-30 18:01:45.000000000 +0200
++++ b/src/ec_log.c	2011-08-06 13:04:30.000000000 +0200
+@@ -190,7 +190,7 @@
+       if (fd->cfd == NULL)
+          SEMIFATAL_ERROR("%s", gzerror(fd->cfd, &zerr));
+    } else {
+-      fd->fd = open(filename, O_CREAT | O_TRUNC | O_RDWR | O_BINARY);
++      fd->fd = open(filename, O_CREAT | O_TRUNC | O_RDWR | O_BINARY, 0666);
+       if (fd->fd == -1)
+          SEMIFATAL_ERROR("Can't create %s: %s", filename, strerror(errno));
+    }