network/aircrack-ng: Updated for version 1.4 + new maintainer.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

4 files changed, 89 insertions, 37 deletions

diff --git a/network/aircrack-ng/README b/network/aircrack-ng/README
index f51d5719d7..ed23290bfc 100644
--- a/network/aircrack-ng/README
+++ b/network/aircrack-ng/README
@@ -1,7 +1,12 @@
-aircrack is an 802.11 WEP and WPA-PSK keys cracking program that can recover 
-keys once enough data packets have been captured.  It implements the standard
-FMS attack along with some optimizations like KoreK attacks, thus making the 
-attack much faster compared to other WEP cracking tools. In fact, aircrack is
-a set of tools for auditing wireless networks.
+aircrack-ng is a set of tools for auditing wireless networks.
+It consists of 802.11 packet capture and injection programs,
+an utility for static WEP and WPA-PSK cracking and tools which
+handle (decrypt, convert, merge, etc.) WEP/WPA capture files.
 
-WARNING: Only to be used for surveillance of your own network.  Use with care.
+Some tools are still experimental, and are not built by default.
+To build them run the SlackBuild script like this:
+
+    AIRCRACK_EXPERIMENTAL=yes ./aircrack-ng.SlackBuild
+
+hwloc is an optional dependency that may improve performance on
+SMP systems.
diff --git a/network/aircrack-ng/aircrack-ng.SlackBuild b/network/aircrack-ng/aircrack-ng.SlackBuild
index a86ceac867..7afe223cfc 100644
--- a/network/aircrack-ng/aircrack-ng.SlackBuild
+++ b/network/aircrack-ng/aircrack-ng.SlackBuild
@@ -1,9 +1,30 @@
 #!/bin/sh
+
 # Slackware build script for aircrack-ng
-# Written by Yalla-One <yallaone@gmail.com>
+
+# Originally written by Yalla-One <yallaone@gmail.com>
+# Copyright 2018 Dominik Drobek <dominik.drobek (at) o2.pl>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=aircrack-ng
-VERSION=${VERSION:-1.2_beta1}
+VERSION=${VERSION:-1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -20,17 +41,27 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="AUTHORS ChangeLog INSTALLING LICENSE LICENSE.OpenSSL README VERSION"
-OPT=${OPT:-sqlite=true}
-
-SRCVERSION=$(echo $VERSION | tr _ -)
-
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+# include experimental features and scripts?
+AIRCRACK_EXPERIMENTAL=${AIRCRACK_EXPERIMENTAL:-no}
+
+if [ "$AIRCRACK_EXPERIMENTAL" = "no" ]; then
+    USE_EXPERIMENTAL="--without-experimental --without-ext-scripts"
+else
+    USE_EXPERIMENTAL="--with-experimental --with-ext-scripts"
 fi
 
 set -e
@@ -38,33 +69,49 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVERSION
-tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
-cd $PRGNAM-$SRCVERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 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" \
-make ${OPT}
-make prefix=/usr ${OPT} install DESTDIR=$PKG
+./autogen.sh \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  ${USE_EXPERIMENTAL} \
+  --build=$ARCH-slackware-linux
+
+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
 
-mv $PKG/usr/share/man $PKG/usr/man
 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
-rmdir $PKG/usr/share
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS ChangeLog INSTALLING LICENSE* README VERSION \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# experimental tools seem to ignore docdir option
+if [ "$AIRCRACK_EXPERIMENTAL" != "no" ]; then
+    mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
+    rm -r $PKG/usr/share
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/network/aircrack-ng/aircrack-ng.info b/network/aircrack-ng/aircrack-ng.info
index a48ea60fe4..3cac3f4118 100644
--- a/network/aircrack-ng/aircrack-ng.info
+++ b/network/aircrack-ng/aircrack-ng.info
@@ -1,10 +1,10 @@
 PRGNAM="aircrack-ng"
-VERSION="1.2_beta1"
-HOMEPAGE="http://www.aircrack-ng.org"
-DOWNLOAD="http://download.aircrack-ng.org/aircrack-ng-1.2-beta1.tar.gz"
-MD5SUM="f1cc7e19563bd64964f3584048a1031b"
+VERSION="1.4"
+HOMEPAGE="https://www.aircrack-ng.org"
+DOWNLOAD="https://download.aircrack-ng.org/aircrack-ng-1.4.tar.gz"
+MD5SUM="24e22f6f6eca1e7dc0d203e5719d3e8d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Yalla-One"
-EMAIL="yallaone@gmail.com"
+MAINTAINER="Dominik Drobek"
+EMAIL="dominik.drobek (at) o2.pl"
diff --git a/network/aircrack-ng/slack-desc b/network/aircrack-ng/slack-desc
index 15d6413659..85c0b3c02f 100644
--- a/network/aircrack-ng/slack-desc
+++ b/network/aircrack-ng/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
            |-----handy-ruler------------------------------------------------------|
-aircrack-ng: aircrack-ng (WLAN auditing tool)
+aircrack-ng: aircrack-ng (set of tools for auditing WiFi networks)
+aircrack-ng:
+aircrack-ng: aircrack-ng is a set of tools for auditing wireless networks.
+aircrack-ng: It consists of 802.11 packet capture and injection programs,
+aircrack-ng: an utility for static WEP and WPA-PSK cracking and tools which
+aircrack-ng: handle (decrypt, convert, merge, etc.) WEP/WPA capture files.
+aircrack-ng:
+aircrack-ng: Homepage: https://www.aircrack-ng.org
 aircrack-ng:
-aircrack-ng: aircrack is an 802.11 WEP and WPA-PSK keys cracking program that
-aircrack-ng: can recover keys once enough data packets have been captured.
-aircrack-ng: It implements the standard FMS attack along with some
-aircrack-ng: optimizations like KoreK attacks, thus making the attack much
-aircrack-ng: faster compared to other WEP cracking tools. In fact, aircrack
-aircrack-ng: is a set of tools for auditing wireless networks.
 aircrack-ng:
-aircrack-ng: Homepage: http://www.aircrack-ng.org/
 aircrack-ng: