- Update to 1.6.40

- Be more picky about whats PORTDOCS and what not
- Moved john.conf from ${DATADIR} to ${PREFIX}/etc
- Preserve existing/changed config file on install/deinstall
- Remove files/patch-john.conf

3 files changed, 19 insertions, 57 deletions

diff --git a/security/john/files/patch-Makefile b/security/john/files/patch-Makefile
index 83fbb0612775..804c0d651486 100644
--- a/security/john/files/patch-Makefile
+++ b/security/john/files/patch-Makefile
@@ -1,7 +1,7 @@
---- Makefile	Sun Nov 30 02:02:25 2003
-+++ Makefile	Wed Apr 14 15:34:42 2004
+--- Makefile.orig	Mon Dec 12 19:53:36 2005
++++ Makefile	Sat Dec 31 01:30:01 2005
 @@ -3,10 +3,10 @@
- # Copyright (c) 1996-2003 by Solar Designer
+ # Copyright (c) 1996-2005 by Solar Designer
  #
  
 -CPP = gcc
@@ -15,8 +15,8 @@
  CP = cp
  LN = ln -sf
  RM = rm -f
-@@ -14,7 +14,8 @@
- SED = sed
+@@ -15,7 +15,8 @@
+ PERL = perl
  NULL = /dev/null
  CPPFLAGS = -E
 -CFLAGS = -c -Wall -O2 -fomit-frame-pointer
diff --git a/security/john/files/patch-john.conf b/security/john/files/patch-john.conf
deleted file mode 100644
index 4eb2646241ca..000000000000
--- a/security/john/files/patch-john.conf
+++ /dev/null
@@ -1,41 +0,0 @@
---- ../run/john.conf	Wed Aug 20 22:56:16 2003
-+++ ../run/john.conf	Wed Apr 14 15:28:33 2004
-@@ -5,7 +5,7 @@
- 
- [Options]
- # Wordlist file name, to be used in batch mode
--Wordlist = $JOHN/password.lst
-+Wordlist = %%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
index 4e72616bd4c4..9b2fdab964ee 100644
--- a/security/john/files/patch-params.h
+++ b/security/john/files/patch-params.h
@@ -1,6 +1,6 @@
---- params.h.orig	Mon Feb 23 17:07:38 2004
-+++ params.h	Sun Apr 18 19:16:14 2004
-@@ -22,12 +22,12 @@
+--- params.h.orig	Sat Dec 31 04:21:22 2005
++++ params.h	Sat Dec 31 04:25:13 2005
+@@ -22,15 +22,15 @@
   * will probably want to set this to 1 for their builds of John.
   */
  #ifndef JOHN_SYSTEMWIDE
@@ -9,30 +9,33 @@
  #endif
  
  #if JOHN_SYSTEMWIDE
+ #ifndef JOHN_SYSTEMWIDE_EXEC
 -#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"
+ #endif
+ #ifndef JOHN_SYSTEMWIDE_HOME
+-#define JOHN_SYSTEMWIDE_HOME		"/usr/share/john"
++#define JOHN_SYSTEMWIDE_HOME		"%%DATADIR%%"
+ #endif
  #define JOHN_PRIVATE_HOME		"~/.john"
  #endif
- 
-@@ -67,8 +67,8 @@
+@@ -74,8 +74,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"
++#define CFG_FULL_NAME			"%%PREFIX%%/etc/john.conf"
++#define CFG_ALT_NAME			"%%PREFIX%%/etc/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"
-@@ -82,7 +82,7 @@
+@@ -89,7 +89,7 @@
  #endif
  #define LOG_SUFFIX			".log"
  #define RECOVERY_SUFFIX			".rec"
 -#define WORDLIST_NAME			"$JOHN/password.lst"
-+#define WORDLIST_NAME		"%%PREFIX%%/share/john/password.lst"
++#define WORDLIST_NAME			"%%DATADIR%%/password.lst"
  
  /*
   * Configuration file section names.