From 173412327ecd7ad886616711f0561b4e9fc1a196 Mon Sep 17 00:00:00 2001
From: Kent Fritz <fritz.kent@gmail.com>
Date: Wed, 9 Sep 2020 21:43:37 +0100
Subject: system/john: Updated for version 1.9.0.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>
---
 system/john/README          | 13 +++++++------
 system/john/john.SlackBuild |  9 ++++-----
 system/john/john.info       |  8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'system/john')

diff --git a/system/john/README b/system/john/README
index 574ffb08b1..543e12c8e7 100644
--- a/system/john/README
+++ b/system/john/README
@@ -1,7 +1,8 @@
-John the Ripper is a fast password cracker.  Its primary purpose is to detect 
-weak passwords.  Besides several crypt(3) password hash types most commonly 
-found on various Unix flavors, supported out of the box are Kerberos AFS and 
-Windows NT/2000/XP/2003 LM hashes, plus several more with contributed patches.
+John the Ripper is a fast password cracker.  Its primary purpose is to
+detect weak passwords.  Besides several crypt(3) password hash types
+most commonly found on various Unix flavors, supported out of the box
+are Kerberos AFS and Windows NT/2000/XP/2003 LM hashes, plus several
+more with contributed patches.
 
-For more information, consult the project's homepage and/or the documentation 
-installed in /usr/doc/john-1.8.0
+For more information, consult the project's homepage and/or the
+documentation installed in /usr/doc/john-1.8.0
diff --git a/system/john/john.SlackBuild b/system/john/john.SlackBuild
index 1a61781796..cfe21faaee 100644
--- a/system/john/john.SlackBuild
+++ b/system/john/john.SlackBuild
@@ -14,8 +14,8 @@
 #               slow hashes.
 
 PRGNAM=john
-VERSION=${VERSION:-1.8.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.9.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -44,6 +44,8 @@ if [ "$ARCH" = "i486" ]; then
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   if grep -q ^flags.*avx /proc/cpuinfo; then
+    TARGET=linux-x86-64-avx2
+  elif grep -q ^flags.*avx /proc/cpuinfo; then
     TARGET=linux-x86-64-avx
   else
     TARGET=linux-x86-64
@@ -61,9 +63,6 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 
-# Soft-link in tarball causes x bit to be set below; nuke it
-rm -f $PRGNAM-$VERSION/README
-
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/john/john.info b/system/john/john.info
index 9fb3c8e148..20697b1107 100644
--- a/system/john/john.info
+++ b/system/john/john.info
@@ -1,8 +1,8 @@
 PRGNAM="john"
-VERSION="1.8.0"
-HOMEPAGE="http://www.openwall.com/john/"
-DOWNLOAD="http://www.openwall.com/john/j/john-1.8.0.tar.xz"
-MD5SUM="a4086df68f51778782777e60407f1869"
+VERSION="1.9.0"
+HOMEPAGE="https://www.openwall.com/john/"
+DOWNLOAD="https://www.openwall.com/john/k/john-1.9.0.tar.xz"
+MD5SUM="494b5e6d672ff100fb9fb54c4fb6ed3e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3