Include all of the other john symlinks for the hash extraction modes.

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

3 files changed, 255 insertions, 22 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index ce685dc72981..bb9bfa9d13dd 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.146 2012/10/08 23:17:21 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.147 2012/11/24 23:17:46 robbat2 Exp $
+
+*johntheripper-1.7.9-r6 (24 Nov 2012)
+
+  24 Nov 2012; Robin H. Johnson <robbat2@gentoo.org>
+  +johntheripper-1.7.9-r6.ebuild:
+  Include all of the other john symlinks for the hash extraction modes.
 
   08 Oct 2012; Rick Farina <zerochaos@gentoo.org> johntheripper-1.7.9-r5.ebuild:
   restore test functionality when possible, stub out for later opencl fixes
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index c1e5a283f6e1..bc262487b34a 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 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
@@ -19,23 +16,7 @@ EBUILD johntheripper-1.7.9-r2.ebuild 5344 SHA256 39e87b2ddd7f8c4d5aa2603761c2783
 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-r5.ebuild 5779 SHA256 bf31917ff280dc5be753f1eee4b38c9e785d6ab23cd549397760c7bc0c94e040 SHA512 563d8551add61b31c0927b2a9afec0686f9468a3573647be6e7185154b61440141f4beba7deb6b5d92a1b78795226569c116bd5065d65fbb0deebc516206cb74 WHIRLPOOL 370d635ec702c4ed767bb1fb6b5115ea49c4fdd06a62512f638bf02001f0926fc0c40670d7f18415b0f61cbd8be2976fa53a832a4a15a153b1b0f3d1a9f2c5dc
+EBUILD johntheripper-1.7.9-r6.ebuild 5937 SHA256 0b94c09c5cfe0ce0ee7dddd2e51d2d2c1a85b6e50927cdf0dfa533e1d915f095 SHA512 25be3a13767e219c83781e69c679f54fa1e87adef7b3f4815e1388110891a683faaf4c115941ca0e39e281b94a1a0cd2937b908c544cbdec3bb3bc91905d5eca WHIRLPOOL cf564361c61d50bad458bfd5ab047f3ffae6f9ed3e50b498b345e57fd5061b26b26bb15ab31d44ca405ce9fa755c0aad3a5414143be8788992a2925bf772c035
 EBUILD johntheripper-1.7.9.ebuild 5154 SHA256 591d62091f1b13bab26d888cabaf680a1ff85367947244328ff22caf06d502c9 SHA512 d5cf9a32409fa70642403133a11b9d201c2c17e2958197a9bec7da3a1bbefb56e76de4ba35e65ec1b1588a1eb2f2a9e0bc0e24f61736ca791a5c3111bd9d1377 WHIRLPOOL d5b2033b553fa887df16e2b014406013fd4db509c7336e8b0b8b2d5c6562761df7ac8196af972e809f46d8253c3e504a16efb9e0d9c4cdea5d8d4df508a0068e
