Attachment #163670 for bug #204903

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

Lines 3-9 Link Here

(-)security/john/Makefile (-1 / +2 lines)
3		3
4	PORTNAME= john	4	PORTNAME= john
5	DISTVERSION= 1.7.9-jumbo-7	5	DISTVERSION= 1.7.9-jumbo-7
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= security	7	CATEGORIES= security
8	MASTER_SITES= http://www.openwall.com/john/g/ \	8	MASTER_SITES= http://www.openwall.com/john/g/ \
9	http://mirrors.kernel.org/openwall/projects/john/${DISTVERSION:C/-.*//}/ \	9	http://mirrors.kernel.org/openwall/projects/john/${DISTVERSION:C/-.*//}/ \
Lines 38-43 Link Here
38		38
39	OPTIONS_DEFINE= OPENMP DOCS	39	OPTIONS_DEFINE= OPENMP DOCS
40	OPENMP_DESC= Compile with OpenMP support	40	OPENMP_DESC= Compile with OpenMP support
		41	OPENMP_USES= compiler:openmp
41		42
42	.include <bsd.port.pre.mk>	43	.include <bsd.port.pre.mk>
43		44




--- src/params.h.orig
+++ src/params.h
@@ -101,7 +101,11 @@
 /*
  * File names.
  */
+#if JOHN_SYSTEMWIDE
+#ifndef CFG_FULL_NAME
 #define CFG_FULL_NAME			"$JOHN/john.conf"
+#endif
+#endif
 #define CFG_ALT_NAME			"$JOHN/john.ini"
 #if JOHN_SYSTEMWIDE
 #define CFG_PRIVATE_FULL_NAME		JOHN_PRIVATE_HOME "/john.conf"




--- src/params.h.orig	2012-09-20 14:35:00 UTC
+++ src/params.h
@@ -134,7 +134,11 @@
 /*
  * File names.
  */
+#if JOHN_SYSTEMWIDE
+#ifndef CFG_FULL_NAME
 #define CFG_FULL_NAME			"$JOHN/john.conf"
+#endif
+#endif
 #define CFG_ALT_NAME			"$JOHN/john.ini"
 #if JOHN_SYSTEMWIDE
 #define CFG_PRIVATE_FULL_NAME		JOHN_PRIVATE_HOME "/john.conf"

Return to bug 204903

Lines 1-14 Link Here

(-)security/john/files/patch-params.h (-14 lines)
1	--- src/params.h.orig
2	+++ src/params.h
3	@@ -101,7 +101,11 @@
4	/*
5	* File names.
6	*/
7	+#if JOHN_SYSTEMWIDE
8	+#ifndef CFG_FULL_NAME
9	#define CFG_FULL_NAME "$JOHN/john.conf"
10	+#endif
11	+#endif
12	#define CFG_ALT_NAME "$JOHN/john.ini"
13	#if JOHN_SYSTEMWIDE
14	#define CFG_PRIVATE_FULL_NAME JOHN_PRIVATE_HOME "/john.conf"

Line 0 Link Here

(-)security/john/files/patch-src_params.h (+14 lines)
	1	--- src/params.h.orig 2012-09-20 14:35:00 UTC
	2	+++ src/params.h
	3	@@ -134,7 +134,11 @@
	4	/*
	5	* File names.
	6	*/
	7	+#if JOHN_SYSTEMWIDE
	8	+#ifndef CFG_FULL_NAME
	9	#define CFG_FULL_NAME "$JOHN/john.conf"
	10	+#endif
	11	+#endif
	12	#define CFG_ALT_NAME "$JOHN/john.ini"
	13	#if JOHN_SYSTEMWIDE
	14	#define CFG_PRIVATE_FULL_NAME JOHN_PRIVATE_HOME "/john.conf"