add cuda/opencl support (fingers crossed)

Package-Manager: portage-2.1.11.4/cvs/Linux x86_64

4 files changed, 277 insertions, 3 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index ad38c2b5435b..879b0bdad848 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.142 2012/07/04 18:15:42 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.143 2012/07/05 21:11:28 zerochaos Exp $
+
+*johntheripper-1.7.9-r4 (05 Jul 2012)
+
+  05 Jul 2012; Rick Farina <zerochaos@gentoo.org>
+  +johntheripper-1.7.9-r4.ebuild, metadata.xml:
+  add cuda/opencl support (fingers crossed)
 
 *johntheripper-1.7.9-r3 (04 Jul 2012)
 
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 17c4ce050d00..e37a692d7f1c 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX johntheripper-1.7.3.1-mkdir-sandbox.patch 562 SHA256 9bf9577ed74048b4df82bc6fcf546469e07c93d27de438dd3aa36b5b360b27f0 SHA512 7aac967890dd57a67b6248722cefe9764e6ddfb280cb06f511e3f71e16527689098d39a80c32316f343030e3e5161e0e0003b83f95707b6a89dbf590fa5256a4 WHIRLPOOL 470ef8046765f009f367adeb217eb1300f99e517d07e3ff01aa4b38d2a529b39a2ca9a8d7dea45956c2f209b3acf5d0aa3d442cab5c148d05be893a0646e33e3
 AUX johntheripper-1.7.6-cflags.patch 2927 SHA256 3c4438ec4dcc3e8c81f1180544cd005f561a013b25ea51ad36189ced8a29f36f SHA512 47d9f074c9a639caf2366c425220f03c4daf882cbac3d86fa2649a5b12de3784713800be0f719a37b0b92c0c4b0a36ded247c351f894514cfa8fe67a0e23c732 WHIRLPOOL 9e209861eef8276515fdc46573a5ed2ba9dda658aebc6c767481cbdd0ccb1c30d35a8b1463b973a81c957dcb76455697814a8461f790415a7c07730bfdfba155
 AUX johntheripper-1.7.9-jumbo-5-NT-performance-02.patch 1300 SHA256 27ab9ee6cd7b83aa94dbe3c66fb507432f230fde4818a9a754eeb93388f01513 SHA512 1bedce39dd17f492a9897f1d6caed77959022f50c03fe5dc0d4860c7478025e2899fb552de054fb47ed9ff9c2fb2f1fec260766c12e0ce2fde7d49305f4461d3 WHIRLPOOL 79396d44d98869aeb936d49deabe787ae8a4a60aaf1a98564054e73d85f7b02545e51a979d3db12412e3edcee9e1697eb4c68ec10a7b20d19398bb8b221924b7
@@ -13,6 +16,24 @@ EBUILD johntheripper-1.7.8.ebuild 4911 SHA256 f20d5efe90d076625aa12cf056504cb996
 EBUILD johntheripper-1.7.9-r1.ebuild 5207 SHA256 e6edc0814d6a35c4b7e7feddfd06bf4f6152aa73bc2451b7dbc509a326afc2ca SHA512 6d8dd5f92c604fd295b4b0a8839859990872be75401cf9362e3316d73b842a55b2daeeed6c3c89dd98357c7fc22b3f1a8289c6268ecb2cac1d7bdf5287b12e8e WHIRLPOOL 96ce6f48a2bb2bdacd19811bc274c34a9ecd3bd0546dabd59766de786be53e2fdd2d18ed4b4fcc1ee5f16b5df2d2681f259fa6b9864ee39a2ac630bba8ef930b
 EBUILD johntheripper-1.7.9-r2.ebuild 5344 SHA256 39e87b2ddd7f8c4d5aa2603761c2783a64d1b216d0021af53b81d503dc4e061d SHA512 cc4204dde8e6ccdec7476479a36ae5fb1df842972e0557052e08402c62d20b68efc045d917b39f6c437f583ef2a4a3e46585790062dd8a7c4441f491abd1b2f2 WHIRLPOOL 5f331813603a042be01034385f7433812546e915da8da219a72f814ce0bce7ee9850cd11facbc8fe9599e2c835fd2cae997b12a632e4733a12b043be28113c23
 EBUILD johntheripper-1.7.9-r3.ebuild 5280 SHA256 c5132eba337f0bfd7b6b3e51bef38e5383f38522e04622246b429bf3028aa6f5 SHA512 765cdcd244a8e042540db4f267bde0348de35eeccd70c5f8451a6fb1bf406fc3eea3837d3f7502d6163716664daae53d57cb2d10b6404d6ff9d07ca644d1ed1e WHIRLPOOL 4c3881962f691a3f96d88bee94778ca73d25eb742e530dcd25b6599139ef8043459350479a1c17e95a870b78a11337fa853af8ed3a73e5b65239eb557306566d
