Update to 1.8.0 (2013). Notable changes:

* Relaxed the license for many source files to cut-down BSD.
* Relaxed the license for John the Ripper as a whole from GPLv2 (exact
version) to GPLv2 or newer with optional OpenSSL and unRAR exceptions.

* Enhanced the support for DES-based tripcodes by making use of the
bitslice DES implementation and supporting OpenMP parallelization.

* Implemented bitmaps for fast initial comparison of computed hashes
against those loaded for cracking.
This provides a substantial performance improvement when cracking large
numbers of fast hashes.

* With 32-bit x86 builds and at least MMX enabled, the "two hashes at a
time" code for bcrypt is now enabled for GCC 4.2 and newer.
This is faster bcrypt cracking on some old and new computers running
32-bit operating systems or VMs for whatever reason.

* Revised the incremental mode to let the current character counts grow
for each character position independently, with the aim to improve
efficiency in terms of successful guesses per candidate passwords tested.

* Revised the pre-defined incremental modes, as well as external mode
filters that are used to generate .chr files.
* Added makechr, a script to (re-)generate .chr files.

* Enhanced the status reporting to include four distinct speed metrics
(g/s, p/s, c/s, and C/s).

* Added the "--fork=N" and "--node=MIN[-MAX]/TOTAL" options for trivial
parallel and distributed processing.

4 files changed, 22 insertions, 22 deletions

diff --git a/security/john/Makefile b/security/john/Makefile
index 4351b2ec919..7577148f922 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2012/10/23 18:16:31 asau Exp $
+# $NetBSD: Makefile,v 1.22 2014/09/14 13:20:08 shattered Exp $
 #
 
-DISTNAME=	john-1.7.6
-PKGREVISION=	1
+DISTNAME=	john-1.8.0
 CATEGORIES=	security textproc
-MASTER_SITES=	http://www.openwall.com/john/g/
+MASTER_SITES=	http://www.openwall.com/john/j/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.openwall.com/john/
@@ -90,7 +90,7 @@ do-install:
 	${LN} -sf john ${DESTDIR}${PREFIX}/bin/${i}
 .endfor
 	# data files
-.for i in all.chr alnum.chr alpha.chr digits.chr lanman.chr password.lst
+.for i in ascii.chr digits.chr lm_ascii.chr password.lst
 	${INSTALL_DATA} ${WRKSRC}/run/${i} ${DESTDIR}${PREFIX}/share/john
 .endfor
 
diff --git a/security/john/PLIST b/security/john/PLIST
index 65aa5580c05..bcfba2150b7 100644
--- a/security/john/PLIST
+++ b/security/john/PLIST
@@ -1,13 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:13:30 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/09/14 13:20:08 shattered Exp $
 bin/john
 bin/mailer
 bin/unafs
 bin/unique
 bin/unshadow
-share/john/all.chr
-share/john/alnum.chr
-share/john/alpha.chr
+share/john/ascii.chr
 share/john/digits.chr
 share/john/john.conf
-share/john/lanman.chr
+share/john/lm_ascii.chr
 share/john/password.lst
diff --git a/security/john/distinfo b/security/john/distinfo
index 3067f602549..299b39d8f90 100644
--- a/security/john/distinfo
+++ b/security/john/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.13 2011/06/20 09:17:50 drochner Exp $
+$NetBSD: distinfo,v 1.14 2014/09/14 13:20:08 shattered Exp $
 
-SHA1 (john-1.7.6.tar.gz) = da0b6298e6e045606d48880df045096e8bc87fcb
-RMD160 (john-1.7.6.tar.gz) = 294fa9a381b45df6fda6e537bc920e74c1d966b0
-Size (john-1.7.6.tar.gz) = 832790 bytes
-SHA1 (patch-aa) = c7f027cec0ee565312fd4417ded8fe43005b01d1
+SHA1 (john-1.8.0.tar.xz) = 423901b9b281c26656234ee31b362f1c0c2b680c
+RMD160 (john-1.8.0.tar.xz) = fda9971cd78bdf2b5154586efde2504c9a5974a4
+Size (john-1.8.0.tar.xz) = 4468704 bytes
+SHA1 (patch-aa) = 15ba3d70444435c6705f189b32af109e1f211ff4
 SHA1 (patch-ab) = 4f8c9e1bba14f64b651c6d08337f004a3e278e44
-SHA1 (patch-ac) = 8c123939d2b4939e172ae32cd90ba2950d907dd8
diff --git a/security/john/patches/patch-aa b/security/john/patches/patch-aa
index 6bb222b575b..808010f2da5 100644
--- a/security/john/patches/patch-aa
+++ b/security/john/patches/patch-aa
@@ -1,17 +1,20 @@
-$NetBSD: patch-aa,v 1.8 2010/12/13 10:32:35 wiz Exp $
+$NetBSD: patch-aa,v 1.9 2014/09/14 13:20:08 shattered Exp $
 
---- src/Makefile.orig	2010-06-13 21:12:37.000000000 +0000
+--- src/Makefile.orig	2013-05-29 23:21:25.000000000 +0000
 +++ src/Makefile
-@@ -19,11 +19,11 @@ OMPFLAGS =
- #OMPFLAGS = -fopenmp
+@@ -28,14 +28,13 @@ OMPFLAGS =
+ #OMPFLAGS = -fopenmp -D_FORTIFY_SOURCE=0
  # Sun Studio with OpenMP (set the OMP_NUM_THREADS env var at runtime)
  #OMPFLAGS = -xopenmp
--CFLAGS = -c -Wall -O2 -fomit-frame-pointer $(OMPFLAGS)
+-CFLAGS = -c -Wall -Wdeclaration-after-statement -O2 -fomit-frame-pointer $(OMPFLAGS)
 +CFLAGS = -c $(OMPFLAGS)
+ # CFLAGS for use on the main john.c file only
+ CFLAGS_MAIN = $(CFLAGS)
  ASFLAGS = -c $(OMPFLAGS)
 -LDFLAGS = -s $(OMPFLAGS)
 -OPT_NORMAL = -funroll-loops
--OPT_INLINE = -finline-functions
+-# Remove the "-Os" if you're using an ancient version of gcc
+-OPT_INLINE = -Os -funroll-loops -finline-functions
 +LDFLAGS += -s $(OMPFLAGS)
 +OPT_NORMAL =
 +OPT_INLINE =