From 417f09168a59788f5f988fdf11ec7d19af2eecfd Mon Sep 17 00:00:00 2001
From: Kent Fritz
Date: Sat, 3 Jun 2017 20:11:37 +0100
Subject: network/hydra: Updated for version 8.5.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 network/hydra/hydra.SlackBuild | 37 +++++++++++++++++++------------------
 network/hydra/hydra.info       |  8 ++++----
 network/hydra/slack-desc       |  2 +-
 3 files changed, 24 insertions(+), 23 deletions(-)

(limited to 'network')

diff --git a/network/hydra/hydra.SlackBuild b/network/hydra/hydra.SlackBuild
index c3e8d04b68..56690b31b7 100644
--- a/network/hydra/hydra.SlackBuild
+++ b/network/hydra/hydra.SlackBuild
@@ -4,14 +4,13 @@
 # Updated by Kent Fritz <fritz.kent@gmail.com>
 
 PRGNAM=hydra
-VERSION=${VERSION:-8.1}
+VERSION=${VERSION:-8.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-XHYDRA=${XHYDRA:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -22,8 +21,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"
@@ -36,28 +35,31 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if [ "$XHYDRA" = "1" ]; then
-    CONFIG_OPTS=""
-    MAKE_OPTS=""
-else
-    CONFIG_OPTS="--disable-xhydra"
-    MAKE_OPTS="XHYDRA_SUPPORT="
-fi
-
 set -e
 
+SRCNAM=thc-$PRGNAM
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$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 {} \;
+
+XHYDRA=${XHYDRA:-1}
+if [ "$XHYDRA" = "1" ]; then
+    CONFIG_OPTS=""
+    MAKE_OPTS=""
+else
+    CONFIG_OPTS="--disable-xhydra"
+    MAKE_OPTS="XHYDRA_SUPPORT="
+fi
 
 echo CONFIG_OPTS is $CONFIG_OPTS
 ./configure $CONFIG_OPTS --prefix=$PKG/usr
@@ -69,7 +71,6 @@ make install
 mkdir -p $PKG/usr/share/$PRGNAM
 mv $PKG/usr/etc/* $PKG/usr/share/$PRGNAM
 rm -rf $PKG/usr/etc
-
 #  Fix paths in dpl4hydra.sh
 sed -i -e "s|^INSTALLDIR=.*|INSTALLDIR=/usr|" $PKG/usr/bin/dpl4hydra.sh
 sed -i -e "s|^LOCATION=.*|LOCATION=share/$PRGNAM|" $PKG/usr/bin/dpl4hydra.sh
diff --git a/network/hydra/hydra.info b/network/hydra/hydra.info
index 40aba04ffe..864c43b102 100644
--- a/network/hydra/hydra.info
+++ b/network/hydra/hydra.info
@@ -1,8 +1,8 @@
 PRGNAM="hydra"
-VERSION="8.1"
-HOMEPAGE="http://freeworld.thc.org/thc-hydra"
-DOWNLOAD="http://www.thc.org/releases/hydra-8.1.tar.gz"
-MD5SUM="7a20011400c6282603d4b1ae461cabf2"
+VERSION="8.5"
+HOMEPAGE="https://www.thc.org/thc-hydra/"
+DOWNLOAD="https://github.com/vanhauser-thc/thc-hydra/archive/v8.5/thc-hydra-8.5.tar.gz"
+MD5SUM="abb22fea48aa8c8ebbc37bc29770ecbf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/hydra/slack-desc b/network/hydra/slack-desc
index 196282c1ee..2954138598 100644
--- a/network/hydra/slack-desc
+++ b/network/hydra/slack-desc
@@ -14,6 +14,6 @@ hydra: to give researchers and security consultants a way to demonstrate
 hydra: how easy it would be to gain unauthorized access to a remote system.
 hydra: THIS TOOL IS FOR LEGAL PURPOSES ONLY!
 hydra:
-hydra: Homepage: http://freeworld.thc.org/thc-hydra/
+hydra: Homepage: https://www.thc.org/thc-hydra/
 hydra:
 hydra:
-- 
cgit v1.2.3