+EBUILD johntheripper-1.7.9-r4.ebuild 6129 SHA256 83858e9f54b2b376f7ef0c50742c15a854e7c75f4ad2761229886cb7d48910fe SHA512 422afe0e045c41ff28246843b262340b737e7bc88b82ab11caf80acfeeaed6b20b21e77103248abab62e17d318265e18c9efc622a9832550109c285d9f3306be WHIRLPOOL ad6ca8bbb2393a5666fbef8785d47cf200c1deb46c4079124e14fdf505ac70973ca9be01f5ba9131b6ea8f4f2a53b2c389680f1ae1238f919504b4144c91dc2a
 EBUILD johntheripper-1.7.9.ebuild 5154 SHA256 591d62091f1b13bab26d888cabaf680a1ff85367947244328ff22caf06d502c9 SHA512 d5cf9a32409fa70642403133a11b9d201c2c17e2958197a9bec7da3a1bbefb56e76de4ba35e65ec1b1588a1eb2f2a9e0bc0e24f61736ca791a5c3111bd9d1377 WHIRLPOOL d5b2033b553fa887df16e2b014406013fd4db509c7336e8b0b8b2d5c6562761df7ac8196af972e809f46d8253c3e504a16efb9e0d9c4cdea5d8d4df508a0068e