-MISC ChangeLog 24430 SHA256 da8db9aeb78da5b6ea08d926756eea456e8c90a8e38f1a4f93da4a2ff1c82012 SHA512 e58f58d4c2a43d89eb5cd57ffbfcd483fdfaae0efbc23f11e3ee24d455176c4e87260033b0b0583ccd6956064ef7c9aa4b325819925fd3a720cac7368e6e0a90 WHIRLPOOL 8e14244687057edb3c1643726f8d4555acaf5b88387eb2a8b0920524dd2fddc3fbd32937ba7bb0ec77fbeda732d9ecdb21a1e170f54b782cf7a4ac2d75217e6d
+MISC ChangeLog 24627 SHA256 3d20fbfeca05e1d09832d5f0edb80b5281342a6a2447b12a4f6f2deef4c1005a SHA512 b1ddd6fdc1061301be0681fd0eb8932d876ea856ca7d63f657ce109b5ac113cdb0f2b131a8c455bfd149812b6934ad85c78b2cf2f60d1fd9f5485e43215f1864 WHIRLPOOL 996126c3bc7861fb6165f6a8b3e58c61255545e209607afee6bd48681b90ac0ea993c457c6265c455037cbcf66516c1404b7ff6f9cda29323699de1da81978da
 MISC metadata.xml 531 SHA256 bb4c0e9b5d1434c7873905469d1fa40f42db99babc475a08cf68d5d23d49d583 SHA512 357b9ab90cf72fb443cf98b0905f80adbd920d21c5b696c68a91f4936c7f8ced9895f1daeb74d813ddcc53d26c05cc82a9e83644c1f80afb8aad76bb1a7dd540 WHIRLPOOL e5497c9fbb9a8313d652b113a7d4090c4aadc45fb7b2ee87a7eca493a11b87b16194e094b956ac7142d94b58ddd9f72b90f405db4c9e5bc909c61be8698a4916
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCgAGBQJQc19CAAoJEKXdFCfdEflKOCYP/AoJacnzN6ZgMHYktUQOiyDJ
-qf9bINSsq0WjkwE0/aTwEyE1IyC8/szqGKOsYhlQ0srq3HFcCM5DPRTrNvtjtU/3
-CDceIEJ5p9mqfXK8wraz/z9eVLaiM5ah+E84Pcy5L3HzAnlz40zkepyh1p13pcJm
-R9Dz/T7dbnCbEJe5sdKCE4fke3oOG4RyY9z7BOsSUOe93eyOF1ID7C58mmk150PL
-icSTyuY8Nxz5ILrCyQ4qfL9i5dpVAr0c8x5BOrRIpKXLDVWYF2YCimaFIsfAwv7m
-86tAN+QJENdTm2HcsVA2suNxjXpFtoo+Q0dG1QrSFRm2s/rztNUJ90Bdol1AtSqm
-2QTD3z3wSc93CRWXYMsC+yH29VAc89KjjZkNDiM0lQUzJUfYpQPxsF6QrRNwce77
-+VsQA8BFbsFeW0gYc2RBZZyU8VTuwfqrxyO0FcQsOSYw/6KA0mnKunDUSuxJTCxW
-iTF+5YY9Qn2XUvLYOcutidkRgfY8x4pKcSmqSD7fOrRyXkVvV/O8/eFV6AUp3+bA
-m/vEl8o1QhWA/a4xqqKIB8RQRZTTLoPXeZfWAUtIDYzoT/dexBAEZXtcqdNdN5q+
-iqXRRtx0aznATaQSyNzdxbYF4SozJGZ4v+h3rINlcVaHmFSHmu92NNxlH3HXkUUP
-1/OfEw5/xBMStHo/mW3+
-=e6DB
------END PGP SIGNATURE-----
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
new file mode 100644
index 000000000000..c78fa58b02c4
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
@@ -0,0 +1,246 @@
+# 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-r6.ebuild,v 1.1 2012/11/24 23:17:46 robbat2 Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs pax-utils multilib
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+JUMBO="jumbo-7"
+
+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"
+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() {
+	if use opencl; then
+		cp src/opencl/*.cl run/
+		cp src/opencl_*.h run/
+	fi
+	pax-mark -mr run/john
+	if use opencl || use cuda; then
+		ewarn "GPU tests fail, skipping all tests..."
+	else
+		make -C src/ check
+	fi
+}
+
+src_install() {
+	# executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	pax-mark -mr "${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
+		for s in \
+			keychain2john keepass2john pwsafe2john hccap2john \
+			racf2john zip2john rar2john pdf2john ssh2john undrop \
+			; do
+			dosym john /usr/sbin/$s
+		done
+		dosbin run/calc_stat
+		dosbin run/genmkvpwd
+		dosbin run/mkvcalcproba
+		dosbin run/raw2dyna
+		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/*
+}