wok-next diff john/receipt @ rev 20473

Tiny edits...
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Mar 10 16:57:21 2018 +0200 (2018-03-10)
parents 145bc1c732ca
children d43bf7aae921
line diff
     1.1 --- a/john/receipt	Mon Nov 06 00:09:37 2017 +0100
     1.2 +++ b/john/receipt	Sat Mar 10 16:57:21 2018 +0200
     1.3 @@ -1,50 +1,53 @@
     1.4 -# SliTaz package receipt.
     1.5 +# SliTaz package receipt v2.
     1.6  
     1.7  PACKAGE="john"
     1.8  VERSION="1.7.8"
     1.9  CATEGORY="system-tools"
    1.10 -SHORT_DESC="Fast password cracker."
    1.11 +SHORT_DESC="Fast password cracker"
    1.12  MAINTAINER="pascal.bellard@slitaz.org"
    1.13  LICENSE="GPL2"
    1.14 +WEB_SITE="http://www.openwall.com/john/"
    1.15 +
    1.16  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.17 -WEB_SITE="http://www.openwall.com/john/"
    1.18  WGET_URL="${WEB_SITE}g/$TARBALL"
    1.19 -CONFIG_FILES="/etc/john/john.conf"
    1.20  
    1.21 -DEPENDS="openssl libdes"
    1.22  BUILD_DEPENDS="libdes-dev openssl-dev zlib-dev"
    1.23  
    1.24  PATCH="http://www.openwall.com/john/g/$PACKAGE-$VERSION-jumbo-7.diff.gz"
    1.25  EXTRA_SOURCE_FILES="$PATCH"
    1.26  
    1.27 -# Rules to configure and make the package.
    1.28 -compile_rules()
    1.29 -{
    1.30 -	cd $src
    1.31 +compile_rules() {
    1.32  	[ -s $SOURCES_REPOSITORY/$(basename $PATCH) ] ||
    1.33  		wget -P $SOURCES_REPOSITORY $PATCH
    1.34  	zcat $SRC/$(basename $PATCH) | patch -p1
    1.35 +
    1.36  	cd $src/src
    1.37  	patch -Np0 -i $stuff/params.h.patch
    1.38  	sed -i 's|LIBS = -ldes|LIBS = -ldes -Ldes|' Makefile
    1.39 -	sed -i "s|CFLAGS = -c -Wall -O2|CFLAGS = -c -Wall -O2 -march=$ARCH -DJOHN_SYSTEMWIDE=1|" Makefile
    1.40 -	make clean generic
    1.41 +
    1.42 +	case $ARCH in
    1.43 +		x86_64) Arch='nocona';;
    1.44 +		*)      Arch="$ARCH";;
    1.45 +	esac
    1.46 +	sed -i "s|CFLAGS = -c -Wall -O2|CFLAGS = -c -Wall -O2 -march=$Arch -DJOHN_SYSTEMWIDE=1|" Makefile
    1.47 +	make clean generic || return 1
    1.48 +
    1.49 +	mkdir -p $install/usr/sbin $install/etc/john $install/usr/share/john
    1.50 +	cp -a $src/run/john         $install/usr/sbin
    1.51 +	cp -a $src/run/mailer       $install/usr/sbin
    1.52 +	cp -a $src/run/unafs        $install/usr/sbin
    1.53 +	cp -a $src/run/unique       $install/usr/sbin
    1.54 +	cp -a $src/run/unshadow     $install/usr/sbin
    1.55 +	cp -a $src/run/*.chr        $install/usr/share/john
    1.56 +	cp -a $src/run/dumb??.conf  $install/usr/share/john
    1.57 +	cp -a $src/run/generic.conf $install/usr/share/john
    1.58 +	cp -a $src/run/password.lst $install/usr/share/john
    1.59 +	cp $src/run/john.conf       $install/etc/john
    1.60 +	sed -i 's|$JOHN|/usr/share/john|g' $install/etc/john/john.conf
    1.61  }
    1.62  
    1.63 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.64 -genpkg_rules()
    1.65 -{
    1.66 -	mkdir -p $fs/usr/sbin $fs/etc/john $fs/usr/share/john
    1.67 -	cp -a $src/run/john $fs/usr/sbin
    1.68 -	cp -a $src/run/mailer $fs/usr/sbin
    1.69 -	cp -a $src/run/unafs $fs/usr/sbin
    1.70 -	cp -a $src/run/unique $fs/usr/sbin
    1.71 -	cp -a $src/run/unshadow $fs/usr/sbin
    1.72 -	cp -a $src/run/*.chr $fs/usr/share/john
    1.73 -	cp -a $src/run/dumb??.conf $fs/usr/share/john
    1.74 -	cp -a $src/run/generic.conf $fs/usr/share/john
    1.75 -	cp -a $src/run/password.lst $fs/usr/share/john
    1.76 -	cp $src/run/john.conf $fs/etc/john
    1.77 -	sed -i 's|$JOHN|/usr/share/john|g' $fs/etc/john/john.conf
    1.78 +genpkg_rules() {
    1.79 +	copy @std
    1.80 +	DEPENDS="openssl libdes"
    1.81 +	CONFIG_FILES="/etc/john/john.conf"
    1.82  }
    1.83 -