app-crypt/johntheripper: Version bump wrt bug 374123. Move to EAPI 4. Add required use to deal with openmp and minimal.

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

3 files changed, 202 insertions, 15 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 104fb5e0bfae..06f5a98a024c 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,13 @@
 # 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.132 2011/03/08 19:33:41 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.133 2011/07/05 14:01:52 c1pher Exp $
+
+*johntheripper-1.7.8 (05 Jul 2011)
+
+  05 Jul 2011; Dane Smith <c1pher@gentoo.org> +johntheripper-1.7.8.ebuild:
+  Version bump wrt bug 374123. Move to EAPI 4. Add REQUIRED_USE so that
+  openmp can't be used with minimal since the community patches are what
+  provied openmp support. Remove no longer needed || die.
 
   08 Mar 2011; Jonathan Callen <abcd@gentoo.org> johntheripper-1.7.6-r1.ebuild:
   Add prefix keywords, support
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index e6252dcc32d5..e472865fa77c 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -5,23 +5,26 @@ AUX johntheripper-1.7.3.1-mkdir-sandbox.patch 562 RMD160 10fa90b61b07aa902bd88d1
 AUX johntheripper-1.7.6-cflags.patch 2927 RMD160 4dc1565b43af8bca1afa4c711f855df274124554 SHA1 78dda9b2bd97e7171bfd1f6d5e9aedbac8236b55 SHA256 3c4438ec4dcc3e8c81f1180544cd005f561a013b25ea51ad36189ced8a29f36f
 DIST john-1.7.6-jumbo-4.diff.gz 206601 RMD160 53ac2218ca33d458eb7250bce18a9e9af5a881d6 SHA1 ccef570680a8496618d359a42a101b331d40aeb7 SHA256 12760c528c3eabe0e429954745f016107c08ce936ed4be2e63d2a75c64717f3a
 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
 EBUILD johntheripper-1.7.6-r1.ebuild 4773 RMD160 49686c605cd08ebc7ebdc10b9de211f30825575f SHA1 1e89a9fb51753c16a029d08b317c6226bad6add1 SHA256 6639c9f5b273c7504b3eef7744cad58047df148840757f17909157cc9e247063
-MISC ChangeLog 21759 RMD160 be9cf99061fe35b61d9d7e8cc505e8a7114cb32d SHA1 0e90a72157813dfb9c1e55cb2ae4cdb0c72ee23e SHA256 f17c03cc91531c18f14b18351d89755b0f9c2bb51a28c38e60448d1d81c5f4ab
+EBUILD johntheripper-1.7.8.ebuild 4688 RMD160 ec42f7e2900594c7673265856d26e5275de3804a SHA1 66e637cbe447a241b39084698b3a4dc144c7a200 SHA256 5397bc5e67adab50f13a7603cd173bd7bba32f1a9b0a065323751679dda86510
+MISC ChangeLog 22076 RMD160 8ccf19610f196fc60ddd51fbf07ec7b4b2cfae20 SHA1 301c126e86e1cae8de9060b6b7a217be4a0504ce SHA256 cc76fb58627387bc4c4e54d259034893fc1e7df7f7a4945aebbb9b6b2c79e042
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNdoSfAAoJELHSF2kinlg4FvUP/jU0DU+hL7qVhfBIt8elr+TH
-RF2rSPQpzyW4nN2fVhlcESW1tSaK254T3EU35lLz2z8MYGU8mhHv1cCu9ZNPxmoE
-KN3MjivlJ15ZN5DZbdA1Iy9x8fhDz08dStAkLkY7iXRr25zKVpRfBNfYMgqUfwSF
-h2/k3iC7MUK6Nw8Z6yFB2rEHiLi68YJLW00mymIFG9/r8uezfC6zhiJeQ8OfW8U5
-dmBvY29p1NGjqgNzuEqs1ZuibAL257tTTukdBYVtcsOe+JwVBaySOUVodr2ujbyV
-pj3kNzAGBUdQy6jixVs8+wHJ8VhSEi8gVTh6aFb1SNuNm8+VZfhC49kQJj/XU1ny
-1lqo2K23cOiD3V3snaWvYksRsr2H1yi4vmfpGFVzIVvNncxi39qjZPsBcwpmpdPT
-Ee6BkDe/6ex9zHp3rujVwzXAaog2cf7WL9Yqe7zHW/4AbkIQl1M84PF1aSG2ecTX
-3Vx9z+mgaBUlp8aFBMjQUoqxju0iF73dah8u06ux4kH/CnXcmVatXXJ3/Zfh+eTL
-bjTVZBex81Zqb+SCZ5f3qykfncFwIWfMGE0JhDFVcqs/5gZcc5vZEnMEg6vfn9yS
-N49S+xCeWIAaKAdTHbAR4XCm3hqdDTL6MJik8V4jxUQ1HGANqfj5FS1xe9Dm1b55
-JWo8Gf3eBaIOTcwlQRhQ
-=FPGJ
+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
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/johntheripper/johntheripper-1.7.8.ebuild b/app-crypt/johntheripper/johntheripper-1.7.8.ebuild
new file mode 100644
index 000000000000..3d452f7a66ee
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.8.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.8.ebuild,v 1.1 2011/07/05 14:01:52 c1pher Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs pax-utils
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+JUMBO="jumbo-2"
+#MPI="mpi10"
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+
+SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.gz
+	!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}
+	openmp? ( >=sys-devel/gcc-4.2[openmp] )"
+
+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
+}
+
+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
+	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
+		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/john.conf
+	doins run/*.chr run/password.lst
+
+	# documentation
+	dodoc doc/*
+}