wok-current rev 10867

john: Fixed. Add patch so $JOHN is set to /usr/share/john. Also add all *.chr files and password.lst to /usr/share/john.
author Christopher Rogers <slaxemulator@gmail.com>
date Sun Jun 19 11:36:07 2011 +0000 (2011-06-19)
parents 97f23cb94dd2
children 5e89c125c736
files john/receipt john/stuff/params.h.patch
line diff
     1.1 --- a/john/receipt	Sun Jun 19 13:08:44 2011 +0200
     1.2 +++ b/john/receipt	Sun Jun 19 11:36:07 2011 +0000
     1.3 @@ -8,24 +8,28 @@
     1.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
     1.5  WEB_SITE="http://www.openwall.com/john/"
     1.6  WGET_URL="${WEB_SITE}g/$TARBALL"
     1.7 -CONFIG_FILES="/etc/john"
     1.8 +CONFIG_FILES="/etc/john/john.conf"
     1.9  
    1.10  # Rules to configure and make the package.
    1.11  compile_rules()
    1.12  {
    1.13  	cd $src/src
    1.14 +	patch -Np0 -i $stuff/params.h.patch
    1.15  	make clean generic
    1.16  }
    1.17  
    1.18  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.19  genpkg_rules()
    1.20  {
    1.21 -	mkdir -p $fs/usr/sbin $fs/etc/john
    1.22 +	mkdir -p $fs/usr/sbin $fs/etc/john $fs/usr/share/john
    1.23  	cp -a $src/run/john $fs/usr/sbin
    1.24  	cp -a $src/run/mailer $fs/usr/sbin
    1.25  	cp -a $src/run/unafs $fs/usr/sbin
    1.26  	cp -a $src/run/unique $fs/usr/sbin
    1.27  	cp -a $src/run/unshadow $fs/usr/sbin
    1.28 +	cp -a $src/run/*.chr $fs/usr/share/john
    1.29 +	cp -a $src/run/password.lst $fs/usr/share/john
    1.30  	cp $src/run/john.conf $fs/etc/john
    1.31 +	sed -i 's|$JOHN|/usr/share/john|g' $fs/etc/john/john.conf
    1.32  }
    1.33  
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/john/stuff/params.h.patch	Sun Jun 19 11:36:07 2011 +0000
     2.3 @@ -0,0 +1,13 @@
     2.4 +--- params.h.orig	2006-03-17 08:23:42.000000000 -0500
     2.5 ++++ params.h	2006-03-17 08:50:35.000000000 -0500
     2.6 +@@ -101,8 +101,8 @@
     2.7 + /*
     2.8 +  * File names.
     2.9 +  */
    2.10 +-#define CFG_FULL_NAME			"$JOHN/john.conf"
    2.11 +-#define CFG_ALT_NAME			"$JOHN/john.ini"
    2.12 ++#define CFG_FULL_NAME			"/etc/john/john.conf"
    2.13 ++#define CFG_ALT_NAME			"/etc/john/john.ini"
    2.14 + #if JOHN_SYSTEMWIDE
    2.15 + #define CFG_PRIVATE_FULL_NAME		JOHN_PRIVATE_HOME "/john.conf"
    2.16 + #define CFG_PRIVATE_ALT_NAME		JOHN_PRIVATE_HOME "/john.ini"