openbsd-ports/security/john/patches/patch-src_params_h

$OpenBSD: patch-src_params_h,v 1.7 2010/07/17 22:46:03 benoit Exp $
--- src/params.h.orig	Mon Jun 14 04:38:55 2010
+++ src/params.h	Sat Jul 17 18:29:44 2010
@@ -51,15 +51,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		"${PREFIX}/bin/john"
 #endif
 #ifndef JOHN_SYSTEMWIDE_HOME
-#define JOHN_SYSTEMWIDE_HOME		"/usr/share/john"
+#define JOHN_SYSTEMWIDE_HOME		"${PREFIX}/share/john"
 #endif
 #define JOHN_PRIVATE_HOME		"~/.john"
 #endif
@@ -103,7 +103,7 @@
 /*
  * File names.
  */
-#define CFG_FULL_NAME			"$JOHN/john.conf"
+#define CFG_FULL_NAME			"${SYSCONFDIR}/john.conf"
 #define CFG_ALT_NAME			"$JOHN/john.ini"
 #if JOHN_SYSTEMWIDE
 #define CFG_PRIVATE_FULL_NAME		JOHN_PRIVATE_HOME "/john.conf"
- update john to 1.7.6 - update patches - use SUBST_CMD ok sthen@ 2010-07-17 18:46:00 -04:00			$OpenBSD: patch-src_params_h,v 1.7 2010/07/17 22:46:03 benoit Exp $
			`--- src/params.h.orig Mon Jun 14 04:38:55 2010`
			`+++ src/params.h Sat Jul 17 18:29:44 2010`
			`@@ -51,15 +51,15 @@`
update to john 1.7.0.2 remove the no_mmx FLAVOR from maintainer cathcart@ 2006-07-16 14:17:25 -04:00			`* notes above.`
Update to 1.6.36 offering significant performance improvements over the 1.6 version. Also now uses the system dictionary as a wordlist by default. Removed MAINTAINER at MAINTAINER's request. ok MAINTAINER 2003-09-26 13:57:38 -04:00			`*/`
			`#ifndef JOHN_SYSTEMWIDE`
			`-#define JOHN_SYSTEMWIDE 0`
			`+#define JOHN_SYSTEMWIDE 1`
			`#endif`

			`#if JOHN_SYSTEMWIDE`
update to john 1.7.0.2 remove the no_mmx FLAVOR from maintainer cathcart@ 2006-07-16 14:17:25 -04:00			`#ifndef JOHN_SYSTEMWIDE_EXEC /* please refer to the notes above */`
Update to 1.6.36 offering significant performance improvements over the 1.6 version. Also now uses the system dictionary as a wordlist by default. Removed MAINTAINER at MAINTAINER's request. ok MAINTAINER 2003-09-26 13:57:38 -04:00			`-#define JOHN_SYSTEMWIDE_EXEC "/usr/libexec/john"`
- update john to 1.7.6 - update patches - use SUBST_CMD ok sthen@ 2010-07-17 18:46:00 -04:00			`+#define JOHN_SYSTEMWIDE_EXEC "${PREFIX}/bin/john"`
Update to 1.6.40 Take Maintainership ok sturm 2006-01-05 23:26:09 -05:00			`#endif`
			`#ifndef JOHN_SYSTEMWIDE_HOME`
			`-#define JOHN_SYSTEMWIDE_HOME "/usr/share/john"`
- update john to 1.7.6 - update patches - use SUBST_CMD ok sthen@ 2010-07-17 18:46:00 -04:00			`+#define JOHN_SYSTEMWIDE_HOME "${PREFIX}/share/john"`
Update to 1.6.40 Take Maintainership ok sturm 2006-01-05 23:26:09 -05:00			`#endif`
Update to 1.6.36 offering significant performance improvements over the 1.6 version. Also now uses the system dictionary as a wordlist by default. Removed MAINTAINER at MAINTAINER's request. ok MAINTAINER 2003-09-26 13:57:38 -04:00			`#define JOHN_PRIVATE_HOME "~/.john"`
			`#endif`
- update john to 1.7.6 - update patches - use SUBST_CMD ok sthen@ 2010-07-17 18:46:00 -04:00			`@@ -103,7 +103,7 @@`
Fix hard coded paths to config files, character sets, and word lists. OK maintainer cathcart@. 2007-04-26 00:14:01 -04:00			`/*`
			`* File names.`
			`*/`
			`-#define CFG_FULL_NAME "$JOHN/john.conf"`
- update john to 1.7.6 - update patches - use SUBST_CMD ok sthen@ 2010-07-17 18:46:00 -04:00			`+#define CFG_FULL_NAME "${SYSCONFDIR}/john.conf"`
Fix hard coded paths to config files, character sets, and word lists. OK maintainer cathcart@. 2007-04-26 00:14:01 -04:00			`#define CFG_ALT_NAME "$JOHN/john.ini"`
			`#if JOHN_SYSTEMWIDE`
			`#define CFG_PRIVATE_FULL_NAME JOHN_PRIVATE_HOME "/john.conf"`