security/john 1.6 -> 1.6.32

PR:		ports/47124
Submitted by:	Dominic Marks <dom@cus.org.uk>

8 files changed, 129 insertions, 100 deletions

diff --git a/security/john/Makefile b/security/john/Makefile
index 746aa7ca66f..58857e4b959 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -7,49 +7,43 @@
 #
 
 PORTNAME=	john
-PORTVERSION=	1.6
+PORTVERSION=	1.6.32
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.ca.openwall.com/pub/projects/john/ \
-		http://www.openwall.com/john/ \
-		ftp://ftp.ru.openwall.com/pub/projects/john/ \
-		ftp://ftp.false.com/pub/security/projects/ \
-		http://www.false.com/security/john/
+MASTER_SITES=	http://www.openwall.com/john/ \
+		ftp://ftp.ca.openwall.com/pub/projects/john/ \
+		ftp://ftp.ru.openwall.com/pub/projects/john/
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
+		${PORTNAME}-1.6.tar.gz
 
-USE_REINPLACE=	yes
 MAINTAINER=	d.marks@student.umist.ac.uk
 
+USE_REINPLACE=	yes
+
 .include <bsd.port.pre.mk>
 
 OSNAME=		${OPSYS:S/F/f/:S/N/n/:S/O/o/:S/B/b/:S/S/s/:S/D/d/}
 
+ALL_TARGET=	generic
 .if ${MACHINE_ARCH} == "i386"
-ARCHNAME=	x86
-. if ${MACHINE_CPU:Mk6}
-ALL_TARGET=	${OSNAME}-${ARCHNAME}-k6-elf
-. elif ${MACHINE_CPU:Mmmx}
-ALL_TARGET=	${OSNAME}-${ARCHNAME}-mmx-elf
+. if ${MACHINE_CPU:Mmmx}
+ALL_TARGET=	${OSNAME}-x86-mmx-elf
 . else
-ALL_TARGET=	${OSNAME}-${ARCHNAME}-any-elf
+ALL_TARGET=	${OSNAME}-x86-any-elf
 . endif
 .elif ${MACHINE_ARCH} == "alpha"
-ARCHNAME=	alpha
-ALL_TARGET=	${OSNAME}-${ARCHNAME}-any-elf
-.else
-ALL_TARGET=	generic
+ALL_TARGET=	${OSNAME}-alpha
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
+OLDSRC=		${WRKDIR}/${PORTNAME}-1.6/run
 
-pre-fetch:
+pre-build:
 	@${ECHO} "Building for ${ALL_TARGET}"
 
 do-configure:
-	@${REINPLACE_CMD} \
-		-e 's,~/all.chr,${PREFIX}/share/john/all.chr,' \
-		-e 's,~/alpha.chr,${PREFIX}/share/john/alpha.chr,' \
-		-e 's,~/digits.chr,${PREFIX}/share/john/digits.chr,' \
-		-e 's,~/lanman.chr,${PREFIX}/share/john/lanman.chr,' \
-	${WRKDIR}/${DISTNAME}/run/john.ini
+	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
+		${WRKDIR}/${DISTNAME}/src/params.h \
+		${WRKDIR}/${DISTNAME}/run/john.conf
 
 do-install:
 	@${MKDIR} ${DATADIR}
@@ -57,17 +51,16 @@ do-install:
 	@cd ${PREFIX}/bin ; ${LN} -sf john xtract
 	@cd ${PREFIX}/bin ; ${LN} -sf john unshadow
 	@${INSTALL_DATA} \
-		${WRKDIR}/${DISTNAME}/run/all.chr \
-		${WRKDIR}/${DISTNAME}/run/alpha.chr \
-		${WRKDIR}/${DISTNAME}/run/digits.chr \
-		${WRKDIR}/${DISTNAME}/run/lanman.chr \
+		${OLDSRC}/all.chr \
+		${OLDSRC}/alpha.chr \
+		${OLDSRC}/digits.chr \
+		${OLDSRC}/lanman.chr \
 		${WRKDIR}/${DISTNAME}/run/password.lst \
