adding mozilla support per bug #491648

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

4 files changed, 290 insertions, 17 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 13af3b350014..f4af3565c558 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.163 2013/09/19 19:44:58 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.164 2013/12/02 17:48:18 zerochaos Exp $
+
+*johntheripper-1.7.9-r9 (02 Dec 2013)
+
+  02 Dec 2013; Rick Farina <zerochaos@gentoo.org>
+  +johntheripper-1.7.9-r9.ebuild, metadata.xml:
+  adding mozilla support per bug #491648
 
   19 Sep 2013; Rick Farina <zerochaos@gentoo.org> johntheripper-1.7.9-r8.ebuild:
   re-adjust compiler check in manner more preferred by co-maintainer
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 40eb6584c7af..5941c6133188 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -23,23 +23,24 @@ EBUILD johntheripper-1.7.9-r5.ebuild 5791 SHA256 d805fb984c97090e00caf678b9bd996
 EBUILD johntheripper-1.7.9-r6.ebuild 6038 SHA256 998ede1ea2f9fb589124f80a9788ef0f8172b936be3bc806a1ef02e5027b035b SHA512 18abda28b6d42611d6f92eaf6a43a7841f68f85931fc8445488d21bb323f50ebe93eb71203757ef3c0845942c67ec5108f72859acd5a6bb9b9e9353e69b9f53a WHIRLPOOL 63f9d5a51ed2fc01a6335f39ab12f6176411c8b265d0cf12ecf22cb18819b544bf51e72d62467d78d6b3cad25f7ab80ac90d3666fd464ac7a0e8491eb97aa72a
 EBUILD johntheripper-1.7.9-r7.ebuild 6048 SHA256 8476a8454ec50c2f987fec26e3dd05e686d68c5f9360708ffa7953a6c4befa23 SHA512 464ac5a14e5c9d52278c2569218e02fef8d765513b17ffb1e2b4da0df89e277337d77ea0fb0c1924c648e5184340e8ab3f8989fe97fc8d6d99e3ee8eef37a438 WHIRLPOOL ddbfbe1696c55e46c7a27f873baeda7ac63014eeb2d71e710197e0008b8b5301541171fe67f2ea66a2549f61a1bb7f6a2d8f49686cbe7edd81d78d6bfa4fbcdf
 EBUILD johntheripper-1.7.9-r8.ebuild 6201 SHA256 8d77df9cac84b484fd945d09d940de1d2d88d5d0ee26d18974b626de7c86cc2f SHA512 f0190e86ea5f15c17aababfea2901d3719fc61065ebfcd2661dc957a5591acffae865c4d2f16f487d64771ecfe27c9b4c427eb7b2390628ab97ad5e879fb228f WHIRLPOOL f3a78ef28f47ec67400570065b2f4aa92da75a6151eb1c8e69695676d24a4c8ca2eeaf9f60233d83b53e23c1585308d1923f7873234f8b35c0b1f169ef7c4d9f
+EBUILD johntheripper-1.7.9-r9.ebuild 6423 SHA256 51aa70c50b3868b78b4d9e67649367711e14e2b913b01000f7a9bdac48f6bf49 SHA512 29dfae6482e2f3a6b57b5d772b37fa889ef43c9dcbdab28c16897dd2c735da61186e0287e61ab9baea7df5e98af8dceee308ae838e7df216e637b0a5a4628902 WHIRLPOOL d508cbf5a6725c219b385a8893219121034987bf8654df7ee6704269c2b9c18d416bf5fbb3df0ef7898d5fdd13926655c40f87e5fb9a2e8a6737458f85dce13b
 EBUILD johntheripper-1.7.9.ebuild 5154 SHA256 591d62091f1b13bab26d888cabaf680a1ff85367947244328ff22caf06d502c9 SHA512 d5cf9a32409fa70642403133a11b9d201c2c17e2958197a9bec7da3a1bbefb56e76de4ba35e65ec1b1588a1eb2f2a9e0bc0e24f61736ca791a5c3111bd9d1377 WHIRLPOOL d5b2033b553fa887df16e2b014406013fd4db509c7336e8b0b8b2d5c6562761df7ac8196af972e809f46d8253c3e504a16efb9e0d9c4cdea5d8d4df508a0068e