-MISC ChangeLog 23776 SHA256 1a97f7623e11fbbc50b86afa429ec11d743ad9648c9fcd20d357624300becf8f SHA512 e7ce455d13b91407417caabc4bb53e315e21f7d1401a063d83022573b0d4f67eeac2d738086afbb21cde864827bab400d6a68a09f64f2426fb2e4bc89737df5f WHIRLPOOL 752e89c41595a320fdb401a7081647388f8de4e05a7f38916666f410c2663c6f9d92dfbc125a56b807d3893c366296e18fde8bde7ab2dff19d16275f8c9dea15
-MISC metadata.xml 312 SHA256 0c8a1062884e324f58ac6d380f087408ae4d747c50bc03e8417799953b39ad26 SHA512 ba716992bd48fb6501322c6bed9517e7026f8986962d7e877e797af1e21ca6319874eb25a55299c809d3d6736532af651ea2b1fea744e4e0678c5525b8d46017 WHIRLPOOL 46e44ec10d0c48a870e669cc5763bab1e75d14042f9c4f484a650717c764a8a7c1493410b6675007229e11b9e1418b605bf52676e1734785abb3eb35393d7d5f
+MISC ChangeLog 23958 SHA256 64e5380ea189eedb3c183bb5fb3b7355f8b87ac77c6dcadb8b6e7ef1da98307a SHA512 ebe3018da72d26547f29d232a20b6f70bd22d12746096fb397a1a5e0a92305f484f0844abcdb4ba3f43bc58a1aee7fabf473f6d7417c51a788f18e8f9da86fd4 WHIRLPOOL 28e4900bdc7ffa7e9de50774d3b04968cd1adca0407fb8a43568d22d032344a71c52ec7ff18ad5d3e143d724b474e127ef6f5894197c0090f2773f0bb3a2a7d9
+MISC metadata.xml 531 SHA256 bb4c0e9b5d1434c7873905469d1fa40f42db99babc475a08cf68d5d23d49d583 SHA512 357b9ab90cf72fb443cf98b0905f80adbd920d21c5b696c68a91f4936c7f8ced9895f1daeb74d813ddcc53d26c05cc82a9e83644c1f80afb8aad76bb1a7dd540 WHIRLPOOL e5497c9fbb9a8313d652b113a7d4090c4aadc45fb7b2ee87a7eca493a11b87b16194e094b956ac7142d94b58ddd9f72b90f405db4c9e5bc909c61be8698a4916
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJP9gMgAAoJEKXdFCfdEflKwF0P/2gVWFdA3YkvnAGRc66nQ58S
+M2L1g/QKZ7ZuIc12i/LJJBCiVqDjK8cxnuK3CYbR8QA1t6nPFia95ng1UeIy9Cqi
+hd8K88MoNOWtANQoOmX7xFWfyFFroondVzxs/7QN9qjZ/MAZ41UlRZifWQLtvbT+
+XmoncFpCiDsNv8y8oiUQCu9wg/LQOORb9TYEXxJeNLMBI5HmZZxG66FTN3DiJc69
+QXJQAjIXet7aw3HiglWg2/0wcc10IvDYod6b5FC4B40qXJsGBeHQ3WyTQAVGuRjg
+qCscGRCiMGSH1jyobZjJEQZDSpremejY41Nba1haXVmlo1SMm7R3n1toXdgNl6bP
+Xs75U2rkoi4VCc3DJfCd4L23MbAsHSNKjOAwzdet/97JvSrZ0nD57DRweH+/Zc0A
+9kLQkctet/S5SZ96+eEBdzpZtG9wIf6gtcnAq1txGZdg5fWfHGx2b8lRNpZvprps
+QUO7T50q45zQnX/Pl2+ZY0h8j8Ts79Pj9otD8QzebQ9ZOJPNheUB4Ax3MvYN7rN/
+hM87UBWWky44Wzs3iSTDVliRTm/jLFEu5jZIWA3/BL1vgfjGWJrOWeHz0B/fsSO3
+bKL1HjAojvkf8leUQx85CONmT74Qzt5O6ivXMEuImBbUZcqkBDBNSU5vu0SaeH/h
+mC8rlp04iC1Gpni8WjPc
+=MHSZ
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r4.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r4.ebuild
new file mode 100644
index 000000000000..11b4086473b3
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r4.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r4.ebuild,v 1.1 2012/07/05 21:11:28 zerochaos Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs pax-utils multilib
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+JUMBO="jumbo-6"
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+
+SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
+	!minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+# This package can't be marked stable for ppc or ppc64 before bug 327211 is closed.
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+#Remove AltiVec USE flag. Appears to be an upstream issue.
+IUSE="cuda custom-cflags -minimal mmx mpi opencl openmp sse2"
+REQUIRED_USE="openmp? ( !minimal )
+	mpi? ( !minimal )
+	cuda? ( !minimal )
+	opencl? ( !minimal )"
+
+RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 )
+	mpi? ( virtual/mpi )
+	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
+	opencl? ( virtual/opencl )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+has_xop() {
+	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
+}
+
+has_avx() {
+	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
+}
+
+get_target() {
+	if use alpha; then
+		echo "linux-alpha"
+	elif use amd64; then
+		if has_xop; then
+			echo "linux-x86-64-xop"
+		elif has_avx; then
+			echo "linux-x86-64-avx"
+		else
+			echo "linux-x86-64"
+		fi
+	elif use ppc; then
+		#if use altivec; then
+		#	echo "linux-ppc32-altivec"
+		#else
+			echo "linux-ppc32"
+		#fi
+	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 sparc; then
+		echo "linux-sparc"
+	elif use x86; then
+		if has_xop; then
+			echo "linux-x86-xop"
+		elif has_avx; then
+			echo "linux-x86-avx"
+		elif use sse2; then
+			echo "linux-x86-sse2"
+		elif use mmx; then
+			echo "linux-x86-mmx"
+		else
+			echo "linux-x86-any"
+		fi
+	elif use ppc-macos; then
+	# force AltiVec, the non-altivec profile contains ancient compiler cruft
+	#	if use altivec; then
+			echo "macosx-ppc32-altivec"
+	#	else
+	#		echo "macosx-ppc32"
+	#	fi
+		# for Tiger this can be macosx-ppc64
+	elif use x86-macos; then
+		if use sse2; then
+			echo "macosx-x86-sse2"
+		else
+			echo "macosx-x86"
+		fi
+	elif use x86-solaris; then
+		echo "solaris-x86-any"
+	elif use x86-fbsd; then
+		if use sse2; then
+			echo "freebsd-x86-sse2"
+		elif use mmx; then
+			echo "freebsd-x86-mmx"
+		else
+			echo "freebsd-x86-any"
+		fi
+	elif use amd64-fbsd; then
+		echo "freebsd-x86-64"
+	else
+		echo "generic"
+	fi
+}
+
+get_john_objs() {
+	echo -n '${JOHN_COMMON_OBJS} '
+	if use opencl; then
+		echo -n '${OCL_OBJS} '
+	fi
+	if use cuda; then
+		echo -n '${CUDA_OBJS}'
+	fi
+}
+
+pkg_setup() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	if ! use minimal; then
+		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
+
+		if use mpi ; then
+			sed -e "s/^#CC = mpicc/CC = mpicc/" \
+				-e "s/^#MPIOBJ =/MPIOBJ =/" \
+				-i src/Makefile || die
+		fi
+
+		# fix typo in jumbo patch
+		sed -i 's:All15:All5:' run/john.conf || die
+	fi
+
+	cd src
+	epatch "${FILESDIR}/${PN}-1.7.6-cflags.patch"
+	epatch "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch"
+
+	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"
+		sed -i 's#/usr/local#/opt#g' Makefile || die
+	fi
+	sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die
+}
+
+src_compile() {
+	local OMP
+
+	use custom-cflags || strip-flags
+	echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
+	echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
+	echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
+	append-flags -fPIC -fPIE
+	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
+
+	#this stuff was all stolen from the Makefile, if build breaks, check this first
+	if use opencl; then
+		GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0"
+		GPULDFLAGS="${GPULDFLAGS} -lOpenCL"
+	fi
+	if use cuda; then
+		GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA"
+		GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart"
+	fi
+
+	emake -C src/ \
+		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
+		CFLAGS="-c -Wall -include \\\"${S}\\\"/config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \
+		LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \
+		OPT_NORMAL="" \
+		OMPFLAGS="${OMP}" \
+		JOHN_OBJS="$(get_john_objs)" \
+		$(get_target)
+}
+
+src_test() {
+	cd run
+	if [[ -f "${EPREFIX}/etc/john/john.conf" || -f "${EPREFIX}/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 "Tests require '${EPREFIX}/etc/john/john.conf' or '${EPREFIX}/etc/john/john.ini'"
+	fi
+}
+
+src_install() {
+	# executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	pax-mark -m "${ED}usr/sbin/john" || die
+
+	dosym john /usr/sbin/unafs
+	dosym john /usr/sbin/unique
+	dosym john /usr/sbin/unshadow
+
+	# jumbo-patch additions
+	if ! use minimal; then
+		dosym john /usr/sbin/undrop
+		dosbin run/calc_stat
+		dosbin run/genmkvpwd
+		dosbin run/mkvcalcproba
+		dosbin run/tgtsnarf
+		insinto /etc/john
+		doins run/genincstats.rb run/stats
+		doins run/netscreen.py run/sap2john.pl
+		if use opencl; then
+			doins src/opencl/*.cl
+			doins src/opencl_*.h
+		fi
+	fi
+
+	# config files
+	insinto /etc/john
+	doins run/*.chr run/password.lst
+	doins run/*.conf
+
+	# documentation
+	dodoc doc/*
+}
diff --git a/app-crypt/johntheripper/metadata.xml b/app-crypt/johntheripper/metadata.xml
index db290c89909d..e1206d2bc5eb 100644
--- a/app-crypt/johntheripper/metadata.xml
+++ b/app-crypt/johntheripper/metadata.xml
@@ -7,4 +7,8 @@
 		<name>Rick Farina</name>
 		<description>Any and all help appreciated</description>
 	</maintainer>
+	<use>
+        	<flag name="cuda">Use nvidia cuda toolkit for speeding up cracking on capable devices</flag>
+        	<flag name="opencl">Enable opencl support for speeding up cracking on capable devices</flag>
+	</use>
 </pkgmetadata>