Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=55bcb80aa2944ef16e7f8f7c3158edd2839bd573
commit 55bcb80aa2944ef16e7f8f7c3158edd2839bd573 Author: Marius Cirsta <[email protected]> Date: Mon Jun 4 20:02:59 2012 +0000 john-1.7.9_jumbo_5-1-x86_64 * fixes #3478 * version bump * changed m8r diff --git a/source/apps-extra/john/FrugalBuild b/source/apps-extra/john/FrugalBuild index 787aa8e..7709d96 100644 --- a/source/apps-extra/john/FrugalBuild +++ b/source/apps-extra/john/FrugalBuild @@ -1,9 +1,10 @@ # Compiling Time: 0.03 SBU -# Maintainer: DNAku <[email protected]> -# Contributor: Tuxbubling <[email protected]> +# Maintainer: Marius Cirsta <[email protected]> +# Contributor: DNAku <[email protected]> pkgname=john -pkgver=1.7.8 +_jumbover=5 +pkgver=1.7.9_jumbo_${_jumbover} pkgrel=1 pkgdesc="John the Ripper is a fast password cracker." url="http://www.openwall.com/john/"; @@ -11,39 +12,38 @@ depends=() groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://openwall.com/john |Flasttar" -source=(http://openwall.com/john/g/john-$pkgver.tar.gz \ - john john-mailer http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-chrs.tar.bz2) -sha1sums=('0f51495fb188955d0fede609810a60b10e6f208f' \ - '215f1d0f271c10bccff2ef652ad8f07cb6e32196' \ - 'ba20178891ed1ca2aac942af00cf0ce5d6738921' \ - 'ab6461b07c8b9c8669154d4e58f52044c1396208') +source=(http://www.openwall.com/$pkgname/g/$pkgname-${pkgver//_/-}.tar.bz2 \ + http://www.openwall.com/john/g/john-${pkgver//_/-}.diff.gz \ + john) +sha1sums=('cb20d78cb08e19637c5ed7d82c09bdc933fb8412' \ + 'b1b49dcb17a8edde5931664cd8baf77c4d4cf4aa' \ + '6ac620306d267b5002f6fa16137ddc8c04dd4e66') -[ "$CARCH" == "x86_64" ] && targetarch=linux-x86-64 -[ "$CARCH" == "i686" ] && targetarch=linux-x86-mmx +_F_cd_path=$pkgname-${pkgver//_/-}/src + +[ "$CARCH" == "x86_64" ] && _F_make_opts="${MAKEFLAGS} linux-x86-64" +[ "$CARCH" == "i686" ] && _F_make_opts="${MAKEFLAGS} linux-x86-mmx" build() { - # Create needed dirs - Fmkdir usr/lib/ - Fmkdir usr/share/doc/$pkgname-$pkgver - # Add CFLAGS and run make - Fcd $pkgname-$pkgver/src - Fsed "CFLAGS =" "CFLAGS = $CFLAGS" ./Makefile - Fsed "-m486" "" ./Makefile - make $targetarch || Fdie - + Fsed "CFLAGS =" "CFLAGS = $CFLAGS -DJOHN_SYSTEMWIDE=1" Makefile + Fsed "-m486" "" Makefile + Fmake + # Move and install files - mv ../run $Fdestdir/usr/lib/john - mv ../doc $Fdestdir/usr/share/doc/$pkgname-$pkgver + Ffilerel ../run/john.conf /etc/john/john.conf + Fexerel ../run/* usr/lib/john + Fdocrel ../doc/* Fexe usr/bin/john - Fexe usr/bin/john-mailer Fln /usr/lib/john/john usr/bin/unafs Fln /usr/lib/john/john usr/bin/unique Fln /usr/lib/john/john usr/bin/unshadow Frm usr/lib/john/un{afs,ique,shadow} - Ffilerel $Fsrcdir/john-chrs/* /usr/lib/john/ - chmod -R 755 $Fdestdir/usr/lib/john + + #clean up the conf file + sed -i 's/^\.include ["<].*//g' $Fdestdir/etc/john/john.conf + } # optimization OK diff --git a/source/apps-extra/john/john b/source/apps-extra/john/john index fb5860c..34dc582 100644 --- a/source/apps-extra/john/john +++ b/source/apps-extra/john/john @@ -7,7 +7,7 @@ DIR=/usr/lib/john if [ -x $DIR ]; then cd $DIR if [ -x ./john ]; then - exec ./john "$@" + exec ./john --config=/etc/john/john.conf "$@" else echo "Cannot execute john, or john executable missing." echo "Review your installation!" diff --git a/source/apps-extra/john/john-mailer b/source/apps-extra/john/john-mailer deleted file mode 100644 index 53aafd8..0000000 --- a/source/apps-extra/john/john-mailer +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# John the ripper shortcut script for Frugalware -# Tuxbubling <[email protected]> - -DIR=/usr/lib/john - -if [ -x $DIR ]; then - cd $DIR - if [ -x ./mailer ]; then - exec ./mailer "$@" - else - echo "Cannot execute mailer, or mailer script missing." - echo "Review your installation!" - fi -else - echo "Cannot cd to john install dir, or dir missing." - echo "Review your installation!" -fi \ No newline at end of file diff --git a/source/apps-extra/john/john.install b/source/apps-extra/john/john.install deleted file mode 100644 index d193d16..0000000 --- a/source/apps-extra/john/john.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() -{ - /bin/true -} - -post_remove() -{ - [ -d /usr/lib/john ] && rm -r /usr/lib/john > /dev/null -} - -op=$1 -shift - -$op $* - -# vim: ft=sh _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
