diff options
| -rw-r--r-- | system/john/README | 7 | ||||
| -rw-r--r-- | system/john/john.SlackBuild | 20 | ||||
| -rw-r--r-- | system/john/john.info | 10 |
3 files changed, 15 insertions, 22 deletions
diff --git a/system/john/README b/system/john/README index 730f6eb0ba..680dc18c4d 100644 --- a/system/john/README +++ b/system/john/README @@ -20,8 +20,5 @@ MERGEWORDS=1 to the build script: The options can be used in combination as well: JUMBO=1 MERGEWORDS=1 sh john.SlackBuild -For more information, consult the documentation installed in: - /usr/doc/john-1.7.8 -and, of course, the John the Ripper homepage: - http://www.openwall.com/john - +For more information, consult the project's homepage and/or the documentation +installed in /usr/doc/john-1.7.9 diff --git a/system/john/john.SlackBuild b/system/john/john.SlackBuild index 87d2705721..5c73e1be2f 100644 --- a/system/john/john.SlackBuild +++ b/system/john/john.SlackBuild @@ -3,17 +3,16 @@ # Slackware build script for John the Ripper # Written by Murat D. Kadirov <banderols@gmail.com> -# -# 20/Nov/2011 * Updated to 1.7.8 and jambo-patch 8 -# Thanks a lot Kent Fritz for patch with many improvements +# 20/Nov/2011 * Updated for version 1.7.8 and jambo-patch 8 +# Thanks a lot Kent Fritz for patch with many improvements +# 19/Dec/2011 * Updated for version 1.7.9 and jambo-patch 5 PRGNAM=john -VERSION=${VERSION:-1.7.8} +VERSION=${VERSION:-1.7.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} - -JUMBOVERSION=${JUMBOVERSION:-8} +JUMBOVERSION=${JUMBOVERSION:-5} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -57,7 +56,7 @@ rm -f $PRGNAM-$VERSION/README # Apply the Jumbo patch? if [ "$JUMBO" = "1" ]; then - zcat $CWD/john-1.7.8-jumbo-${JUMBOVERSION}.diff.gz | patch -p0 || exit 1 + zcat $CWD/john-$VERSION-jumbo-${JUMBOVERSION}.diff.gz | patch -p0 || exit 1 mv $PRGNAM-$VERSION/README-jumbo $PRGNAM-$VERSION/doc/README-jumbo fi @@ -73,9 +72,7 @@ mkdir -p $PKG/usr/share/john cp -a run/* $PKG/usr/share/john rm $PKG/usr/share/john/mailer -#cd src - make -C src clean $TARGET CFLAGS="-DJOHN_SYSTEMWIDE=1 -c -Wall -O2 -fomit-frame-pointer" -#cd - +make -C src clean $TARGET CFLAGS="-DJOHN_SYSTEMWIDE=1 -c -Wall -O2 -fomit-frame-pointer" # Merge /usr/share/dict/words into password list? if [ "$MERGEWORDS" = "1" ]; then @@ -88,8 +85,7 @@ if [ "$MERGEWORDS" = "1" ]; then fi mkdir -p $PKG/usr/bin -cp -a run/$PRGNAM $PKG/usr/bin/$PRGNAM -cp -a run/mailer $PKG/usr/bin/mailer +cp -a run/$PRGNAM run/mailer $PKG/usr/bin ln -s $PRGNAM $PKG/usr/bin/unafs ln -s $PRGNAM $PKG/usr/bin/unique ln -s $PRGNAM $PKG/usr/bin/unshadow diff --git a/system/john/john.info b/system/john/john.info index 6b8edb7d68..1b6beba4c4 100644 --- a/system/john/john.info +++ b/system/john/john.info @@ -1,10 +1,10 @@ PRGNAM="john" -VERSION="1.7.8" +VERSION="1.7.9" HOMEPAGE="http://www.openwall.com/john/" -DOWNLOAD="ftp://ftp.openwall.com/pub/projects/john/1.7.8/john-1.7.8.tar.bz2 \ - ftp://ftp.openwall.com/pub/projects/john/1.7.8/john-1.7.8-jumbo-8.diff.gz" -MD5SUM="e6d7f261829610d6949c706ebac0517c \ - 96cb581fd8447f3f96614fd365896b07" +DOWNLOAD="ftp://ftp.openwall.com/pub/projects/john/1.7.9/john-1.7.9.tar.bz2 \ + ftp://ftp.openwall.com/pub/projects/john/1.7.9/john-1.7.9-jumbo-5.diff.gz" +MD5SUM="45f54fc59386ecd67daaef9f19781d93 \ + 68cacb612f20c71eed6c24cbaf28148a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Murat D. Kadirov" |