johntheripper: added 1.7.6 with all patches, thanks to erwinpdev!

includes fullmpi, openmp, mscash2
This commit is contained in:
grimmlin 2011-01-06 18:31:24 +00:00
parent eb31f7ff0b
commit 23eb383da3
4 changed files with 281 additions and 0 deletions

View file

@ -0,0 +1,8 @@
AUX johntheripper-1.7.3.1-mkdir-sandbox.patch 562 RMD160 10fa90b61b07aa902bd88d14eed38be2b66573bf SHA1 1f4520d3e339b853dc480cd6e3a4956aa878a15f SHA256 9bf9577ed74048b4df82bc6fcf546469e07c93d27de438dd3aa36b5b360b27f0
AUX johntheripper-1.7.6-cflags.patch 2927 RMD160 76bf59d4938ef618b49a19f7067c5e9ba8d24146 SHA1 f2cb76ef4ba742d7fb02c4a1fca1717a932bf93c SHA256 0490311893ec85b4ca9fed1cce39341378959fed307b012f29adf11789a444ae
DIST john-1.7.6-fullmpi8-after-jumbo3.diff.gz 13877 RMD160 336fbf62313eeb2fd0fc9b98f0d0ebba8acd5e20 SHA1 daae576031e43cb84144af4fbdb5eee679ad0ad6 SHA256 db7fc9e05f904d0220bf7729c264dfd1761faa77015d3c618d3ec032c1c147bb
DIST john-1.7.6-jumbo-9-mscash2-1.diff.gz 7341 RMD160 b03d402de6974176a1953ea6a91b86e4aff3e585 SHA1 440d3b0dc18303079f8147562529b615efa2e5ab SHA256 7e167adb88225f68194c332f9251c746ac2c617c572ecdff8333fe74e7bd97e8
DIST john-1.7.6-jumbo-9.diff.gz 218658 RMD160 c6d5a0771d5de0d35802d85319146ee95c4ebdf4 SHA1 1d046ec8c016e2497653487917a3594222031f49 SHA256 ee37cb3dc341348a573f6c3c2f43b136c0e6a173430863bd3b6527e6b1143368
DIST john-1.7.6-omp-des-7.diff.gz 7956 RMD160 b0f665e66b3e26221cdf7d33a0c9ac0aa73c4b84 SHA1 2f08f94ba5edba53f6989c3fad814a55238dca93 SHA256 ccc8a10dc8e2e1e8e3a4ea55f92baf214606547ebf2725b1908d726e016cea0c
DIST john-1.7.6.tar.gz 832790 RMD160 294fa9a381b45df6fda6e537bc920e74c1d966b0 SHA1 da0b6298e6e045606d48880df045096e8bc87fcb SHA256 77e44d068d317648c41d3ac61b8ea1df18d5c7401083e7a4f6681816900c1a73
EBUILD johntheripper-1.7.6-r2.ebuild 4793 RMD160 9c558bb77b61c9cc2f7dd2fcd17d6295f4a6099f SHA1 488954cee99c3b8fbebf053ad43a61de1038f3a0 SHA256 5279cf0175613ca47190609402ed1fdd9db91fef3e63933ad527a961600628c2

View file

@ -0,0 +1,12 @@
diff -urNp john-1.7.3.1.org/src/path.c john-1.7.3.1/src/path.c
--- john-1.7.3.1.org/src/path.c 2003-10-01 04:26:25.000000000 +0300
+++ john-1.7.3.1/src/path.c 2007-11-10 15:53:23.000000000 +0200
@@ -55,7 +55,7 @@ void path_init(char **argv)
#ifdef JOHN_PRIVATE_HOME
private = path_expand(JOHN_PRIVATE_HOME);
if (mkdir(private, S_IRUSR | S_IWUSR | S_IXUSR)) {
- if (errno != EEXIST) pexit("mkdir: %s", private);
+ if (errno != EEXIST && errno != EACCES) pexit("mkdir: %s", private);
} else
fprintf(stderr, "Created directory: %s\n", private);
#endif

View file

