From e41f3bb1d98e602ecfd92065ee14b6ed9073221a Mon Sep 17 00:00:00 2001
From: aanriot <aanriot@openbsd.org>
Date: Tue, 6 Sep 2005 20:20:26 +0000
Subject: [PATCH] get charset files from an older version (1.6), as they are
 not shipped anymore.

spotted by and ok matthieu@
---
 security/john/Makefile                    | 12 ++++++--
 security/john/distinfo                    |  4 +++
 security/john/patches/patch-run_john_conf | 36 +++++++++++++++++++++--
 security/john/pkg/PLIST                   |  7 ++++-
 4 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/security/john/Makefile b/security/john/Makefile
index 53a61a53f9d..e6003007cc5 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.29 2005/05/31 08:08:52 sturm Exp $
+# $OpenBSD: Makefile,v 1.30 2005/09/06 20:20:26 aanriot Exp $
 
 COMMENT=		"extremely fast password cracker"
 
 DISTNAME=		john-1.6.38
-CATEGORIES=     	security
+PKGNAME=		${DISTNAME}p0
+CATEGORIES=		security
 
 HOMEPAGE=		http://www.openwall.com/john/
 
@@ -15,6 +16,8 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c m
 
 MASTER_SITES=		${HOMEPAGE}c/
+DISTFILES=		${DISTNAME}.tar.gz \
+			john-1.6.tar.gz
 
 NO_REGRESS=		Yes
 
@@ -51,10 +54,14 @@ ALL_TARGET=		generic
 do-configure:
 	@perl -pi -e "s,%%PREFIX%%,${PREFIX},;" \
 		-e "s,%%SYSCONFDIR%%,${SYSCONFDIR},;" ${WRKSRC}/params.h
+post-patch:
+	@perl -pi -e 's,%%JOHN%%,${PREFIX}\/share\/john,g;' \
+		${WRKDIST}/run/john.conf
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/john
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/john
+	${INSTALL_DATA_DIR} ${PREFIX}/share/john
 	${INSTALL_PROGRAM} ${WRKDIST}/run/john ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKDIST}/run/mailer ${PREFIX}/bin
 	@cd ${PREFIX}/bin && \
@@ -63,5 +70,6 @@ do-install:
 		ln -sf john unique
 	${INSTALL_DATA} ${WRKDIST}/run/john.conf ${PREFIX}/share/examples/john
 	${INSTALL_DATA} ${WRKDIST}/doc/* ${PREFIX}/share/doc/john
+	${INSTALL_DATA} ${WRKDIR}/john-1.6/run/*.chr ${PREFIX}/share/john
 
 .include <bsd.port.mk>
diff --git a/security/john/distinfo b/security/john/distinfo
index 13a6acb5027..b2e7d6fe8fc 100644
--- a/security/john/distinfo
+++ b/security/john/distinfo
@@ -1,4 +1,8 @@
 MD5 (john-1.6.38.tar.gz) = cad2877bc4d0e54c3863f5e7d1143fc6
+MD5 (john-1.6.tar.gz) = aae782f160041b2bdc624b0a84054e32
 RMD160 (john-1.6.38.tar.gz) = b8482d33b739c036784e70d8d7a403db15df8bf0
+RMD160 (john-1.6.tar.gz) = 5a34e7f57b190313cc0773e996f6eed74f28d160
 SHA1 (john-1.6.38.tar.gz) = fd521c16646f2a486fadd7c6fbd1c9747a087f10
+SHA1 (john-1.6.tar.gz) = b49d371496b8ba5e439665b83190b1e4d4640bea
 SIZE (john-1.6.38.tar.gz) = 151331
+SIZE (john-1.6.tar.gz) = 497341
diff --git a/security/john/patches/patch-run_john_conf b/security/john/patches/patch-run_john_conf
index 4bee4df663c..ef28c544e6f 100644
--- a/security/john/patches/patch-run_john_conf
+++ b/security/john/patches/patch-run_john_conf
@@ -1,6 +1,6 @@
-$OpenBSD: patch-run_john_conf,v 1.1 2003/09/26 17:57:38 marcm Exp $
---- run/john.conf.orig	2003-08-20 14:56:16.000000000 -0700
-+++ run/john.conf	2003-09-25 23:31:27.000000000 -0700
+$OpenBSD: patch-run_john_conf,v 1.2 2005/09/06 20:20:26 aanriot Exp $
+--- run/john.conf.orig	Fri Jun 11 14:29:39 2004
++++ run/john.conf	Tue Sep  6 15:51:38 2005
 @@ -5,7 +5,7 @@
  
  [Options]
@@ -10,3 +10,33 @@ $OpenBSD: patch-run_john_conf,v 1.1 2003/09/26 17:57:38 marcm Exp $
  # Use idle cycles only
  Idle = N
  # Crash recovery file saving delay in seconds
+@@ -316,25 +316,25 @@ l$1$9<-$[6-0]$[9-0]
+ 
+ # Incremental modes
+ [Incremental:All]
+-File = $JOHN/all.chr
++File = %%JOHN%%/all.chr
+ MinLen = 0
+ MaxLen = 8
+ CharCount = 95
+ 
+ [Incremental:Alpha]
+-File = $JOHN/alpha.chr
++File = %%JOHN%%/alpha.chr
+ MinLen = 1
+ MaxLen = 8
+ CharCount = 26
+ 
+ [Incremental:Digits]
+-File = $JOHN/digits.chr
++File = %%JOHN%%/digits.chr
+ MinLen = 1
+ MaxLen = 8
+ CharCount = 10
+ 
+ [Incremental:LanMan]
+-File = $JOHN/lanman.chr
++File = %%JOHN%%/lanman.chr
+ MinLen = 0
+ MaxLen = 7
+ CharCount = 69
diff --git a/security/john/pkg/PLIST b/security/john/pkg/PLIST
index e165bf2e792..ccde5eec6f9 100644
--- a/security/john/pkg/PLIST
+++ b/security/john/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2005/05/31 08:08:52 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.8 2005/09/06 20:20:26 aanriot Exp $
 bin/john
 bin/mailer
 bin/unafs
@@ -14,3 +14,8 @@ share/doc/john/README
 share/examples/john/
 share/examples/john/john.conf
 @sample ${SYSCONFDIR}/john.conf
+share/john/
+share/john/all.chr
+share/john/alpha.chr
+share/john/digits.chr
+share/john/lanman.chr