Updated security/john to 1.7.0.1

The following changes have been made between John 1.7 and 1.7.0.1:

* Minor bug and portability fixes.
* Better handling of certain uncommon scenarios and improper uses of John.
* Bonus: "Keyboard" cracker included in the default john.conf (john.ini)
  that will try sequences of adjacent keys on a keyboard as passwords.

The following major changes have been made since John 1.6:

* Bitslice DES code for x86 with MMX: more than twice faster than older
  non-bitslice MMX code.
* Bitsliced the LM hash code as well: now several times faster.
* Significant improvements to the generic bitslice DES code: +20% on RISC.
* PowerPC G4+ AltiVec support (Mac OS X and Linux): effective 128-bitness
  for bitslice DES, resulting in huge speedups.
* First attempt at generic vectorization support for bitslice DES.
* Two MD5 hashes at a time for extra ILP on RISC: up to +80% on Alpha EV5+.
* Generic Blowfish x86 assembly code in addition to the original Pentium
  version: +15% on the Pentium Pro family (up to and including Pentium III),
  +20% on AMD K6 (Pentium 4 and newer AMD CPUs are more happy running the
  original Pentium code for Blowfish).
* Verbose logging of events to the global or a session-specific log file.
* Better idle priority emulation with POSIX.1b (POSIX.4) scheduling calls.
* System-wide installation support for *BSD ports and Linux distributions.
* AIX, DU/Tru64 C2, HP-UX tcb files support in unshadow.
* New make targets for Linux/x86-64, Linux/PowerPC, FreeBSD/Alpha,
  OpenBSD/x86-64, OpenBSD/Alpha, OpenBSD/SPARC, OpenBSD/SPARC64,
  OpenBSD/PowerPC, OpenBSD/PA-RISC, OpenBSD/VAX, NetBSD/VAX, Solaris/SPARC64,
  Mac OS X (PowerPC and x86), SCO, BeOS.
* Bug and portability fixes, and new bugs.
* Bonus: "Strip" cracker included in the default john.conf (john.ini).

1 files changed, 28 insertions, 15 deletions

diff --git a/security/john/Makefile b/security/john/Makefile
index 811a33b9d5b..3adef504190 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2005/11/03 20:41:43 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/14 10:17:25 martti Exp $
 #
 
-DISTNAME=	john-1.6
-PKGREVISION=	1
+DISTNAME=	john-1.7.0.1
+#PKGREVISION=	1
 CATEGORIES=	security textproc
-MASTER_SITES=	http://www.openwall.com/john/
+MASTER_SITES=	http://www.openwall.com/john/e/
 
 MAINTAINER=	DawS@irc.pl
 HOMEPAGE=	http://www.openwall.com/john/
@@ -34,17 +34,30 @@ BUILD_TARGET=	generic
 
 INSTALLATION_DIRS=	bin
 
+SUBST_CLASSES+=		john
+SUBST_STAGE.john=	pre-build
+SUBST_FILES.john=	src/params.h
+SUBST_SED.john=		-e "s+@PREFIX@+${PREFIX}+g"
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/run/john ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/john
-	${INSTALL_DATA} ${WRKSRC}/run/all.chr ${PREFIX}/share/john
-	${INSTALL_DATA} ${WRKSRC}/run/alpha.chr ${PREFIX}/share/john
-	${INSTALL_DATA} ${WRKSRC}/run/digits.chr ${PREFIX}/share/john
-	${INSTALL_DATA} ${WRKSRC}/run/john.ini ${PREFIX}/share/john
-	${INSTALL_DATA} ${WRKSRC}/run/mailer ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/run/password.lst ${PREFIX}/share/john
-	${LN} -sf ${PREFIX}/bin/john ${PREFIX}/bin/unafs
-	${LN} -sf ${PREFIX}/bin/john ${PREFIX}/bin/unique
-	${LN} -sf ${PREFIX}/bin/john ${PREFIX}/bin/unshadow
+	# programs and scripts
+	${INSTALL_PROGRAM} ${WRKSRC:Q}/run/john ${PREFIX:Q}/bin
+	${INSTALL_SCRIPT} ${WRKSRC:Q}/run/mailer ${PREFIX:Q}/bin
+
+	# data directory
+	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/john
+
+	# configuration file
+	${INSTALL_DATA} ${WRKSRC:Q}/run/john.conf ${PREFIX:Q}/share/john
+
+	# symbolic links
+.for i in unafs unique unshadow
+	${LN} -sf ${PREFIX:Q}/bin/john ${PREFIX:Q}/bin/${i:Q}
+.endfor
+
+	# data files
+.for i in all.chr alnum.chr alpha.chr digits.chr lanman.chr password.lst
+	${INSTALL_DATA} ${WRKSRC:Q}/run/${i:Q} ${PREFIX:Q}/share/john
+.endfor
 
 .include "../../mk/bsd.pkg.mk"