ports/96722: [UPDATE] security/john to 1.7.0.2

[Rainer Alves]

>Number:         96722
>Category:       ports
>Synopsis:       [UPDATE] security/john to 1.7.0.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 03 18:20:07 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Rainer Alves
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
BrasilTelecom

>Environment:
>Description:

- Update to 1.7.0.2
- Take maintainership

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

>How-To-Repeat:
>Fix:

--- john-1.7.0.2.diff begins here ---
diff -ruN /usr/ports/security/john/Makefile security/john/Makefile
--- /usr/ports/security/john/Makefile	Tue Apr  4 10:42:36 2006
+++ security/john/Makefile	Wed May  3 14:36:54 2006
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	john
-PORTVERSION=	1.7
-PORTREVISION=	1
+PORTVERSION=	1.7.0.2
 CATEGORIES=	security
-MASTER_SITES=	http://www.openwall.com/john/d/ \
-		ftp://ftp.ru.openwall.com/pub/projects/john/
+MASTER_SITES=	http://www.openwall.com/john/f/ \
+		ftp://ftp.ru.openwall.com/pub/projects/john/${PORTVERSION}/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	rainer.alves at gmail.com
 COMMENT=	Featureful Unix password cracker
 
 DATAFILES=	all.chr alnum.chr alpha.chr digits.chr lanman.chr password.lst
@@ -20,6 +19,7 @@
 		RULES CONTACT CREDITS
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
diff -ruN /usr/ports/security/john/distinfo security/john/distinfo
--- /usr/ports/security/john/distinfo	Sat Feb 11 00:47:31 2006
+++ security/john/distinfo	Wed May  3 14:39:22 2006
@@ -1,3 +1,3 @@
-MD5 (john-1.7.tar.gz) = c8121c5304ad64c7d5893b1b8177ea53
-SHA256 (john-1.7.tar.gz) = 5fc569c95bcef92522f9cd81cdda01fcfabc4c2f226197ba108fa7fd5af07f3d
-SIZE (john-1.7.tar.gz) = 799235
+MD5 (john-1.7.0.2.tar.bz2) = 0a87dca1f149493fc087ea8a8b6ae5d5
+SHA256 (john-1.7.0.2.tar.bz2) = d97ce0595befc940187930ab8185e5503e2a200fbd795e07a6b1f304de408b38
+SIZE (john-1.7.0.2.tar.bz2) = 690516
diff -ruN /usr/ports/security/john/files/patch-params.h security/john/files/patch-params.h
--- /usr/ports/security/john/files/patch-params.h	Tue Feb 21 02:20:22 2006
+++ security/john/files/patch-params.h	Wed May  3 14:47:37 2006
@@ -1,7 +1,7 @@
---- params.h.orig	Mon Jan  9 15:33:18 2006
-+++ params.h	Sat Feb 18 19:02:07 2006
-@@ -22,12 +22,12 @@
-  * will probably want to set this to 1 for their builds of John.
+--- params.h.orig	Sun Mar 19 20:34:15 2006
++++ params.h	Wed May  3 14:45:51 2006
+@@ -49,15 +49,15 @@
+  * notes above.
   */
  #ifndef JOHN_SYSTEMWIDE
 -#define JOHN_SYSTEMWIDE			0
@@ -9,13 +9,17 @@
  #endif
  
  #if JOHN_SYSTEMWIDE
- #ifndef JOHN_SYSTEMWIDE_EXEC
+ #ifndef JOHN_SYSTEMWIDE_EXEC /* please refer to the notes above */
 -#define JOHN_SYSTEMWIDE_EXEC		"/usr/libexec/john"
 +#define JOHN_SYSTEMWIDE_EXEC		"%%PREFIX%%/bin/john"
  #endif
  #ifndef JOHN_SYSTEMWIDE_HOME
- #define JOHN_SYSTEMWIDE_HOME		"/usr/share/john"
-@@ -74,8 +74,8 @@
+-#define JOHN_SYSTEMWIDE_HOME		"/usr/share/john"
++#define JOHN_SYSTEMWIDE_HOME		"%%DATADIR%%"
+ #endif
+ #define JOHN_PRIVATE_HOME		"~/.john"
+ #endif
+@@ -101,8 +101,8 @@
  /*
   * File names.
   */
@@ -26,7 +30,7 @@
  #if JOHN_SYSTEMWIDE
  #define CFG_PRIVATE_FULL_NAME		JOHN_PRIVATE_HOME "/john.conf"
  #define CFG_PRIVATE_ALT_NAME		JOHN_PRIVATE_HOME "/john.ini"
-@@ -89,7 +89,7 @@
+@@ -116,7 +116,7 @@
  #endif
  #define LOG_SUFFIX			".log"
  #define RECOVERY_SUFFIX			".rec"
--- john-1.7.0.2.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: