network/etherape: Updated for version 0.9.15.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 20 insertions, 25 deletions

diff --git a/network/etherape/README b/network/etherape/README
index e7613bf2fc..b87bb97581 100644
--- a/network/etherape/README
+++ b/network/etherape/README
@@ -7,6 +7,5 @@ It supports Ethernet, FDDI, Token Ring, ISDN, PPP and SLIP devices. It
 can filter traffic to be shown, and can read traffic from a file as well
 as live from the network.
 
-To set the kdesu su wrapper when called from the GUI desktop pass
-KDESU=yes to the SlackBuild. This is not the default option, but if not
-enabled etherape will not monitor the ports if not called by root.
+This build will set the kdesu su wrapper when called from the GUI desktop pass.
+if not enabled etherape will not monitor the ports if not called by root.
diff --git a/network/etherape/etherape.SlackBuild b/network/etherape/etherape.SlackBuild
index fcfb472338..c6791865b5 100644
--- a/network/etherape/etherape.SlackBuild
+++ b/network/etherape/etherape.SlackBuild
@@ -4,6 +4,7 @@
 
 # Copyright 2011-2013  Chris Abela, Malta
 # Copyright 2014  Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
+# Copyright 2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,13 +25,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=etherape
-VERSION=${VERSION:-0.9.13}
+VERSION=${VERSION:-0.9.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,10 +42,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-KDESU=${KDESU:-no}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   SLKLDFLAGS=""; LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -81,21 +80,22 @@ LDFLAGS="$SLKLDFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  --disable-scrollkeeper
+  --disable-scrollkeeper \
+  --with-c-ares \
+  --without-help-dir \
+  --without-omf-dir
 
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ABOUT-NLS AUTHORS COPYING ChangeLog FAQ \
-  INSTALL NEWS OVERVIEW README* TODO \
+cp -a ABOUT-NLS AUTHORS COPYING ChangeLog FAQ INSTALL NEWS OVERVIEW README* TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -103,11 +103,7 @@ mkdir -p $PKG/install
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-cd $PKG
-# This might have some security issues, use with care!
-if [ "$KDESU" = yes ] ;then
-  sed -i 's/Exec=etherape/Exec=kdesu etherape/' \
-  usr/share/applications/etherape.desktop
-fi
+sed -i 's/Exec=etherape/Exec=kdesu etherape/' $PKG/usr/share/applications/etherape.desktop
 
+cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/etherape/etherape.info b/network/etherape/etherape.info
index 90dbd4a757..1f52827dd2 100644
--- a/network/etherape/etherape.info
+++ b/network/etherape/etherape.info
@@ -1,10 +1,10 @@
 PRGNAM="etherape"
-VERSION="0.9.13"
+VERSION="0.9.15"
 HOMEPAGE="http://etherape.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/etherape/etherape-0.9.13.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/etherape/etherape-0.9.15.tar.gz"
 MD5SUM="90f3ed3f14594b7b711b6a71fa7cbef9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libgnomeui"
-MAINTAINER="Ryan P.C. McQuen"
-EMAIL="ryanpcmcquen@member.fsf.org"
+REQUIRES="libgnomeui c-ares"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"