@ -0,0 +1,83 @@
--- Makefile 2010-07-18 15:27:51.000000000 -0400
+++ Makefile.mine 2010-07-18 15:30:09.000000000 -0400
@@ -629,7 +629,7 @@
macosx-ppc32-altivec:
$(LN) ppc32alt.h arch.h
$(MAKE) $(PROJ) \
- CFLAGS="-c -Wall -fomit-frame-pointer" \
+ CFLAGS="$(CLFAGS) -c -Wall -fomit-frame-pointer" \
OPT_NORMAL="-fast -mcpu=7450" \
OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec"
@@ -638,7 +638,7 @@
$(LN) ppc32alt.h arch.h
$(MAKE) $(PROJ) \
ASFLAGS="$(ASFLAGS) -arch ppc" \
- CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
+ CFLAGS="$(CLFAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
LDFLAGS="$(LDFLAGS) -arch ppc" \
OPT_NORMAL="-fast -mcpu=7450" \
OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec"
@@ -650,7 +650,7 @@
$(LN) ppc32.h arch.h
$(MAKE) $(PROJ) \
CC=cc \
- CFLAGS="-c -traditional-cpp" \
+ CFLAGS="$(CLFAGS) -c -traditional-cpp" \
OPT_NORMAL="-O2" \
OPT_INLINE="-O3"
@@ -658,7 +658,7 @@
$(LN) ppc32.h arch.h
$(MAKE) $(PROJ) \
ASFLAGS="$(ASFLAGS) -arch ppc" \
- CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
+ CFLAGS="$(CLFAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
LDFLAGS="$(LDFLAGS) -arch ppc" \
OPT_NORMAL="-O2" \
OPT_INLINE="-O3 -finline-limit=4000"
@@ -667,7 +667,7 @@
macosx-ppc64-altivec:
$(LN) ppc64alt.h arch.h
$(MAKE) $(PROJ) \
- CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \
+ CFLAGS="$(CLFAGS) -c -m64 -Wall -fomit-frame-pointer" \
LDFLAGS="$(LDFLAGS) -m64" \
OPT_NORMAL="-fast" \
OPT_INLINE="-fast -finline-limit=4000 -faltivec -maltivec"
@@ -676,7 +676,7 @@
$(LN) ppc64alt.h arch.h
$(MAKE) $(PROJ) \
ASFLAGS="$(ASFLAGS) -arch ppc" \
- CFLAGS="-c -arch ppc -m64 -Wall -fomit-frame-pointer" \
+ CFLAGS="$(CLFAGS) -c -arch ppc -m64 -Wall -fomit-frame-pointer" \
LDFLAGS="$(LDFLAGS) -arch ppc -m64" \
OPT_NORMAL="-fast" \
OPT_INLINE="-fast -finline-limit=4000 -faltivec -maltivec"
@@ -684,7 +684,7 @@
macosx-ppc64:
$(LN) ppc64.h arch.h
$(MAKE) $(PROJ) \
- CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \
+ CFLAGS="$(CLFAGS) -c -m64 -Wall -fomit-frame-pointer" \
LDFLAGS="$(LDFLAGS) -m64" \
OPT_NORMAL="-fast" \
OPT_INLINE="-fast -finline-limit=4000"
@@ -693,7 +693,7 @@
$(LN) ppc64.h arch.h
$(MAKE) $(PROJ) \
ASFLAGS="$(ASFLAGS) -arch ppc" \
- CFLAGS="-c -arch ppc -m64 -Wall -fomit-frame-pointer" \
+ CFLAGS="$(CLFAGS) -c -arch ppc -m64 -Wall -fomit-frame-pointer" \
LDFLAGS="$(LDFLAGS) -arch ppc -m64" \
OPT_NORMAL="-fast" \
OPT_INLINE="-fast -finline-limit=4000"
@@ -723,7 +723,7 @@
$(LN) ppc32alt.h arch.h
$(MAKE) $(PROJ) \
ASFLAGS="$(ASFLAGS) -arch ppc" \
- CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
+ CFLAGS="$(CLFAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
LDFLAGS="$(LDFLAGS) -arch ppc" \
OPT_NORMAL="-fast -mcpu=7450" \
OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec"

View file