-MISC ChangeLog 27201 SHA256 a4a1759d762e6ab9d8e4354159526ad27821c557e58077e09bce7e5ff5e93545 SHA512 0cf50e5f34ee805ac7594134b513f59f48c923971bec411a69b85655e4709626f19819acd363179f29389592e4bfc630a35cd6d169d79b066adaf807f6f8bfde WHIRLPOOL 54f70a4aa4984c169bcf95f54db264592e676c7190f140e9c9bc082a2ec1dd0a10bebff3272a9fa27b9c7d60fac2f4f0ba8dae688f867b7cfd003e3d4616bed0
-MISC metadata.xml 532 SHA256 205d6c05d370c4419026a293e14941c5445988b357506fc6734aaff68bcd7162 SHA512 563790fc65ff56941134cb35f32849ac87c3278b4382ba9a1aae05ddce86ee191623b8f2206f8cd6088b669aead9b91c96ffeca5e54e883e37158cf818d141a6 WHIRLPOOL c6b670ead4ca5569bb7c5662cc217b5875be3d0a77b06f3e4afd1c5a783e4a948dfe0f18ea3171aa717c3dfab5fe8d4e5bd62ef6a4b1f5a7e99c61d6b833e6c7
+MISC ChangeLog 27380 SHA256 efd62e7d6ba3c153ddf50f5786b9ad1beabfcc8c421f7fc7bbd064bd3c6538c2 SHA512 1f5cc48a9e5a9b79117d29df99e7f08856bed437ddd9c3c0ed2380b90630d67406c7392bf7f08ca2780ed507744db6031a1e8c2fd240463ef750fd11ad160ad0 WHIRLPOOL 358af29567ae039997c1ad87fba1bcbaead250cae30e596c431521c830366087169010109ec57ddd90147677d2532e301af915e4dfe89d1dfebe2fc5f450badf
+MISC metadata.xml 599 SHA256 50bd157b1e2a064b9b50b388938b5cda68b7eff31c859374b30f496474de5433 SHA512 4d5cab10cf182fa462bdbf8e9d700501dcfbde9a0cc553007a80698d5d96c158dc743001153bb624ac384a2a5b602eeaabfcbfd5d65a0ef038c68816311b67f1 WHIRLPOOL 62e1487da6e4d1588e4c6cd14dac1135e0cdd1eb3e2d46fafeef1e95ded22d48d6b0c8c03af3612a62dc9068f92fe2857adecad9d5f8cd4a10180994a46feff5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSO1SdAAoJEKXdFCfdEflKB5sP/jYxIHU6mpWkfkcOK0uj0vkg
-5wrXYeMH+K7mJw1vsgwvT32Q7iBf+MV9TAywtsqQATiT+vCN1GAKWX1/C+4fhTL+
-Crjfe80Sk52MCfZYwWBCjgy8fHkdVfihytHXPbut3SwOvrnonlhexypGJEGQnpJb
-fzEHhfeg/HvVcs9mA+Ox5qa551Nae8vkLo/7tGJ5rWR0Uwb6wKKoXqHo3wV11hn3
-w+Ll9EeVnq0eVS9Ke68XEKgDwfDjtKShevePvNM8dKiREoE6obcYeJSvKlE3p1kk
-mHdSJBYl6RZueSQPl3RZP0L9XIUEOb1oajMjIoEIYYArjEYUA9433l5nALByO/Sz
-9bqC86t6vqgwBMhMEfi1sTn+aAC19jGxmC0a8mqVUcSdqQ4pjS/NNspa1fCE61gE
-Zp7O19KPNPZhJqJvUOyE0t1OTZzB90j9URVnOrJDKwYjWuuZExWhMIhuOpPwdM7T
-Srri0yKZOoFIQjA6e3v+igrSJU8NZbndrMDc/zxtbsYx9evvwgk2Lw3IKZtaWxn3
-KpKbruplpAyjvEcE7bsZrXwyyC0fN6OBz/JGobM3YAYsLPfGRzDWQzDh82D7v2Kh
-J78dPorDUiCHMYhHfmYbAQD+1vXmwnRw/gqgdwtl2r2fyNKYKD1ZTCURcUp0vBzB
-cxK+ALYQg/k7P6bQZolQ
-=vPCK
+iQIcBAEBCgAGBQJSnMg4AAoJEKXdFCfdEflKL18P/AiZs2bk7Q3pcIikCtz3/HYs
+SUxZnikD9qCD1OVrjUNoiS8Rt3JzpHlj1XfZceX7v8iW8+VBfLlW3PsbxYb222KS
+z3/79ZYn9HjTgJRgH7dCnvqaPhcabouM5eg041vdyUNq8rX4u8sloAxlM4tzNElD
+SK2Ds8yvOm9rHYk3DYIDO0Pw491z6h9AwDPSmMKt1n8JSqaxHyyjz6IUusPT+EP1
+HUckU/QtNQHGjg6IoZqW+gWowpqcobZc/RE4qJWnvGhwHV1sXRf0wUSjrzELnuSV
+mW4GFjBcS2pFLvM8/S/z4c7v5z9tlf9sOD3JlwnSzd1NEu3W6Q721KqmGw0KHz5H
+ph7mF/Ac4zEqlFqP4ZmjUW3Ir0tYNHDoDN0WqqJA9EkEWzfb0hGbXWrjBAizdJsV
+OTELs9YFEgE1yk4r3Ubldx2rgZsbih2zw5v9E4lTsrbqqdwoYhXCWCrlJfF3TLL6
+5eyzTMkB5jHwtfGNM6/R/D+Mf7b0z/L/Ckd+kcLnuHCiUzBrNgmb3vXLClrwTjjG
+43yAFAiRWnKtoju16Wskud/lifNfySFuBzTwPuGTO3hiGBJLWmHsOdFBMJqXEOWU
+tob3/AmnbH1H8aboQT/8B5ufBm6kT7mZ1C1409ZRDK3W8NuQwwDJ1amc8AhVyVUO
+3zqz/27wDiX1HfpodeM/
+=88Im
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r9.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r9.ebuild
new file mode 100644
index 000000000000..b7d0b2e314be
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r9.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2013 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-r9.ebuild,v 1.1 2013/12/02 17:48:18 zerochaos Exp $
+
+EAPI="5"
+
+inherit cuda 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 ~arm ~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 mozilla mpi opencl openmp sse2"
+REQUIRED_USE="openmp? ( !minimal )
+	mpi? ( !minimal )
+	cuda? ( !minimal )
+	opencl? ( !minimal )
+	mozilla? ( !minimal )"
+
+DEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 )
+	mpi? ( virtual/mpi )
+	cuda? ( x11-drivers/nvidia-drivers
+		dev-util/nvidia-cuda-toolkit:= )
+	opencl? ( virtual/opencl )
+	mozilla? ( dev-libs/nss dev-libs/nspr )"
+RDEPEND="${DEPEND}"
+
+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 && [[ ${MERGE_TYPE} != binary ]]; 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
+		# fix compile on ppc (only needed for jumbo-7)
+		epatch "${FILESDIR}/${P}-ppc-compile-fix.patch"
+	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
+
+	if use cuda; then
+		cuda_src_prepare
+		sed \
+			-e "/^NVCC_FLAGS/s:$: ${NVCCFLAGS}:g" \
+			-i Makefile || die
+	fi
+
+	if use mozilla; then
+		sed -i -e '/HAVE_NSS =/s/^#*//' -e 's/NSS_override//' Makefile || die
+	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
+	gcc-specs-pie && append-ldflags -nopie
+	use openmp && OMP="-fopenmp"
+
+	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
+	if use mpi; then
+		CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
+	fi
+
+	#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 ../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
+		use mozilla && dosym john /usr/sbin/mozilla2john
+		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/*
+}
diff --git a/app-crypt/johntheripper/metadata.xml b/app-crypt/johntheripper/metadata.xml
index 6ff1b88b1de8..dabd8490bbad 100644
--- a/app-crypt/johntheripper/metadata.xml
+++ b/app-crypt/johntheripper/metadata.xml
@@ -9,6 +9,7 @@
   </maintainer>
   <use>
     <flag name="cuda">Use nvidia cuda toolkit for speeding up cracking on capable devices</flag>
+    <flag name="mozilla"> Support mozilla password cracking</flag>
     <flag name="opencl">Enable opencl support for speeding up cracking on capable devices</flag>
   </use>
 </pkgmetadata>