Fri Apr 5 00:06:03 PDT 2013

4 files changed, 49 insertions, 7 deletions

diff --git a/community/ettercap/PKGBUILD b/community/ettercap/PKGBUILD
index f9c048453..dcafef450 100644
--- a/community/ettercap/PKGBUILD
+++ b/community/ettercap/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 84410 2013-02-18 19:27:41Z jelle $
+# $Id: PKGBUILD 87630 2013-04-04 10:17:39Z jelle $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=ettercap
 pkgname=('ettercap' 'ettercap-gtk')
-pkgver=0.7.5.3
-pkgrel=2
+pkgver=0.7.6
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://ettercap.github.com/ettercap/"
 license=('GPL')
+depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet')
 makedepends=('ghostscript' 'cmake' 'libpcap' 'libltdl' 'libnet' 'gtk2')
 options=('!libtool' '!makeflags' '!emptydirs')
-source=("http://sourceforge.net/projects/ettercap/files/ettercap/0.7.5-Assimilation/$pkgname-$pkgver.tar.gz")
-md5sums=('784b5cf2493246e95943179b21f70645')
+source=("https://github.com/Ettercap/ettercap/archive/v$pkgver.tar.gz" "ettercap.desktop" "org.archlinux.pkexec.ettercap.policy")
+md5sums=('7c5f5e1fd4002afdfd13765ef92866e1')
 build() {
   cd "${srcdir}"
 
@@ -33,7 +34,6 @@ build() {
 
 package_ettercap() {
   pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
-  depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet')
   backup=('etc/ettercap/etter.conf')
   conflicts=('ettercap-gtk')
 
@@ -47,7 +47,27 @@ package_ettercap-gtk() {
   backup=('etc/ettercap/etter.conf')
   conflicts=('ettercap')
   provides=('ettercap')
+#install='ettercap-gtk.install'
 
+  install -d $pkgdir/usr/share/polkit-1/actions/
   cd "${srcdir}"/${pkgbase}-${pkgver}-gtk/build
   make DESTDIR="${pkgdir}" install
+
+#  install -Dm644 "${srcdir}/ettercap.desktop" "${pkgdir}/usr/share/applications/ettercap.desktop"
+#  install -Dm644 "${srcdir}/${pkgbase}-${pkgver}-gtk/desktop/ettercap.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/ettercap.svg"
+
+  # Install policy file
+#  install -Dm644 "${srcdir}/org.archlinux.pkexec.ettercap.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.ettercap.policy"
+
+  # We need rename the original script
+#  mv "${pkgdir}/usr/bin/ettercap" "${pkgdir}/usr/bin/ettercap.elf"
+
+  # Install launcher script
+#  echo '#!/bin/sh' > ${pkgdir}/usr/bin/ettercap
+#echo 'pkexec --disable-internal-agent "/usr/bin/ettercap.elf" "$@"' >> ${pkgdir}/usr/bin/ettercap
+#  chmod 755 ${pkgdir}/usr/bin/ettercap
+
 }
+md5sums=('7c5f5e1fd4002afdfd13765ef92866e1'
+         '21fe8aee8c7eb34bd5757a4de485ca06'
+         'd20a6137008edd3fae01757cb193b870')
diff --git a/community/ettercap/ettercap-gtk.install b/community/ettercap/ettercap-gtk.install
index 0b09f5904..100a94efe 100644
--- a/community/ettercap/ettercap-gtk.install
+++ b/community/ettercap/ettercap-gtk.install
@@ -1,4 +1,8 @@
 post_install() {
+      gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+      echo 'If you use a lightweight windowmanager, remember to run'
+      echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable'
+      echo 'graphical authentication, which may be needed for pkexec to work.'
 }
 
 post_upgrade() {
diff --git a/community/ettercap/ettercap.desktop b/community/ettercap/ettercap.desktop
index e2345d91a..7ea54b7c7 100644
--- a/community/ettercap/ettercap.desktop
+++ b/community/ettercap/ettercap.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Ettercap
 Comment=Nework sniffer/analyser
-Exec=ettercap-gtk
+Exec=ettercap
 Icon=ettercap
 Terminal=false
 Type=Application
diff --git a/community/ettercap/org.archlinux.pkexec.ettercap.policy b/community/ettercap/org.archlinux.pkexec.ettercap.policy
new file mode 100644
index 000000000..101b11a0f
--- /dev/null
+++ b/community/ettercap/org.archlinux.pkexec.ettercap.policy
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+<action id="com.archlinux.pkexec.ettercap">
+<message gettext-domain="ettercap"> Authentication is required to run the Ettercap</message>
+<icon_name>ettercap</icon_name>
+<defaults>
+<allow_any > auth_admin < /allow_any>
+<allow_inactive>auth_admin</allow_inactive>
+<allow_active>auth_admin</allow_active>
+</defaults>
+<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/ettercap.elf</annotate>
+<annotate key="org.freedesktop.policykit.exec.allow_gui">true< /annotate>
+</action>
+</policyconfig>