Revision bump. Re-add mpi support, install tgtsnarf utility, and properly apply system config.

Package-Manager: portage-2.2.0_alpha95/cvs/Linux x86_64

3 files changed, 220 insertions, 16 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index c3921d5f80e8..73eb11f0cdb9 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,13 @@
 # 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.136 2012/03/19 05:45:43 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.137 2012/04/07 06:14:36 radhermit Exp $
+
+*johntheripper-1.7.9-r1 (07 Apr 2012)
+
+  07 Apr 2012; Tim Harder <radhermit@gentoo.org>
+  +johntheripper-1.7.9-r1.ebuild:
+  Revision bump. Re-add mpi support, install tgtsnarf utility, and properly
+  apply system config.
 
   19 Mar 2012; Naohiro Aota <naota@gentoo.org> johntheripper-1.7.8.ebuild:
   Support Gentoo/FreeBSD. #319445
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index f0a10f084c2c..f8db204cadd6 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 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 4dc1565b43af8bca1afa4c711f855df274124554 SHA1 78dda9b2bd97e7171bfd1f6d5e9aedbac8236b55 SHA256 3c4438ec4dcc3e8c81f1180544cd005f561a013b25ea51ad36189ced8a29f36f
@@ -11,23 +11,18 @@ DIST john-1.7.9-jumbo-5.diff.gz 622881 RMD160 f4f0fa05558f75ec9100832b26a7ca2b25
 DIST john-1.7.9.tar.bz2 717505 RMD160 6b8bf7423d8e138c5bfa30bfd348363887e7a4c6 SHA1 8f77bdd42b7cf94ec176f55ea69c4da9b2b8fe3b SHA256 1d40083e37a7bc1ba1177651cbb27898dcf2a812b8ccf1430db0c372ac6dc199
 EBUILD johntheripper-1.7.6-r1.ebuild 4773 RMD160 49686c605cd08ebc7ebdc10b9de211f30825575f SHA1 1e89a9fb51753c16a029d08b317c6226bad6add1 SHA256 6639c9f5b273c7504b3eef7744cad58047df148840757f17909157cc9e247063
 EBUILD johntheripper-1.7.8.ebuild 4905 RMD160 cfbb75c0c2a19f64b310825fb79148111ebd959b SHA1 73bbc89d1872e30994ebae5f90fe57b86bdf32b4 SHA256 49f3f8b7c060185ecc41e2f837b13376109e57df30babc1b8359fd5380d0ee10
+EBUILD johntheripper-1.7.9-r1.ebuild 5007 RMD160 c049fea6580272c552d8b4a364f39c0394fd5055 SHA1 ac35ac9a0402a9032bff1e047fb32e5f37bba652 SHA256 a85b6ba19411c5ff267741fcb0e36f0c28293c3c4da422090fc9155b91b36ee3
 EBUILD johntheripper-1.7.9.ebuild 4934 RMD160 de23bd9b187315da48a38dd1589b7ad197e12980 SHA1 157db460c71c299a15fd07d35fd53581fb60df75 SHA256 6fab450542b1216925fcebf22b06a757d4626dd63b66fdaae13d38aef4a36737
-MISC ChangeLog 22634 RMD160 95710d124dbc4e0877e178e3bc54308b8329e280 SHA1 20fb3bca3faaf4f50ce1664be1bda85b34c4258d SHA256 8188e5a4a0ff6cf2478eb7e2efcf1e6df0e034a0c8d9976cba6bc2e225a49f79
+MISC ChangeLog 22860 RMD160 307a47c30e8bae34e4e2965480c0afa2521283cd SHA1 0e7f8dd508556664a861d195450ab4461d705c4b SHA256 c46568a5e1fc7feace2d42a8a0d2dafac28e2802d946d8c41d692a6dc2fe4d33
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPZsfzAAoJEDYO1FT4VRUUBiIP/R1lFlmfYWCiaaMRlcu/RsBl
-FlQIsanopIdq0X53Ntq1yb+4FImElhXqofkGte11sFUlSMn9clpfP/Q6CgR8F4d8
-KLTtgOZZmB+othscBh9GYOO3FmcMuuJZZ71RWYVIjnimjjVVQ1iMNON/JnUirXGR
-QzHD82cWnklC69+niCrCZpFaMC8ZdOwtU/jciYwowJwiUks4Oed3fyJJDUQ/rzxl
-5z61xGymH6fHE6ZJjfsiTy6d2OrRfKsbAJjnXzueoIJcUaiTcFiqOriitwuTMWQb
-eCY2OxjVtgfjjgZQ0g7i/Hts45NyliEQoSxqLL1xuGAcN0MYnc6Gm3pA2tVJbSTw
-H9ZZR0mHJzbBbQLe7OVUdHsMb7tAcN8/Cr3XHU2RDhrp1rYgGhgjA+BtwtgAHISm
-I2vkrzWdsXoIn3sfMCDQMpNuUubJ4EdvV/LvoBHq8H3KH1LZidy6TedvzGJVALzX
-q7QyyARgi0xROKC/tkg8y08J6zetsJj6emVJzP4TYqXLwE2XH7agNc4opFUrJy3D
-yhp/vMOUQDr+up9nNKrt86j2+42r4DYR2rYXVETSWliMWHYz4+xEspRls+oy+SKp
-CZFi/g3HtcXjFejZzyaa4ZFuGeC3ALbQksokcLllFKS4JU4a0drC9ZCv/pRgf9Ab
-qFlyOFUWCMxJzpyymtux
-=Jnq2
+iQEcBAEBCgAGBQJPf9tdAAoJEEqz6FtPBkyj4ZkIAK9uqgy60+cZ7PJV6nHF+dGY
+KByHXbl1MFWefVSWZWBJRYOzr+3rT+n2o8KMbpaXvE04047CU3Ta6y7QxxjBocos
+7GJcUHAXpqyE8esU16WqcV3WtAJgnAdBgQHcfXzJ7QDedzppHpLYFpDHXtkbs2Hp
+STDZ4efb44NzeY4IMHtgTFkWnduH4ieJDx8H+e6wOS2KeNLm/+DkzlwBs48/C8bN
+f/pLEYo+h/DS+voe2FPvzj6RFWonM0hut41PwWf1yJXm0EZyh0dymMOUsLE6Z7p7
+rYC9QYLW/+IXP5+FKAg4/WKblBvd7EesAOG9mZx1RRTrGv7BnPnb2GAL5p9M6Nw=
+=Kw8K
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r1.ebuild
new file mode 100644
index 000000000000..23b39c56c40c
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r1.ebuild
@@ -0,0 +1,202 @@
+# 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-r1.ebuild,v 1.1 2012/04/07 06:14:36 radhermit Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs pax-utils
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+JUMBO="jumbo-5"
+
+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-interix ~amd64-linux ~x86-linux ~ppc-macos"
+#Remove AltiVec USE flag. Appears to be an upstream issue.
+IUSE="custom-cflags -minimal mmx mpi openmp sse2"
+REQUIRED_USE="openmp? ( !minimal )
+	mpi? ( !minimal )"
+
+RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7 )
+	mpi? ( virtual/mpi )"
+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"
+	else
+		echo "generic"
+	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
+	fi
+
+	local 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
+	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
+	CFLAGS="${CFLAGS} -include \\\"${S}\\\"/config.gentoo"
+	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)
+}
+
+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/sap_prepare.pl
+	fi
+
+	# config files
+	insinto /etc/john
+	doins run/*.chr run/password.lst
+	doins run/*.conf
+
+	# documentation
+	dodoc doc/*
+}