Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/avr-binutils/PKGBUILD
	community/ettercap/PKGBUILD
	community/python2-traits/PKGBUILD

4 files changed, 36 insertions, 35 deletions

diff --git a/community/ettercap/PKGBUILD b/community/ettercap/PKGBUILD
index a24c74cda..e8646e4d6 100644
--- a/community/ettercap/PKGBUILD
+++ b/community/ettercap/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87630 2013-04-04 10:17:39Z jelle $
+# $Id: PKGBUILD 88226 2013-04-14 19:02:25Z jelle $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=ettercap
 pkgname=('ettercap' 'ettercap-gtk')
 pkgver=0.7.6
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ettercap.github.com/ettercap/"
 license=('GPL')
@@ -13,7 +13,9 @@ 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')
+md5sums=('7c5f5e1fd4002afdfd13765ef92866e1'
+         '51ae9f08e37a0621b3caeedb8e4d47d7'
+         '473867a0ee6da9cfb048b3d332c3d71f')
 build() {
   cd "${srcdir}"
 
@@ -43,31 +45,29 @@ package_ettercap() {
 
 package_ettercap-gtk() {
   pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK frontend"
-  depends+=('gtk2')
+  depends+=('gtk2' 'polkit')
   backup=('etc/ettercap/etter.conf')
   conflicts=('ettercap')
   provides=('ettercap')
-#install='ettercap-gtk.install'
+  optdepends=('polkit-gnome')
+  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 -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
 
 }
-md5sums=('7c5f5e1fd4002afdfd13765ef92866e1'
-         '21fe8aee8c7eb34bd5757a4de485ca06'
-         'd20a6137008edd3fae01757cb193b870')
diff --git a/community/ettercap/ettercap-gtk.install b/community/ettercap/ettercap-gtk.install
index 100a94efe..e8f6bed8f 100644
--- a/community/ettercap/ettercap-gtk.install
+++ b/community/ettercap/ettercap-gtk.install
@@ -1,14 +1,14 @@
 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.'
+  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() {
-  post_install
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_remove() {
-  post_install
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
diff --git a/community/ettercap/ettercap.desktop b/community/ettercap/ettercap.desktop
index 7ea54b7c7..71f8c8ce8 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
+Exec=ettercap -G
 Icon=ettercap
 Terminal=false
 Type=Application
diff --git a/community/ettercap/org.archlinux.pkexec.ettercap.policy b/community/ettercap/org.archlinux.pkexec.ettercap.policy
index 101b11a0f..7908d7232 100644
--- a/community/ettercap/org.archlinux.pkexec.ettercap.policy
+++ b/community/ettercap/org.archlinux.pkexec.ettercap.policy
@@ -1,18 +1,19 @@
 <?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">
+ "-//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>
+  <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>