Version bump (bug #405101 by Renato Alves). Check for openmp toolchain support and remove unnecessary conditions for running tests.

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

3 files changed, 199 insertions, 18 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 06f5a98a024c..b22257417f1a 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/johntheripper
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.133 2011/07/05 14:01:52 c1pher Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.134 2012/02/23 10:04:21 radhermit Exp $
+
+*johntheripper-1.7.9 (23 Feb 2012)
+
+  23 Feb 2012; Tim Harder <radhermit@gentoo.org> +johntheripper-1.7.9.ebuild:
+  Version bump (bug #405101 by Renato Alves). Check for openmp toolchain
+  support and remove unnecessary conditions for running tests.
 
 *johntheripper-1.7.8 (05 Jul 2011)
 
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index e472865fa77c..bc985707a038 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
@@ -7,24 +7,21 @@ DIST john-1.7.6-jumbo-4.diff.gz 206601 RMD160 53ac2218ca33d458eb7250bce18a9e9af5
 DIST john-1.7.6.tar.gz 832790 RMD160 294fa9a381b45df6fda6e537bc920e74c1d966b0 SHA1 da0b6298e6e045606d48880df045096e8bc87fcb SHA256 77e44d068d317648c41d3ac61b8ea1df18d5c7401083e7a4f6681816900c1a73
 DIST john-1.7.8-jumbo-2.diff.gz 402639 RMD160 50c57c5811e218b4513d1453c83ea2bb4f277e4c SHA1 478a3388f33828bdf8cc1c2c3bb282e147d95abd SHA256 fb1b83f1a5db8f42de25d65f78b605e44d1d0dfefb87161ed38c5216a75039a6
 DIST john-1.7.8.tar.gz 849810 RMD160 622fa45548b97edc5bf5b56322a083b3a2b63e40 SHA1 0f51495fb188955d0fede609810a60b10e6f208f SHA256 12f4307602b9a8f0d3f82daf28e0f59de21aa82c9dcccd16819b288ec83ab559
+DIST john-1.7.9-jumbo-5.diff.gz 622881 RMD160 f4f0fa05558f75ec9100832b26a7ca2b25d9c3b0 SHA1 b1b49dcb17a8edde5931664cd8baf77c4d4cf4aa SHA256 9a0ff6b912723a393122fa969b9af8efd9f47b154917870053141a372d5963bd
+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 4688 RMD160 ec42f7e2900594c7673265856d26e5275de3804a SHA1 66e637cbe447a241b39084698b3a4dc144c7a200 SHA256 5397bc5e67adab50f13a7603cd173bd7bba32f1a9b0a065323751679dda86510
-MISC ChangeLog 22076 RMD160 8ccf19610f196fc60ddd51fbf07ec7b4b2cfae20 SHA1 301c126e86e1cae8de9060b6b7a217be4a0504ce SHA256 cc76fb58627387bc4c4e54d259034893fc1e7df7f7a4945aebbb9b6b2c79e042
+EBUILD johntheripper-1.7.9.ebuild 4569 RMD160 01593a88bdd55c38001a23127f17e507021ee692 SHA1 a0f61d7ad8514dda9dc75e04a25cc7bab7bd34cc SHA256 6d2cc4875aa43185da8cbaf2136de7e991c0c55780203e7e6c6410e6d6045664
+MISC ChangeLog 22330 RMD160 54f29bf9584e707275b01f344f42fada92fd896b SHA1 729ae3ce464e2b4c26ed0eb1cfe16be70931f6b8 SHA256 23c059b4dccce1af5e666020f74a8ae968a8ce7d10ff6fc795fffc756ebf5f9e
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOExlRAAoJEEsurZwMLhUxGE4QAL/fHcG6g0AlsCt7Y2AAUCC4
-LgKiK3XL0CtZDJUIQncUOvbpa7lBfDkn7Tw1CvtLRN9hxLXdwtykF5NBqthlb7Sl
-VsTUFtcQ9tBd294ldR2ubqGLkHrgt6+EMBT3sYTRybLTmpIYbldZIHoowEiuKR1C
-M4HY7ZbNoOhIg0Wl0gcCAkleo8FdNxxonS8nqGi6RuvOUZwuYM/wY7s2GGJW8XeJ
-ysowNmODXnKcV8gx3GWQFlHh59DbwxrdG289iF2iJfraW2XPaWX9GBBeoZmso7Xv
-uH+6BZa+5h11caAKD+IZL3HBfcRHeI4pWQnC9C8+Kq+aYzj7xJ9CcgVvm95nrNfW
-xPaVGleW61ilAGwc5SoPMsCn8C71rHswCC/g2vFmtjX7Qb+8YHPEENOlY76eFOlX
-+LM/SwVN6BI7Qv4QusgM3PBQ0wdtJLgYyEYZxxrui/woP20cLbwi5qB3z6Y597Lb
-P+2GaOCt5JcqkjbTS+4OcVTHvOv093KArw3TCbJPE/7uO8ahLKX7ymu7CIZfD7JK
-vSqY3BfLgvY+oDGhKmXuaq9cv4DjCdrQaJUh258V35w6us90AGTtdbQwKP8uuRf9
-Fp6T86ey74biqWJDKhluPMo1ei41ZKAWV8V3zr2m+0B/UcbJaNzji5ktHgKsfKoo
-e8ADjSc/P0C6Bt7jEFQO
-=6Atg
+iQEcBAEBCgAGBQJPRg8yAAoJEEqz6FtPBkyjfs0H/1cHtls5hJfMvnTXh4OCLXv2
+dByMBC+Tb4IumCSnp3JHI0smeZ0CcVEAEp7fS7O2jG/n0frLYIVuEh28nFpxXb3S
+HrGYgJ+QVoVUWob4bHsKacI96CHgFSsep1IQsN1mNqEwRIOC0aTxsXYmgbA/fP4q
+Qf6rBvsIiXl6zolOzFXMWTF6iZgp8YzZ0G1gTB2klNsDQWBBGGtT0UBQvFQ3sL/p
+Eg9w16cb6LAdSu8PuEiIlf9cUP4bara3jpUiwpUTcWhtG99fI0FphgQTewlHlGHa
+lHjc1DfWkoWaSARcu0jnRc5Rc8HBJ/HyO2aTI8RIqW2Nbkg0RMmiUZVPUbj4ckQ=
+=IXby
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9.ebuild
new file mode 100644
index 000000000000..b9be3eb34aad
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.9.ebuild
@@ -0,0 +1,178 @@
+# 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.ebuild,v 1.1 2012/02/23 10:04:21 radhermit Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs pax-utils
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+JUMBO="jumbo-5"
+#MPI="mpi10"
+
+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 )"
+#	mpi? ( ftp://ftp.openwall.com/john/contrib/mpi/2009-bindshell/${MY_P}-${MPI}.patch.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"
+IUSE="custom-cflags -minimal mmx openmp sse2"
+REQUIRED_USE="openmp? ( !minimal )"
+#Remove AltiVec USE flag. Appears to be an upstream issue.
+#IUSE="altivec custom-cflags -minimal mmx openmp sse2"
+#IUSE="altivec custom-cflags -minimal mmx -mpi sse2"
+
+# Seems a bit fussy with other MPI implementations.
+RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7 )"
+#	mpi? ( sys-cluster/openmpi )
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+get_target() {
+	if use alpha; then
+		echo "linux-alpha"
+	elif use amd64; then
+		echo "linux-x86-64"
+	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 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 mpi; then
+#		epatch "${WORKDIR}/${MY_P}-${MPI}.patch"
+#	fi
+	if ! use minimal; then
+		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
+	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 -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
+	./john --test || die "self test failed"
+
+	# 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
+}
+
+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
+		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/*
+}