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.

Package-Manager: portage-2.1.5.5

3 files changed, 149 insertions, 2 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/Manifest b/app-crypt/johntheripper/Manifest
index 4573cfd6a6f8..ba34500a93be 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -6,8 +6,10 @@ AUX johntheripper-1.7.2-stackdef.S.patch 1845 RMD160 947aa7be3186c13f87b35e2bbd1
 AUX johntheripper-1.7.2-stripping.patch 840 RMD160 9001329b0fcda4ed244c746cdd6dc2d5bde9ae94 SHA1 e60f41af985f12a431b9c272e3964d166d552782 SHA256 e2b989facd64aa1634de13df5a76c3c5579ad90d75a4af63f68b5ad970eca0b8
 DIST john-1.7.2-all-7.diff.gz 64450 RMD160 c0adeb226ee75bbc9a875b93a622b99927fb825f SHA1 a0b25e3f9606b5839a4f1a59f896727f0195ba9a SHA256 fb2f42d12ec94be02ad398ac9e823190e518cefcb096a4197c6a37d83d29124c
 DIST john-1.7.2-all-9.diff.gz 70430 RMD160 20fde9586f5d7938fbb9f187ec0689f48a56590d SHA1 1d5202842e1ba7f68306d1524bb029b29a5c3e29 SHA256 44555f9c2b630d9c35597f1a4319379f4e3f452ab2103b21cee8d3ebe6d38bbe
+DIST john-1.7.2-bp17-mpi8.patch.gz 110095 RMD160 aca159a58c1a8134eb646775ea601a6af4192db5 SHA1 98067712a825f8dc1ae5d0e3ba73b4c69e2a4d1a SHA256 c05bf57a95bda859f54c7a0fbeea2361433cac3a3b3dbce994133ff1cdc0dbae
 DIST john-1.7.2.tar.gz 809308 RMD160 8ab90216401cf5cda7ba50a8bb88f53678e35eac SHA1 c3c4720c2f1446a3349b0307a0522af574d013e4 SHA256 9a94d2417b13d49cb11aeb11186933fe0e0491904987ca47c88bf5710935c3cb
 EBUILD johntheripper-1.7.2-r3.ebuild 3256 RMD160 ecf828bec14a2d55a28c73140e569bec61329a2b SHA1 3882167d75c0f4f5b853c2fb90ab0e35ee35410e SHA256 54049154f71ff658f883ee0aab478d12fda50151248ebad2d4d578242878a8dc
 EBUILD johntheripper-1.7.2-r4.ebuild 2964 RMD160 97a42db852ab61ff199637bdc7d8a839eb7b5bf2 SHA1 964fb7fb2629a5ef24c10b740688f64010230507 SHA256 9a62dcb4696cddad8c9ef9c11084ce3c8530f2b2b83edc6231935e2e74452254
-MISC ChangeLog 13965 RMD160 b27a7044380c6d57d45f66a34f5d62b784684dbd SHA1 61a9ed62bb7683a0eb5420994a6e35b6fad2e569 SHA256 59987097c5230e3c5d2375527a086e9f6bcf4ce8936a641d334c5393498b1635
+EBUILD johntheripper-1.7.2-r5.ebuild 3251 RMD160 9ad9cf8540e1ea46ff88efc2b784eafd63155803 SHA1 9bc3541c094566b4d00d92e6b91f8cbf88d39735 SHA256 97dcf86dd11152969ecd4804e490ffdde4dd174ffd655dce3bc8357c649710bd
+MISC ChangeLog 14246 RMD160 cba68db172901ea390e7f681d30d4015a22e04bc SHA1 f71d8b2d8f7e3a2c0555360c168c20b21346fb15 SHA256 6d0e34ad5224c0c36732b77f23b82f5e04ac1195a37b24417f4e8bb0139282da
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
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/*
+}