-		${WRKDIR}/${DISTNAME}/run/john.ini \
-		${DATADIR}
+		${WRKDIR}/${DISTNAME}/run/john.conf \
+			${DATADIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/* ${DOCSDIR}
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/security/john/distinfo b/security/john/distinfo
index f1d0e8e2139..1f4dad1df24 100644
--- a/security/john/distinfo
+++ b/security/john/distinfo
@@ -1 +1,2 @@
+MD5 (john-1.6.32.tar.gz) = fc43647268a2841bf9c8df819fafef26
 MD5 (john-1.6.tar.gz) = aae782f160041b2bdc624b0a84054e32
diff --git a/security/john/files/patch-Makefile b/security/john/files/patch-Makefile
new file mode 100644
index 00000000000..e525c3cdc36
--- /dev/null
+++ b/security/john/files/patch-Makefile
@@ -0,0 +1,27 @@
+--- Makefile	Wed Apr 10 14:35:25 2002
++++ Makefile	Wed Jan 15 23:28:44 2003
+@@ -3,10 +3,10 @@
+ # Copyright (c) 1996-2002 by Solar Designer
+ #
+ 
+-CPP = gcc
+-CC = gcc
+-AS = gcc
+-LD = gcc
++CC ?= gcc
++CPP = $(CC)
++AS = $(CC)
++LD = $(CC)
+ CP = cp
+ LN = ln -sf
+ RM = rm -f
+@@ -14,7 +14,8 @@
+ SED = sed
+ NULL = /dev/null
+ CPPFLAGS = -E
+-CFLAGS = -c -Wall -O2 -fomit-frame-pointer
++CFLAGS ?= -O2
++CFLAGS += -c -Wall -fomit-frame-pointer
+ ASFLAGS = -c
+ LDFLAGS = -s
+ OPT_NORMAL = -funroll-loops
diff --git a/security/john/files/patch-aa b/security/john/files/patch-aa
deleted file mode 100644
index 1fdee295e7d..00000000000
--- a/security/john/files/patch-aa
+++ /dev/null
@@ -1,56 +0,0 @@
---- Makefile.orig	Wed Dec  2 16:29:50 1998
-+++ Makefile	Sun Feb  6 18:00:15 2000
-@@ -3,17 +3,18 @@
- # Copyright (c) 1996-98 by Solar Designer
- #
- 
--CPP = gcc
--CC = gcc
--AS = gcc
--LD = gcc
-+CC ?= gcc
-+CPP = $(CC)
-+AS = $(CC)
-+LD = $(CC)
- CP = cp
- LN = ln -sf
- RM = rm -f
- SED = sed
- NULL = /dev/null
- CPPFLAGS = -E
--CFLAGS = -c -Wall -O2 -fomit-frame-pointer
-+CFLAGS ?= -O2
-+CFLAGS += -c -Wall -fomit-frame-pointer
- ASFLAGS = -c
- LDFLAGS = -s
- OPT_NORMAL = -funroll-loops
-@@ -89,6 +90,7 @@
- 	@echo "freebsd-x86-any-a.out    FreeBSD, x86, a.out binaries"
- 	@echo "freebsd-x86-k6-a.out     FreeBSD, AMD K6, a.out binaries"
- 	@echo "freebsd-x86-any-elf      FreeBSD, x86, ELF binaries"
-+	@echo "freebsd-alpha-any-elf    FreeBSD, Alpha, ELF binaries"
- 	@echo "freebsd-x86-mmx-elf      FreeBSD, x86 with MMX, ELF binaries"
- 	@echo "freebsd-x86-k6-elf       FreeBSD, AMD K6, ELF binaries"
- 	@echo "openbsd-x86-any          OpenBSD, x86"
-@@ -173,14 +175,19 @@
- 	$(LN) x86-any.h arch.h
- 	$(MAKE) $(PROJ) \
- 		JOHN_OBJS="$(JOHN_OBJS) x86.o" \
--		CFLAGS="$(CFLAGS) -m486" \
-+		CFLAGS="$(CFLAGS)" \
- 		ASFLAGS="$(ASFLAGS) -DBSD"
- 
-+freebsd-alpha-any-elf:
-+	$(LN) alpha.h arch.h
-+	$(MAKE) $(PROJ) \
-+		JOHN_OBJS="$(BITSLICE_OBJS) $(JOHN_OBJS) alpha.o"
-+
- freebsd-x86-mmx-elf:
- 	$(LN) x86-mmx.h arch.h
- 	$(MAKE) $(PROJ) \
- 		JOHN_OBJS="$(JOHN_OBJS) x86.o" \
--		CFLAGS="$(CFLAGS) -m486" \
-+		CFLAGS="$(CFLAGS)" \
- 		ASFLAGS="$(ASFLAGS) -DBSD"
- 
- freebsd-x86-k6-elf:
diff --git a/security/john/files/patch-john.conf b/security/john/files/patch-john.conf
new file mode 100644
index 00000000000..8703181c87c
--- /dev/null
+++ b/security/john/files/patch-john.conf
@@ -0,0 +1,41 @@
+--- ../run/john.conf	Fri May 10 19:16:35 2002
++++ ../run/john.conf	Wed Jan 15 23:18:43 2003
+@@ -5,7 +5,7 @@
+ 
+ [Options]
+ # Wordlist file name, to be used in batch mode
+-Wordfile = $JOHN/password.lst
++Wordfile = %%PREFIX%%/share/john/password.lst
+ # Use idle cycles only
+ Idle = N
+ # Crash recovery file saving delay in seconds
+@@ -316,25 +316,25 @@
+ 
+ # Incremental modes
+ [Incremental:All]
+-File = $JOHN/all.chr
++File = %%PREFIX%%/share/john/all.chr
+ MinLen = 0
+ MaxLen = 8
+ CharCount = 95
+ 
+ [Incremental:Alpha]
+-File = $JOHN/alpha.chr
++File = %%PREFIX%%/share/john/alpha.chr
+ MinLen = 1
+ MaxLen = 8
+ CharCount = 26
+ 
+ [Incremental:Digits]
+-File = $JOHN/digits.chr
++File = %%PREFIX%%/share/john/digits.chr
+ MinLen = 1
+ MaxLen = 8
+ CharCount = 10
+ 
+ [Incremental:LanMan]
+-File = $JOHN/lanman.chr
++File = %%PREFIX%%/share/john/lanman.chr
+ MinLen = 0
+ MaxLen = 7
+ CharCount = 69
diff --git a/security/john/files/patch-params.h b/security/john/files/patch-params.h
new file mode 100644
index 00000000000..24673910193
--- /dev/null
+++ b/security/john/files/patch-params.h
@@ -0,0 +1,33 @@
+--- params.h	Sun Sep 15 20:19:20 2002
++++ params.h	Wed Jan 15 23:50:29 2003
+@@ -26,8 +26,8 @@
+ #endif
+ 
+ #if JOHN_SYSTEMWIDE
+-#define JOHN_SYSTEMWIDE_EXEC		"/usr/libexec/john"
+-#define JOHN_SYSTEMWIDE_HOME		"/usr/share/john"
++#define JOHN_SYSTEMWIDE_EXEC		"%%PREFIX%%/bin/john"
++#define JOHN_SYSTEMWIDE_HOME		"%%PREFIX%%/share/john"
+ #define JOHN_PRIVATE_HOME		"~/.john"
+ #endif
+ 
+@@ -67,8 +67,8 @@
+ /*
+  * File names.
+  */
+-#define CFG_FULL_NAME			"$JOHN/john.conf"
+-#define CFG_ALT_NAME			"$JOHN/john.ini"
++#define CFG_FULL_NAME		"%%PREFIX%%/share/john/john.conf"
++#define CFG_ALT_NAME		"%%PREFIX%%/share/john/john.ini"
+ #if JOHN_SYSTEMWIDE
+ #define CFG_PRIVATE_FULL_NAME		JOHN_PRIVATE_HOME "/john.conf"
+ #define CFG_PRIVATE_ALT_NAME		JOHN_PRIVATE_HOME "/john.ini"
+@@ -78,7 +78,7 @@
+ #define LOG_NAME			"$JOHN/john.pot"
+ #define RECOVERY_NAME			"$JOHN/restore"
+ #endif
+-#define WORDLIST_NAME			"$JOHN/password.lst"
++#define WORDLIST_NAME		"%%PREFIX%%/share/john/password.lst"
+ 
+ /*
+  * Configuration file section names.
diff --git a/security/john/pkg-message b/security/john/pkg-message
deleted file mode 100644
index fa8b0b78a30..00000000000
--- a/security/john/pkg-message
+++ /dev/null
@@ -1,2 +0,0 @@
-Before running John the Ripper, copy $LOCALBASE/share/john/john.ini
-to the current directory. By default $LOCALBASE is /usr/local.
diff --git a/security/john/pkg-plist b/security/john/pkg-plist
index e592ecd9a7c..9015b18e78f 100644
--- a/security/john/pkg-plist
+++ b/security/john/pkg-plist
@@ -6,18 +6,10 @@ share/john/all.chr
 share/john/alpha.chr
 share/john/digits.chr
 share/john/lanman.chr
-share/john/john.ini
+share/john/john.conf
 share/john/password.lst
-share/doc/john/CONFIG
-share/doc/john/CREDITS
-share/doc/john/EXAMPLES
-share/doc/john/EXTERNAL
-share/doc/john/FAQ
-share/doc/john/INSTALL
-share/doc/john/MODES
-share/doc/john/NEWS
-share/doc/john/OPTIONS
+share/doc/john/CHANGES
+share/doc/john/LICENSING
 share/doc/john/README
-share/doc/john/RULES
 @dirrm share/doc/john
 @dirrm share/john