3 files changed, 16 insertions, 44 deletions
diff --git a/community/ettercap/PKGBUILD b/community/ettercap/PKGBUILD
index e8646e4d6..4dee9d221 100644
--- a/community/ettercap/PKGBUILD
+++ b/community/ettercap/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 88226 2013-04-14 19:02:25Z jelle $
+# $Id: PKGBUILD 97482 2013-09-21 10:35:04Z jelle $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=ettercap
 pkgname=('ettercap' 'ettercap-gtk')
-pkgver=0.7.6
-pkgrel=2
+pkgver=0.8.0
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 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=("https://github.com/Ettercap/ettercap/archive/v$pkgver.tar.gz" "ettercap.desktop" "org.archlinux.pkexec.ettercap.policy")
-md5sums=('7c5f5e1fd4002afdfd13765ef92866e1'
-         '51ae9f08e37a0621b3caeedb8e4d47d7'
-         '473867a0ee6da9cfb048b3d332c3d71f')
+source=("https://github.com/Ettercap/ettercap/archive/v$pkgver.tar.gz")
+md5sums=('067514bb53ff76b81d578676e2048319')
+
 build() {
   cd "${srcdir}"
 
@@ -24,13 +23,13 @@ build() {
   cd ${pkgbase}-${pkgver}
   mkdir build
   cd build
-  cmake -D ENABLE_GTK=OFF -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../
+  cmake -D ENABLE_GTK=OFF -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release ../
   make
 
   cd "$srcdir"/${pkgbase}-${pkgver}-gtk
   mkdir build
   cd build
-  cmake -D ENABLE_GTK=ON -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../
+  cmake -D ENABLE_GTK=ON -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release ../
   make
 }
 
@@ -45,7 +44,7 @@ package_ettercap() {
 
 package_ettercap-gtk() {
   pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK frontend"
-  depends+=('gtk2' 'polkit')
+  depends+=('gtk2')
   backup=('etc/ettercap/etter.conf')
   conflicts=('ettercap')
   provides=('ettercap')
@@ -56,18 +55,18 @@ package_ettercap-gtk() {
   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 -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"
+  #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"
+  #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
+  #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
 
 }
diff --git a/community/ettercap/ettercap.desktop b/community/ettercap/ettercap.desktop
deleted file mode 100644
index 71f8c8ce8..000000000
--- a/community/ettercap/ettercap.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Ettercap
-Comment=Nework sniffer/analyser
-Exec=ettercap -G
-Icon=ettercap
-Terminal=false
-Type=Application
-Categories=Network;
diff --git a/community/ettercap/org.archlinux.pkexec.ettercap.policy b/community/ettercap/org.archlinux.pkexec.ettercap.policy
deleted file mode 100644
index 7908d7232..000000000
--- a/community/ettercap/org.archlinux.pkexec.ettercap.policy
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="org.archlinux.pkexec.ettercap">
-    <message>Authentication is required to run 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>