Re-add the MPI support. Tested with OpenMPI+Torque running 8 instances between a ppc (G5) and an amd64 box. ~hppa and ~mips dropped per bug #227631.

(Portage version: 2.1.5.5)

2 files changed, 146 insertions, 1 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 1a410bef5861..30fa794ba191 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.83 2008/02/13 10:34:49 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.84 2008/06/16 19:16:35 robbat2 Exp $
+
+*johntheripper-1.7.2-r5 (16 Jun 2008)
+
+  16 Jun 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +johntheripper-1.7.2-r5.ebuild:
+  Re-add the MPI support. Tested with OpenMPI+Torque running 8 instances
+  between a ppc (G5) and an amd64 box. ~hppa and ~mips dropped per bug #227631.
 
   13 Feb 2008; Alon Bar-Lev <alonbl@gentoo.org> -johntheripper-1.7.2.ebuild:
   Cleanup
diff --git a/app-crypt/johntheripper/johntheripper-1.7.2-r5.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2-r5.ebuild
new file mode 100644
index 000000000000..c22e46bd7810
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.2-r5.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.2-r5.ebuild,v 1.1 2008/06/16 19:16:35 robbat2 Exp $
+
+inherit eutils flag-o-matic toolchain-funcs pax-utils
+
+MY_PN="${PN/theripper/}"
+MY_P="${MY_PN/theripper/}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+
+SRC_URI="http://www.openwall.com/john/f/${MY_P}.tar.gz
+	http://www.openwall.com/john/contrib/${MY_P}-all-9.diff.gz
+	mpi? ( http://bindshell.net/tools/johntheripper/${MY_P}-bp17-mpi8.patch.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="mmx altivec sse2 custom-cflags mpi"
+
+# Seems a bit fussy with other MPI implementations.
+RDEPEND=">=dev-libs/openssl-0.9.7
+	mpi? ( sys-cluster/openmpi )"
+DEPEND="${RDEPEND}"
+
+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_unpack() {
+	unpack ${A}
+	cd "${S}"
+	PATCHLIST=""
+	if use mpi ; then
+		epatch "${WORKDIR}"/${MY_P}-bp17-mpi8.patch
+	else
+		cd "${S}/src"
+		epatch "${WORKDIR}"/${MY_P}-all-9.diff
+		PATCHLIST=stackdef.S
+	fi
+	PATCHLIST="${PATCHLIST} stackdef-2.S mkdir-sandbox"
+
+	cd "${S}/src"
+	for p in ${PATCHLIST}; do
+		epatch "${FILESDIR}/${P}-${p}.patch"
+	done
+}
+
+src_compile() {
+	cd "${S}/src"
+
+	use custom-cflags || strip-flags
+	append-flags -fno-PIC -fno-PIE
+	append-ldflags -nopie
+
+	CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC)
+	use mpi && CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
+	emake \
+		CPP=${CPP} CC=${CC} AS=${AS} LD=${LD} \
+		CFLAGS="-c -Wall ${CFLAGS} -DJOHN_SYSTEMWIDE \
+			-DJOHN_SYSTEMWIDE_HOME=\"\\\"/etc/john\\\"\"" \
+		LDFLAGS="${LDFLAGS}" \
+		OPT_NORMAL="" \
+		$(get_target) \
+		|| die "make failed"
+}
+
+src_test() {
+	cd "${S}/run"
+	if  [ -f /etc/john/john.conf -o -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
+	newsbin run/mailer john-mailer
+
+	pax-mark -m "${D}"/usr/sbin/john
+
+	dosym john /usr/sbin/unafs
+	dosym john /usr/sbin/unique
+	dosym john /usr/sbin/unshadow
+
+	# for EGG only
+	dosym john /usr/sbin/undrop
+
+	#newsbin src/bench john-bench
+
+	# config files
+	insinto /etc/john
+	doins run/john.conf
+	doins run/*.chr run/password.lst
+
+	# documentation
+	dodoc doc/*
+}