Attachment #42051 for bug #65623

View | Details | Raw Unified | Return to bug 65623
Collapse All | Expand All

Lines 7-15 Link Here

(-)Makefile (-2 / +2 lines)
7	#	7	#
8		8
9	PORTNAME= john	9	PORTNAME= john
10	PORTVERSION= 1.6.34	10	PORTVERSION= 1.6.37
11	CATEGORIES= security	11	CATEGORIES= security
12	MASTER_SITES= http://www.openwall.com/john/dl/ \	12	MASTER_SITES= http://www.openwall.com/john/a/ \
13	ftp://ftp.ru.openwall.com/pub/projects/john/	13	ftp://ftp.ru.openwall.com/pub/projects/john/
14	DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \	14	DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \
15	${PORTNAME}-1.6.tar.gz	15	${PORTNAME}-1.6.tar.gz

Lines 1-4 Link Here

(-)distinfo (-2 / +2 lines)
1	MD5 (john-1.6.34.tar.gz) = f97c1ca4506bcbac4ae65abe3c2dc461	1	MD5 (john-1.6.37.tar.gz) = 9403233b640927295c05b0564ff1f678
2	SIZE (john-1.6.34.tar.gz) = 133618	2	SIZE (john-1.6.37.tar.gz) = 139372
3	MD5 (john-1.6.tar.gz) = aae782f160041b2bdc624b0a84054e32	3	MD5 (john-1.6.tar.gz) = aae782f160041b2bdc624b0a84054e32
4	SIZE (john-1.6.tar.gz) = 497341	4	SIZE (john-1.6.tar.gz) = 497341

Lines 1-7 Link Here

(-)files/patch-Makefile (-3 / +3 lines)
1	--- Makefile Wed Apr 10 14:35:25 2002	1	--- Makefile Sun Nov 30 02:02:25 2003
2	+++ Makefile Wed Jan 15 23:28:44 2003	2	+++ Makefile Wed Apr 14 15:34:42 2004
3	@@ -3,10 +3,10 @@	3	@@ -3,10 +3,10 @@
4	# Copyright (c) 1996-2002 by Solar Designer	4	# Copyright (c) 1996-2003 by Solar Designer
5	#	5	#
6		6
7	-CPP = gcc	7	-CPP = gcc

Lines 1-11 Link Here

(-)files/patch-john.conf (-4 / +4 lines)
1	--- ../run/john.conf Fri May 10 19:16:35 2002	1	--- ../run/john.conf Wed Aug 20 22:56:16 2003
2	+++ ../run/john.conf Wed Jan 15 23:18:43 2003	2	+++ ../run/john.conf Wed Apr 14 15:28:33 2004
3	@@ -5,7 +5,7 @@	3	@@ -5,7 +5,7 @@
4		4
5	[Options]	5	[Options]
6	# Wordlist file name, to be used in batch mode	6	# Wordlist file name, to be used in batch mode
7	-Wordfile = $JOHN/password.lst	7	-Wordlist = $JOHN/password.lst
8	+Wordfile = %%PREFIX%%/share/john/password.lst	8	+Wordlist = %%PREFIX%%/share/john/password.lst
9	# Use idle cycles only	9	# Use idle cycles only
10	Idle = N	10	Idle = N
11	# Crash recovery file saving delay in seconds	11	# Crash recovery file saving delay in seconds




--- params.h	Wed Apr 14 15:41:15 2004
+++ params.h	Mon Feb 23 16:07:38 2004
@@ -22,12 +22,12 @@
  * will probably want to set this to 1 for their builds of John.
  */
 #ifndef JOHN_SYSTEMWIDE
-#define JOHN_SYSTEMWIDE			1
+#define JOHN_SYSTEMWIDE			0
 #endif
 
 #if JOHN_SYSTEMWIDE
-#define JOHN_SYSTEMWIDE_EXEC		"%%PREFIX%%/bin/john"
-#define JOHN_SYSTEMWIDE_HOME		"%%PREFIX%%/share/john"
+#define JOHN_SYSTEMWIDE_EXEC		"/usr/libexec/john"
+#define JOHN_SYSTEMWIDE_HOME		"/usr/share/john"
 #define JOHN_PRIVATE_HOME		"~/.john"
 #endif
 

 /*
  * File names.
  */
