wok-next rev 21317

updated john (1.7.8 -> 1.9.0)
author Hans-G?nter Theisgen
date Tue Dec 10 17:31:47 2019 +0100 (2019-12-10)
parents ee28ed2bfbee
children 51ac2bce386d
files john/receipt
line diff
     1.1 --- a/john/receipt	Tue Dec 10 17:15:57 2019 +0100
     1.2 +++ b/john/receipt	Tue Dec 10 17:31:47 2019 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="john"
     1.7 -VERSION="1.7.8"
     1.8 +VERSION="1.9.0"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="Fast password cracker"
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -13,16 +13,18 @@
    1.13  
    1.14  BUILD_DEPENDS="libdes-dev openssl-dev zlib-dev"
    1.15  
    1.16 -PATCH="http://www.openwall.com/john/g/$PACKAGE-$VERSION-jumbo-7.diff.gz"
    1.17 -EXTRA_SOURCE_FILES="$PATCH"
    1.18 +#PATCH="http://www.openwall.com/john/g/$PACKAGE-$VERSION-jumbo-7.diff.gz"
    1.19 +#EXTRA_SOURCE_FILES="$PATCH"
    1.20  
    1.21 -compile_rules() {
    1.22 -	[ -s $SRC/$(basename $PATCH) ] ||
    1.23 -		wget -P $SRC $PATCH
    1.24 -	zcat $SRC/$(basename $PATCH) | patch -p1
    1.25 +compile_rules()
    1.26 +{
    1.27 +#	[ -s $SRC/$(basename $PATCH) ] ||
    1.28 +#		wget -P $SRC $PATCH
    1.29 +#	zcat $SRC/$(basename $PATCH) | patch -p1
    1.30  
    1.31  	cd $src/src
    1.32 -	sed -i 's|LIBS = -ldes|LIBS = -ldes -Ldes|' Makefile
    1.33 +	sed -i 's|LIBS = -ldes|LIBS = -ldes -Ldes|' \
    1.34 +		Makefile
    1.35  
    1.36  	case $ARCH in
    1.37  		x86_64) Arch='nocona';;
    1.38 @@ -31,7 +33,10 @@
    1.39  	sed -i "s|CFLAGS = -c -Wall -O2|CFLAGS = -c -Wall -O2 -march=$Arch -DJOHN_SYSTEMWIDE=1|" Makefile
    1.40  	make clean generic || return 1
    1.41  
    1.42 -	mkdir -p $install/usr/sbin $install/etc/john $install/usr/share/john
    1.43 +	mkdir -p $install/usr/sbin
    1.44 +	mkdir -p $install/etc/john
    1.45 +	mkdir -p $install/usr/share/john
    1.46 +
    1.47  	cp -a $src/run/john         $install/usr/sbin
    1.48  	cp -a $src/run/mailer       $install/usr/sbin
    1.49  	cp -a $src/run/unafs        $install/usr/sbin
    1.50 @@ -42,11 +47,13 @@
    1.51  	cp -a $src/run/generic.conf $install/usr/share/john
    1.52  	cp -a $src/run/password.lst $install/usr/share/john
    1.53  	cp $src/run/john.conf       $install/etc/john
    1.54 +
    1.55  	sed -i 's|$JOHN|/usr/share/john|g' $install/etc/john/john.conf
    1.56  }
    1.57  
    1.58 -genpkg_rules() {
    1.59 +genpkg_rules()
    1.60 +{
    1.61  	copy @std
    1.62 -	DEPENDS="openssl libdes"
    1.63 +	DEPENDS="libdes openssl"
    1.64  	CONFIG_FILES="/etc/john/john.conf"
    1.65  }