# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1308483367 0
# Node ID c34a2d4b16b6b4f1533de95fe993e375b5aa5bf4
# Parent  97f23cb94dd2675aba1f62f47d824176194d9045
john: Fixed. Add patch so $JOHN is set to /usr/share/john. Also add all *.chr files and password.lst to /usr/share/john.

diff -r 97f23cb94dd2 -r c34a2d4b16b6 john/receipt
--- a/john/receipt	Sun Jun 19 13:08:44 2011 +0200
+++ b/john/receipt	Sun Jun 19 11:36:07 2011 +0000
@@ -8,24 +8,28 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.openwall.com/john/"
 WGET_URL="${WEB_SITE}g/$TARBALL"
-CONFIG_FILES="/etc/john"
+CONFIG_FILES="/etc/john/john.conf"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src/src
+	patch -Np0 -i $stuff/params.h.patch
 	make clean generic
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/sbin $fs/etc/john
+	mkdir -p $fs/usr/sbin $fs/etc/john $fs/usr/share/john
 	cp -a $src/run/john $fs/usr/sbin
 	cp -a $src/run/mailer $fs/usr/sbin
 	cp -a $src/run/unafs $fs/usr/sbin
 	cp -a $src/run/unique $fs/usr/sbin
 	cp -a $src/run/unshadow $fs/usr/sbin
+	cp -a $src/run/*.chr $fs/usr/share/john
+	cp -a $src/run/password.lst $fs/usr/share/john
 	cp $src/run/john.conf $fs/etc/john
+	sed -i 's|$JOHN|/usr/share/john|g' $fs/etc/john/john.conf
 }
 
diff -r 97f23cb94dd2 -r c34a2d4b16b6 john/stuff/params.h.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/john/stuff/params.h.patch	Sun Jun 19 11:36:07 2011 +0000
@@ -0,0 +1,13 @@
+--- params.h.orig	2006-03-17 08:23:42.000000000 -0500
++++ params.h	2006-03-17 08:50:35.000000000 -0500
+@@ -101,8 +101,8 @@
+ /*
+  * File names.
+  */
+-#define CFG_FULL_NAME			"$JOHN/john.conf"
+-#define CFG_ALT_NAME			"$JOHN/john.ini"
++#define CFG_FULL_NAME			"/etc/john/john.conf"
++#define CFG_ALT_NAME			"/etc/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"