head	1.3;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.3.2.2
	OPENPKG_E1_FP:1.3.2.2
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_2_STABLE_20061018:1.3.2.2
	OPENPKG_2_STABLE:1.3.0.2;
locks; strict;
comment	@# @;


1.3
date	2006.03.11.07.56.31;	author rse;	state Exp;
branches
	1.3.2.1;
next	1.2;
commitid	Y2WKeFRWiYMjLJor;

1.2
date	2005.12.18.19.31.34;	author rse;	state Exp;
branches;
next	1.1;
commitid	v3D8atjhcw3bh8er;

1.1
date	2005.05.12.19.15.56;	author rse;	state Exp;
branches;
next	;

1.3.2.1
date	2006.03.11.07.56.31;	author rse;	state dead;
branches;
next	1.3.2.2;
commitid	iZxwRSmmWscPXUQr;

1.3.2.2
date	2006.10.16.14.51.27;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.3
log
@upgrading package: john 1.7 -> 1.7.0.1
@
text
@Index: src/params.h
--- src/params.h.orig	2006-03-05 02:06:48 +0100
+++ src/params.h	2006-03-11 08:47:22 +0100
@@@@ -49,15 +49,15 @@@@
  * notes above.
  */
 #ifndef JOHN_SYSTEMWIDE
-#define JOHN_SYSTEMWIDE			0
+#define JOHN_SYSTEMWIDE			1
 #endif
 
 #if JOHN_SYSTEMWIDE
 #ifndef JOHN_SYSTEMWIDE_EXEC /* please refer to the notes above */
-#define JOHN_SYSTEMWIDE_EXEC		"/usr/libexec/john"
+#define JOHN_SYSTEMWIDE_EXEC		"@@l_prefix@@/libexec/john"
 #endif
 #ifndef JOHN_SYSTEMWIDE_HOME
-#define JOHN_SYSTEMWIDE_HOME		"/usr/share/john"
+#define JOHN_SYSTEMWIDE_HOME		"@@l_prefix@@/etc/john"
 #endif
 #define JOHN_PRIVATE_HOME		"~/.john"
 #endif
@


1.3.2.1
log
@file john.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:51:27 +0000
@
text
@d1 22
@


1.3.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 22
Index: src/params.h
--- src/params.h.orig	2006-03-05 02:06:48 +0100
+++ src/params.h	2006-03-11 08:47:22 +0100
@@@@ -49,15 +49,15 @@@@
  * notes above.
  */
 #ifndef JOHN_SYSTEMWIDE
-#define JOHN_SYSTEMWIDE			0
+#define JOHN_SYSTEMWIDE			1
 #endif
 
 #if JOHN_SYSTEMWIDE
 #ifndef JOHN_SYSTEMWIDE_EXEC /* please refer to the notes above */
-#define JOHN_SYSTEMWIDE_EXEC		"/usr/libexec/john"
+#define JOHN_SYSTEMWIDE_EXEC		"@@l_prefix@@/libexec/john"
 #endif
 #ifndef JOHN_SYSTEMWIDE_HOME
-#define JOHN_SYSTEMWIDE_HOME		"/usr/share/john"
+#define JOHN_SYSTEMWIDE_HOME		"@@l_prefix@@/etc/john"
 #endif
 #define JOHN_PRIVATE_HOME		"~/.john"
 #endif
@


1.2
log
@upgrading package: john 1.6.39 -> 1.6.40
@
text
@d2 4
a5 4
--- src/params.h.orig	2005-12-16 16:47:25 +0100
+++ src/params.h	2005-12-18 20:29:41 +0100
@@@@ -22,15 +22,15 @@@@
  * will probably want to set this to 1 for their builds of John.
d13 1
a13 1
 #ifndef JOHN_SYSTEMWIDE_EXEC
@


1.1
log
@new package: john 1.6.38 (Password Cracking Tool)
@
text
@d2 3
a4 3
--- src/params.h.orig	2005-05-11 05:01:34 +0200
+++ src/params.h	2005-05-12 21:05:07 +0200
@@@@ -22,12 +22,12 @@@@
d13 1
d15 3
a18 1
+#define JOHN_SYSTEMWIDE_EXEC		"@@l_prefix@@/libexec/john"
d20 1
a22 1
 
@