7 files changed, 79 insertions, 65 deletions
diff --git a/system/john/README b/system/john/README
index 40b9ad639f..730f6eb0ba 100644
--- a/system/john/README
+++ b/system/john/README
@@ -3,13 +3,25 @@ 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 includes an option to apply Ryan Lim's patch for JTR to support
-MPI.  MPI allows you to use multiple processors on a system or even a cluster 
-of systems for cracking passwords using JTR.  If you decide to apply this, you
-will also need openmpi installed.  JTR's author does not recommend using the
-patch, so use it at your own risk - for more information, see this link:
-  http://www.openwall.com/lists/john-users/2005/08/24/4
-This script also contains an optional "jumbo" patch, which enables processing 
-of many password hash types and ciphers that are not otherwise supported.
-
-Note this will not build in parallel; unset MAKEFLAGS if you have problems.
+This script includes an option to apply the community-enhanced "Jumbo" patch, 
+which integrates lots of contributed patches adding support for over 40
+additional hash and cipher types (including popular ones such as NTLM, raw MD5,
+etc.), as well as some optimizations and features. Unfortunately, its overall
+quality is lower than the official version's.  To include the Jumbo patch, 
+simply pass JUMBO=1 to the build script:
+    JUMBO=1 sh john.SlackBuild
+
+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:
+    JUMBO=1 MERGEWORDS=1 sh john.SlackBuild
+
+For more information, consult the documentation installed in:
+    /usr/doc/john-1.7.8
+and, of course, the John the Ripper homepage:
+    http://www.openwall.com/john
+
diff --git a/system/john/john-1.7.3.1-all-2.diff.gz b/system/john/john-1.7.3.1-all-2.diff.gz
deleted file mode 100644
index 3307502ab0..0000000000
--- a/system/john/john-1.7.3.1-all-2.diff.gz
+++ /dev/null
diff --git a/system/john/john-1.7.3.1-all-2.diff.gz.asc b/system/john/john-1.7.3.1-all-2.diff.gz.asc
deleted file mode 100644
index a6748cb75c..0000000000
--- a/system/john/john-1.7.3.1-all-2.diff.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEABECAAYFAkj7xF0ACgkQA2jvV5x7o7bWygCfZDMhpZ1PIA7Xlnqak8Q6yoAA
-HfwAniR59z5W8qHDAVzjLkP0AU6HxWm3
-=iXD8
------END PGP SIGNATURE-----
diff --git a/system/john/john-1.7.3.1-mpi8-small.patch.gz b/system/john/john-1.7.3.1-mpi8-small.patch.gz
deleted file mode 100644
index 54eee34acb..0000000000
--- a/system/john/john-1.7.3.1-mpi8-small.patch.gz
+++ /dev/null
diff --git a/system/john/john-1.7.3.1-mpi8-small.patch.gz.asc b/system/john/john-1.7.3.1-mpi8-small.patch.gz.asc
deleted file mode 100644
index a79d3426ee..0000000000
--- a/system/john/john-1.7.3.1-mpi8-small.patch.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEABECAAYFAkj7xF0ACgkQA2jvV5x7o7bn/QCgtOOiZKPOjYaplImpzI5+OVNQ
-g/EAn0A5a80Z71EHSQ/tCpzbQ+0Ug9cc
-=zKGa
------END PGP SIGNATURE-----
diff --git a/system/john/john.SlackBuild b/system/john/john.SlackBuild
index c7441a1d51..87d2705721 100644
--- a/system/john/john.SlackBuild
+++ b/system/john/john.SlackBuild
@@ -3,12 +3,18 @@
 # Slackware build script for John the Ripper
 
 # Written by Murat D. Kadirov <banderols@gmail.com>
+#
+# 20/Nov/2011 * Updated to 1.7.8 and jambo-patch 8
+#               Thanks a lot Kent Fritz for patch with many improvements
+
 
 PRGNAM=john