-#define CFG_FULL_NAME		"%%PREFIX%%/share/john/john.conf"
-#define CFG_ALT_NAME		"%%PREFIX%%/share/john/john.ini"
+#define CFG_FULL_NAME			"$JOHN/john.conf"
+#define CFG_ALT_NAME			"$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"
@@ -82,7 +82,7 @@
 #define LOG_NAME			"$JOHN/john.pot"
 #define RECOVERY_NAME			"$JOHN/restore"
 #endif
 #define LOG_SUFFIX			".log"
 #define RECOVERY_SUFFIX			".rec"
-#define WORDLIST_NAME		"%%PREFIX%%/share/john/password.lst"
+#define WORDLIST_NAME			"$JOHN/password.lst"
 
 /*
  * Configuration file section names.

Return to bug 65623

Lines 1-13 Link Here

(-)files/patch-params.h (-16 / +21 lines)
1	--- params.h Sun Sep 15 20:19:20 2002	1	--- params.h Wed Apr 14 15:41:15 2004
2	+++ params.h Wed Jan 15 23:50:29 2003	2	+++ params.h Mon Feb 23 16:07:38 2004
3	@@ -26,8 +26,8 @@	3	@@ -22,12 +22,12 @@
		4	* will probably want to set this to 1 for their builds of John.
		5	*/
		6	#ifndef JOHN_SYSTEMWIDE
		7	-#define JOHN_SYSTEMWIDE 1
		8	+#define JOHN_SYSTEMWIDE 0
4	#endif	9	#endif
5		10
6	#if JOHN_SYSTEMWIDE	11	#if JOHN_SYSTEMWIDE
7	-#define JOHN_SYSTEMWIDE_EXEC "/usr/libexec/john"	12	-#define JOHN_SYSTEMWIDE_EXEC "%%PREFIX%%/bin/john"
8	-#define JOHN_SYSTEMWIDE_HOME "/usr/share/john"	13	-#define JOHN_SYSTEMWIDE_HOME "%%PREFIX%%/share/john"
9	+#define JOHN_SYSTEMWIDE_EXEC "%%PREFIX%%/bin/john"	14	+#define JOHN_SYSTEMWIDE_EXEC "/usr/libexec/john"
10	+#define JOHN_SYSTEMWIDE_HOME "%%PREFIX%%/share/john"	15	+#define JOHN_SYSTEMWIDE_HOME "/usr/share/john"
11	#define JOHN_PRIVATE_HOME "~/.john"	16	#define JOHN_PRIVATE_HOME "~/.john"
12	#endif	17	#endif
13		18
Lines 15-33 Link Here
15	/*	20	/*
16	* File names.	21	* File names.
17	*/	22	*/
18	-#define CFG_FULL_NAME "$JOHN/john.conf"	23	-#define CFG_FULL_NAME "%%PREFIX%%/share/john/john.conf"
19	-#define CFG_ALT_NAME "$JOHN/john.ini"	24	-#define CFG_ALT_NAME "%%PREFIX%%/share/john/john.ini"
20	+#define CFG_FULL_NAME "%%PREFIX%%/share/john/john.conf"	25	+#define CFG_FULL_NAME "$JOHN/john.conf"
21	+#define CFG_ALT_NAME "%%PREFIX%%/share/john/john.ini"	26	+#define CFG_ALT_NAME "$JOHN/john.ini"
22	#if JOHN_SYSTEMWIDE	27	#if JOHN_SYSTEMWIDE
23	#define CFG_PRIVATE_FULL_NAME JOHN_PRIVATE_HOME "/john.conf"	28	#define CFG_PRIVATE_FULL_NAME JOHN_PRIVATE_HOME "/john.conf"
24	#define CFG_PRIVATE_ALT_NAME JOHN_PRIVATE_HOME "/john.ini"	29	#define CFG_PRIVATE_ALT_NAME JOHN_PRIVATE_HOME "/john.ini"
25	@@ -78,7 +78,7 @@	30	@@ -82,7 +82,7 @@
26	#define LOG_NAME "$JOHN/john.pot"
27	#define RECOVERY_NAME "$JOHN/restore"
28	#endif	31	#endif
29	-#define WORDLIST_NAME "$JOHN/password.lst"	32	#define LOG_SUFFIX ".log"
30	+#define WORDLIST_NAME "%%PREFIX%%/share/john/password.lst"	33	#define RECOVERY_SUFFIX ".rec"
		34	-#define WORDLIST_NAME "%%PREFIX%%/share/john/password.lst"
		35	+#define WORDLIST_NAME "$JOHN/password.lst"
31		36
32	/*	37	/*
33	* Configuration file section names.	38	* Configuration file section names.