From 63dec0b40891462bb85bccd751a93d0d75a4292f Mon Sep 17 00:00:00 2001
From: Kent Fritz
Date: Sat, 28 Feb 2015 03:16:20 +0700
Subject: system/john: Support for AVX instructions, remove MERGEWORDS.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 system/john/README          |  9 ---------
 system/john/john.SlackBuild | 26 +++++++++++++-------------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/system/john/README b/system/john/README
index 1def1f7ff4..574ffb08b1 100644
--- a/system/john/README
+++ b/system/john/README
@@ -3,14 +3,5 @@ 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.
 
-This script also includes an option to merge the /usr/share/dict/words 
-dictionary into the standard password list, which marginally improves results
-compared with the default password list.  To include this, simply pass
-MERGEWORDS=1 to the build script:
-    MERGEWORDS=1 sh john.SlackBuild
-
-The options can be used in combination as well:
-    MERGEWORDS=1 sh john.SlackBuild
-
 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 035bc8dd1a..1a61781796 100644
--- a/system/john/john.SlackBuild
+++ b/system/john/john.SlackBuild
@@ -8,10 +8,14 @@
 #               Thanks a lot Kent Fritz for patch with many improvements
 # 19/Dec/2011 * Updated for version 1.7.9 and jambo-patch 5
 # 10/Nov/2013 * Updated for version 1.8.0
+# 24/Feb/2015 * Added support for AVX instructions --  thanks to Matthijs
+#               Schuurman for the patch
+#               Also removed "MERGEWORDS" option, as it's harmful for cracking
+#               slow hashes.
 
 PRGNAM=john
 VERSION=${VERSION:-1.8.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -28,7 +32,9 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-  if grep -q ^flags.*sse2 /proc/cpuinfo; then
+  if grep -q ^flags.*avx /proc/cpuinfo; then
+    TARGET=linux-x86-avx
+  elif grep -q ^flags.*sse2 /proc/cpuinfo; then
     TARGET=linux-x86-sse2
   elif grep -q ^flags.*mmx /proc/cpuinfo; then
     TARGET=linux-x86-mmx
@@ -37,7 +43,11 @@ if [ "$ARCH" = "i486" ]; then
   fi
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  TARGET=linux-x86-64
+  if grep -q ^flags.*avx /proc/cpuinfo; then
+    TARGET=linux-x86-64-avx
+  else
+    TARGET=linux-x86-64
+  fi
   LIBDIRSUFFIX="64"
 else
   TARGET=generic
@@ -68,16 +78,6 @@ rm $PKG/usr/share/john/mailer
 
 make -j1 -C src clean $TARGET CFLAGS="-DJOHN_SYSTEMWIDE=1 -c -Wall -O2 -fomit-frame-pointer"
 
-# Merge /usr/share/dict/words into password list?
-if [ "$MERGEWORDS" = "1" ]; then
-  mv run/password.lst run/password.lst.orig
-  grep -h -v '^#!comment:' run/password.lst.orig /usr/share/dict/words | \
-   run/unique run/password.lst
-  cp -a run/password.lst.orig $PKG/usr/share/john
-  cp -a run/password.lst $PKG/usr/share/john
-  chmod 644 $PKG/usr/share/john/password.lst
-fi
-
 mkdir -p $PKG/usr/bin
 cp -a run/$PRGNAM run/mailer $PKG/usr/bin
 ln -s $PRGNAM $PKG/usr/bin/unafs
-- 
cgit v1.2.3