-VERSION=${VERSION:-1.7.3.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.7.8}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+JUMBOVERSION=${JUMBOVERSION:-8}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -23,26 +29,38 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-  COMPILE="make clean linux-x86-any"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  COMPILE="make clean linux-x86-sse2"
+  if grep -q ^flags.*sse2 /proc/cpuinfo; then
+    TARGET=linux-x86-sse2
+  elif grep -q ^flags.*mmx /proc/cpuinfo; then
+    TARGET=linux-x86-mmx
+  else
+    TARGET=linux-x86-any
+  fi
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  COMPILE="make clean linux-x86-64"
+  TARGET=linux-x86-64
   LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "athlonxp" ]; then 
-  COMPILE="make clean linux-x86-mmx"
+else
+  TARGET=generic
   LIBDIRSUFFIX=""
 fi
 
-set -e 
-
+set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+
+# Soft-link in tarball causes x bit to be set below; nuke it 
+rm -f $PRGNAM-$VERSION/README
+
+# Apply the Jumbo patch?
+if [ "$JUMBO" = "1" ]; then
+  zcat $CWD/john-1.7.8-jumbo-${JUMBOVERSION}.diff.gz | patch -p0 || exit 1
+  mv $PRGNAM-$VERSION/README-jumbo $PRGNAM-$VERSION/doc/README-jumbo 
+fi
+
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -51,34 +69,30 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# DON'T APPLY BOTH PATCHES AT THE SAME TIME !!
-
-# Patch for John the Ripper to support MPI. MPI allows you to use multiple processors
-# on a single system, or a cluster of systems for cracking passwords.
-#zcat $CWD/john-1.7.3.1-mpi8-small.patch.gz | patch -p1 || exit 1
-
-# The jumbo patch enables processing of many password hash types
-# and ciphers that are not supported by the official JtR.
-#zcat $CWD/john-1.7.3.1-all-2.diff.gz | patch -p1 || exit 1
-
-cd src
-  $COMPILE
-cd -
+mkdir -p $PKG/usr/share/john
+cp -a run/* $PKG/usr/share/john
+rm $PKG/usr/share/john/mailer
+
+#cd src
+  make -C src clean $TARGET CFLAGS="-DJOHN_SYSTEMWIDE=1 -c -Wall -O2 -fomit-frame-pointer"
+#cd -
+
+# 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
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
-cp -a $TMP/$PRGNAM-$VERSION/run/*  $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
-
-# wrapper
-cat << EOF > $PKG/usr/bin/john
-#!/bin/sh
-# John The Ripper launcher
-/usr/lib${LIBDIRSUFFIX}/john/john "\$@"
-EOF
-chmod 0755 $PKG/usr/bin/john
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+cp -a run/$PRGNAM $PKG/usr/bin/$PRGNAM
+cp -a run/mailer $PKG/usr/bin/mailer
+ln -s $PRGNAM $PKG/usr/bin/unafs
+ln -s $PRGNAM $PKG/usr/bin/unique
+ln -s $PRGNAM $PKG/usr/bin/unshadow
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/john/john.info b/system/john/john.info
index 02ded2e7dd..6b8edb7d68 100644
--- a/system/john/john.info
+++ b/system/john/john.info
@@ -1,10 +1,12 @@
 PRGNAM="john"
-VERSION="1.7.3.1"
+VERSION="1.7.8"
 HOMEPAGE="http://www.openwall.com/john/"
-DOWNLOAD="ftp://ftp.openwall.com/pub/projects/john/1.7.3.1/john-1.7.3.1.tar.bz2"
-MD5SUM="4a8de450ff332bd0c7cbc573eb5032d9"
+DOWNLOAD="ftp://ftp.openwall.com/pub/projects/john/1.7.8/john-1.7.8.tar.bz2 \
+          ftp://ftp.openwall.com/pub/projects/john/1.7.8/john-1.7.8-jumbo-8.diff.gz"
+MD5SUM="e6d7f261829610d6949c706ebac0517c \
+        96cb581fd8447f3f96614fd365896b07"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Murat D. Kadirov"
 EMAIL="banderols@gmail.com"
-APPROVED="dsomero,rworkman"
+APPROVED="rworkman"