system/john: Updated for version 1.8.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

3 files changed, 8 insertions, 24 deletions

diff --git a/system/john/README b/system/john/README
index 680dc18c4d..1def1f7ff4 100644
--- a/system/john/README
+++ b/system/john/README
@@ -3,14 +3,6 @@ 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 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
@@ -18,7 +10,7 @@ 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
+    MERGEWORDS=1 sh john.SlackBuild
 
 For more information, consult the project's homepage and/or the documentation 
-installed in /usr/doc/john-1.7.9
+installed in /usr/doc/john-1.8.0
diff --git a/system/john/john.SlackBuild b/system/john/john.SlackBuild
index 5c73e1be2f..acbdc7df84 100644
--- a/system/john/john.SlackBuild
+++ b/system/john/john.SlackBuild
@@ -7,12 +7,12 @@
 # 20/Nov/2011 * Updated for version 1.7.8 and jambo-patch 8
 #               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
 
 PRGNAM=john
-VERSION=${VERSION:-1.7.9}
+VERSION=${VERSION:-1.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-JUMBOVERSION=${JUMBOVERSION:-5}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -49,17 +49,11 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+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
 
-# Apply the Jumbo patch?
-if [ "$JUMBO" = "1" ]; then
-  zcat $CWD/john-$VERSION-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 . \
diff --git a/system/john/john.info b/system/john/john.info
index a252c2b8b5..99bd44883e 100644
--- a/system/john/john.info
+++ b/system/john/john.info
@@ -1,10 +1,8 @@
 PRGNAM="john"
-VERSION="1.7.9"
+VERSION="1.8.0"
 HOMEPAGE="http://www.openwall.com/john/"
-DOWNLOAD="ftp://ftp.openwall.com/pub/projects/john/1.7.9/john-1.7.9.tar.bz2 \
-          ftp://ftp.openwall.com/pub/projects/john/1.7.9/john-1.7.9-jumbo-5.diff.gz"
-MD5SUM="45f54fc59386ecd67daaef9f19781d93 \
-        68cacb612f20c71eed6c24cbaf28148a"
+DOWNLOAD="http://www.openwall.com/john/j/john-1.8.0.tar.xz"
+MD5SUM="a4086df68f51778782777e60407f1869"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""