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

Conflicts:
	community/gcolor2/PKGBUILD
	community/perl-list-moreutils/PKGBUILD
	extra/boost/PKGBUILD
	extra/cdrkit/PKGBUILD
	extra/ettercap/PKGBUILD
	extra/lame/PKGBUILD
	extra/sdl/PKGBUILD
	extra/unzip/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/caribou/PKGBUILD
	gnome-unstable/empathy/PKGBUILD
	gnome-unstable/eog/PKGBUILD
	gnome-unstable/epiphany/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/glibmm/PKGBUILD
	gnome-unstable/gnome-themes-standard/PKGBUILD
	gnome-unstable/gtkmm3/PKGBUILD
	gnome-unstable/yelp/PKGBUILD

5 files changed, 65 insertions, 82 deletions

diff --git a/extra/ettercap/01_pointers_and_ints_dont_mix.diff b/extra/ettercap/01_pointers_and_ints_dont_mix.diff
deleted file mode 100644
index 65571309c..000000000
--- a/extra/ettercap/01_pointers_and_ints_dont_mix.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-See debian bug #521857, patch from Timothy Redaelli <timothy@redaelli.eu>
-Revised by Robert Edmonds <edmonds@debian.org>
-
---- 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 *)(((u_char *)tcp) + tcp->off * 4);
- 
-    DECODED_LEN = (u_int32)(tcp->off * 4);
diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD
index 34d86d7e1..f5490c2c4 100644
--- a/extra/ettercap/PKGBUILD
+++ b/extra/ettercap/PKGBUILD
@@ -1,38 +1,28 @@
-# $Id: PKGBUILD 135334 2011-08-12 21:28:33Z giovanni $
+# $Id: PKGBUILD 137221 2011-09-06 20:08:46Z andrea $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
-pkgname=ettercap
-pkgver=NG_0.7.3
-_origver=NG-0.7.3
-pkgrel=18
-pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
+pkgbase=ettercap
+pkgname=('ettercap' 'ettercap-gtk')
+pkgver=NG_0.7.4.1
+_origver=${pkgver/_/-}
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ettercap.sourceforge.net/"
 license=('GPL')
-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
-        ettercap-NG-0.7.3_dns_support_on_x86_64.patch)
-md5sums=('28fb15cd024162c55249888fe1b97820'
-         'c8f2b004f69ac3522ffebb530478b324'
-         'd44f80292afcefdc13cba9a30c6391d6')
+depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet'
+         'pkgconfig' 'gtk2')
+source=("http://drizztbsd.github.com/${pkgbase}/dist/${pkgbase}-${_origver}.tar.gz"
+        'ettercap.desktop')
+md5sums=('c6ae5f86361a85a8e193051f594a74fa'
+         '6fb03d9c890430d3afa84466bb01781b')
 
 build() {
-  cd ${srcdir}/${pkgname}-${_origver}
-  unset LDFLAGS
-
-  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
+  cd "${srcdir}"
+  
+  cp -r ${pkgbase}-${_origver} ${pkgbase}-${_origver}-gtk
 
+  cd ${pkgbase}-${_origver}
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --mandir=/usr/share/man \
@@ -40,12 +30,37 @@ build() {
               --enable-plugins \
               --enable-https \
               --disable-gtk
-  sed -i 's/LTDL_SHLIB_EXT/\".so\"/' src/ec_plugins.c
   make
+
+  cd ../${pkgbase}-${_origver}-gtk
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+              --mandir=/usr/share/man \
+              --datarootdir=/usr/share \
+              --enable-plugins \
+              --enable-https
+  make
+}
+
+package_ettercap() {
+  pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
+  depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet')
+  backup=('etc/etter.conf')
+  options=('!libtool')
+
+  cd "${srcdir}"/${pkgbase}-${_origver}
+  make DESTDIR="${pkgdir}" install
 }
 
-package() {
-  cd ${srcdir}/${pkgname}-${_origver}
+package_ettercap-gtk() {
+  pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK"
+  depends=('ettercap' 'gtk2' 'gksu')
+  install=ettercap-gtk.install
 
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/${pkgbase}-${_origver}-gtk
+  install -Dm755 src/ettercap "${pkgdir}"/usr/bin/ettercap-gtk
+  install -Dm644 "${srcdir}"/ettercap.desktop \
+    "${pkgdir}"/usr/share/applications/ettercap.desktop
+  install -Dm644 desktop/ettercap.xpm \
+    "${pkgdir}"/usr/share/pixmaps/ettercap.xpm
 }
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
deleted file mode 100644
index 1754f2e3d..000000000
--- a/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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));
-    }
diff --git a/extra/ettercap/ettercap-gtk.install b/extra/ettercap/ettercap-gtk.install
new file mode 100644
index 000000000..1a05f573e
--- /dev/null
+++ b/extra/ettercap/ettercap-gtk.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/ettercap/ettercap.desktop b/extra/ettercap/ettercap.desktop
new file mode 100644
index 000000000..35261ebf4
--- /dev/null
+++ b/extra/ettercap/ettercap.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=ettercap
+GenericName=Ettercap
+Comment=Multipurpose sniffer/interceptor/logger
+Icon=ettercap.xpm
+Exec=gksu "/usr/sbin/ettercap --gtk"
+Terminal=false
+Categories=Application;Network;System;Security;GTK