@ -0,0 +1,178 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild,v 1.1 2010/12/03 19:02:34 c1pher Exp $
EAPI="2"
inherit eutils flag-o-matic toolchain-funcs pax-utils
MY_PN="john"
MY_P="${MY_PN}-${PV}"
JUMBO="jumbo-9"
MPI="mpi8"
OMPV="des-7"
DESCRIPTION="fast password cracker"
HOMEPAGE="http://www.openwall.com/john/"
SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.gz
!minimal? ( http://www.openwall.com/john/contrib/${MY_P}-${JUMBO}.diff.gz )
mpi? ( http://openwall.info/wiki/_media/john/${MY_P}-full${MPI}-after-jumbo3.diff.gz )
mscache2? ( http://openwall.info/wiki/_media/john/${MY_P}-${JUMBO}-mscash2-1.diff.gz )
openmp? ( http://openwall.info/wiki/_media/john/${MY_P}-omp-${OMPV}.diff.gz )"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="altivec custom-cflags -minimal mmx -mpi mscache2 openmp sse2"
# Seems a bit fussy with other MPI implementations.
RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7 )
mpi? ( sys-cluster/openmpi )"
DEPEND="${RDEPEND}
openmp? ( >=sys-devel/gcc-4.2[openmp] )"
S="${WORKDIR}/${MY_P}"
get_target() {
if use x86; then
if use sse2; then
echo "linux-x86-sse2"
elif use mmx; then
echo "linux-x86-mmx"
else
echo "linux-x86-any"
fi
elif use alpha; then
echo "linux-alpha"
elif use sparc; then
echo "linux-sparc"
elif use amd64; then
echo "linux-x86-64"
elif use ppc64; then
if use altivec; then
echo "linux-ppc32-altivec"
else
echo "linux-ppc64"
fi
# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
# as per the Makefile comments
elif use ppc; then
if use altivec; then
echo "linux-ppc32-altivec"
else
echo "linux-ppc32"
fi
else
echo "generic"
fi
}
src_prepare() {
# It looks like the order of the patches is important, so be carefull if you
# gonna alter this section.
if use openmp && use sse2; then
epatch "${WORKDIR}/${MY_P}-omp-${OMPV}.diff"
sed -i '/JOHN_VERSION/ s/'${PV}-omp-${OMPV}'/'${PV}'/' "${S}/src/params.h"
fi
if ! use minimal; then
epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
sed -i '/JOHN_VERSION/ s/'${PV}-${JUMBO}'/'${PV}'/' "${S}/src/params.h"
fi
if use mscache2; then
epatch "${WORKDIR}/${MY_P}-${JUMBO}-mscash2-1.diff"
fi
if use mpi; then
sed -i '/JOHN_VERSION/ s/'${PV}-jumbo-3'/'${PV}'/' "${WORKDIR}/${MY_P}-full${MPI}-after-jumbo3.diff"
epatch "${WORKDIR}/${MY_P}-full${MPI}-after-jumbo3.diff"
sed -i '/JOHN_VERSION/ s/'${PV}-full${MPI}'/'${PV}'/' "${S}/src/params.h"
fi
sed -i '/JOHN_VERSION/ s/'${PV}'/'${PV}-pentoo'/' "${S}/src/params.h"
local PATCHLIST="${PATCHLIST} 1.7.6-cflags 1.7.3.1-mkdir-sandbox"
cd src
for p in ${PATCHLIST}; do
epatch "${FILESDIR}/${PN}-${p}.patch"
done
if ! use minimal; then
sed -e "s/LDFLAGS *= */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
-i Makefile || die "sed Makefile failed"
fi
}
src_compile() {
local OMP=''
use custom-cflags || strip-flags
append-flags -fPIC -fPIE \
'-DJOHN_SYSTEMWIDE' \
'-DJOHN_SYSTEMWIDE_HOME=\\\"/etc/john\\\"' \
'-DJOHN_SYSTEMWIDE_EXEC=\\\"/usr/libexec/john\\\"'
gcc-specs-pie && append-ldflags -nopie
use openmp && OMP="-fopenmp"
CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC)
use mpi && CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
emake -C src/\
CPP=${CPP} CC=${CC} AS=${AS} LD=${LD} \
CFLAGS="-c -Wall ${CFLAGS} ${OMP}" \
LDFLAGS="${LDFLAGS}" \
OPT_NORMAL="" \
OMPFLAGS="${OMP}" \
$(get_target) || die "emake failed"
}
src_test() {
cd run
if [[ -f "/etc/john/john.conf" || -f "/etc/john/john.ini" ]]; then
# This requires that MPI is actually 100% online on your system, which might not
# be the case, depending on which MPI implementation you are using.
#if use mpi; then
# mpirun -np 2 ./john --test || die 'self test failed'
#else
./john --test || die 'self test failed'
else
ewarn "selftest requires /etc/john/john.conf or /etc/john/john.ini"
fi
}
src_install() {
# executables
dosbin run/john || die
newsbin run/mailer john-mailer || die
pax-mark -m "${D}"/usr/sbin/john || die
dosym john /usr/sbin/unafs || die
dosym john /usr/sbin/unique || die
dosym john /usr/sbin/unshadow || die
# jumbo-patch additions
if ! use minimal; then
dosym john /usr/sbin/undrop || die
dosbin run/calc_stat || die
dosbin run/genmkvpwd || die
dosbin run/mkvcalcproba || die
insinto /etc/john
doins run/genincstats.rb run/stats || die
doins run/netscreen.py run/sap_prepare.pl || die
fi
# config files
insinto /etc/john
doins run/john.conf || die
doins run/*.chr run/password.lst || die
# documentation
dodoc doc/* || die
}