network/kismet: Updated for version 2016_07_R1.

Signed-off-by: Audrius Kažukauskas <audrius@neutrino.lt>

4 files changed, 22 insertions, 20 deletions

diff --git a/network/kismet/README b/network/kismet/README
index 828234426d8e..3620ea1ab5db 100644
--- a/network/kismet/README
+++ b/network/kismet/README
@@ -1,16 +1,17 @@
 Kismet is an 802.11 layer2 wireless network detector, sniffer, and
-intrusion detection system.  Kismet will work with any wireless card which
-supports raw monitoring (rfmon) mode, and (with appropriate hardware)
-can sniff 802.11b, 802.11a, 802.11g, and 802.11n traffic.  Kismet also
-supports plugins which allow sniffing other media such as DECT.
+intrusion detection system.  Kismet will work with any wireless card
+which supports raw monitoring (rfmon) mode, and (with appropriate
+hardware) can sniff 802.11b, 802.11a, 802.11g, and 802.11n traffic.
+Kismet also supports plugins which allow sniffing other media such as
+DECT.
 
 Kismet identifies networks by passively collecting packets and detecting
 standard named networks, detecting (and given time, decloaking) hidden
 networks, and inferring the presence of nonbeaconing networks via data
 traffic.
 
-This script requires a 'kismet' group to exist before running.
-The recommended GID is 234.  You can create it like this: groupadd -g
-234 kismet
+This script requires a 'kismet' group to exist before running.  The
+recommended GID is 234.  You can create it like this:
+groupadd -g 234 kismet
 
 After installation, add user to kismet group and re-login.
diff --git a/network/kismet/doinst.sh b/network/kismet/doinst.sh
index f9e45084c646..19a6ff6ac854 100644
--- a/network/kismet/doinst.sh
+++ b/network/kismet/doinst.sh
@@ -4,7 +4,8 @@ config() {
   # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
     rm $NEW
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
diff --git a/network/kismet/kismet.SlackBuild b/network/kismet/kismet.SlackBuild
index 53794e9fa2b1..447db15f774c 100644
--- a/network/kismet/kismet.SlackBuild
+++ b/network/kismet/kismet.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2007 Robby Workman <rworkman@slackbuilds.org>
 # Copyright 2010 Antonio Hernández Blas <hba.nihilismus@gmail.com>
-# Copyright 2013 Audrius Kažukauskas <audrius@neutrino.lt>
+# Copyright 2013-2017 Audrius Kažukauskas <audrius@neutrino.lt>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kismet
-VERSION=${VERSION:-2013_03_R1b}
+VERSION=${VERSION:-2016_07_R1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -33,7 +33,7 @@ SRCVERSION=$(echo $VERSION | tr _ -)
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,7 +60,7 @@ fi
 
 # Bail if group isn't valid on your system.
 # gid=234 is suggested to avoid conflicts with other SBo packages,
-# but it's your call: http://slackbuilds.org/uid_gid.txt
+# but it's your call: https://slackbuilds.org/uid_gid.txt
 if ! grep -q "^kismet:" /etc/group; then
   printf "\n\tYou must have a kismet group to run this script.\n"
   printf "\tSomething like this should suffice for most systems:\n"
@@ -84,7 +84,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -103,14 +103,14 @@ make plugins -j1
 make suidinstall MANGRP=root DESTDIR=$PKG
 make plugins-install MANGRP=root 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 CHANGELOG README *.txt docs/* patches/ $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG README RELEASENOTES.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/kismet/kismet.info b/network/kismet/kismet.info
index abf2d12461fe..2d0c322ada2c 100644
--- a/network/kismet/kismet.info
+++ b/network/kismet/kismet.info
@@ -1,8 +1,8 @@
 PRGNAM="kismet"
-VERSION="2013_03_R1b"
+VERSION="2016_07_R1"
 HOMEPAGE="https://kismetwireless.net/"
-DOWNLOAD="https://kismetwireless.net/code/kismet-2013-03-R1b.tar.xz"
-MD5SUM="596acdd2940887dd05a498ea27475eea"
+DOWNLOAD="https://kismetwireless.net/code/kismet-2016-07-R1.tar.xz"
+MD5SUM="7fa6e86c5078a0e7d91fc9bf954c5107"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""