Revision bump. Fix typo in jumbo patch and apply performance fix.

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

4 files changed, 266 insertions, 9 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 600886607785..fa717babff03 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.140 2012/04/07 20:36:41 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.141 2012/04/08 05:19:03 radhermit Exp $
+
+*johntheripper-1.7.9-r2 (08 Apr 2012)
+
+  08 Apr 2012; Tim Harder <radhermit@gentoo.org>
+  +johntheripper-1.7.9-r2.ebuild,
+  +files/johntheripper-1.7.9-jumbo-5-NT-performance-02.patch:
+  Revision bump. Fix typo in jumbo patch and apply performance fix.
 
   07 Apr 2012; Tim Harder <radhermit@gentoo.org> johntheripper-1.7.9-r1.ebuild:
   Fix CFLAGS quoting build error.
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index d04af7c087e1..79c59fedddda 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -3,6 +3,7 @@ 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
+AUX johntheripper-1.7.9-jumbo-5-NT-performance-02.patch 1300 RMD160 836afc69d1c84a0363abf0b378946121456aa819 SHA1 06abdaaca4ceb50c89e34d6f28d1e5e8eebb6174 SHA256 27ab9ee6cd7b83aa94dbe3c66fb507432f230fde4818a9a754eeb93388f01513
 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
@@ -12,17 +13,18 @@ DIST john-1.7.9.tar.bz2 717505 RMD160 6b8bf7423d8e138c5bfa30bfd348363887e7a4c6 S
 EBUILD johntheripper-1.7.6-r1.ebuild 4780 RMD160 de8ba3a80271098a95b7b83d33151f58aaf8d5e2 SHA1 8eaad231cd9a107c63ffedf584bfad7c3c325ff2 SHA256 cbccc9675f4246e568ad5e6da1e666b965db42c2d50aa3ad8b25d14bf6faba25
 EBUILD johntheripper-1.7.8.ebuild 4911 RMD160 1d08ad9b245c6fe437f228f575ed4c70b26a65eb SHA1 96d5c1b88f1ab34d5bde718c3248dcf777de9af8 SHA256 f20d5efe90d076625aa12cf056504cb9969d0d5e46895368fdc75eb7a3011c76
 EBUILD johntheripper-1.7.9-r1.ebuild 5207 RMD160 c464882ff065482157e1d4f82620219c4c7c73cb SHA1 0288a6a207f083c6ef21051addef698799101923 SHA256 e6edc0814d6a35c4b7e7feddfd06bf4f6152aa73bc2451b7dbc509a326afc2ca
+EBUILD johntheripper-1.7.9-r2.ebuild 5344 RMD160 53187202542c1feeffb80aae61c17b8b593a4031 SHA1 6d12dcbf9e8fd41e55c407ff81458a52439ecfb4 SHA256 39e87b2ddd7f8c4d5aa2603761c2783a64d1b216d0021af53b81d503dc4e061d
 EBUILD johntheripper-1.7.9.ebuild 5154 RMD160 217f4295ec12d174b77072b36644bcbbcff33468 SHA1 0197343811218b1f963fc828995cd814762d7560 SHA256 591d62091f1b13bab26d888cabaf680a1ff85367947244328ff22caf06d502c9
-MISC ChangeLog 23338 RMD160 cd1f56396a37385b03f60153bc98f2d00f979ccb SHA1 4177b5a6cd70038474c1755c62abf1db30388739 SHA256 34c9bbd0060b72abb56a93c65af61fbb95885faf1e23093812c3ba9bf1c371c6
+MISC ChangeLog 23591 RMD160 26fe0ecea4376ba7f055332ad1e61e7b233f2100 SHA1 1fa4bda76b42d78483746b95daa0b534159c48e2 SHA256 9a1161dab36e10d7a81af650d997f1e541f1096ea4270c1d55480b26ea90cc53
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPgKVhAAoJEEqz6FtPBkyjmTEH+waCPvvtcTHl+mT8LZkOf+nt
-cvkxtEeX94mdYKlXWvZd3Fj6V9KkmmtJfNxm8s115+jfJ2XHMiX1OHYrZ+rHpNsm
-pWsvPciyFF4WBIwHp9hzLLmfGV9bV+Ee6dIB5u8+Mk3Y3l97dowqNY/gL7mxENQ0
-0H/2HOkrRczOlJiwd6HfTL/cSTKImzPVhtoOMWk3KtNiRZ4bCnPMaXkIfZiWwU1w
-s5LDOMuHREphZKO4BpdeiqFtlc1cKW6pG2Z3th3kiDDEs8gfq3AXiuL9PL+qhop6
-RytRwbi0slEm+Z3JguIA8xicBZLnWTe4+OEK+aIRFYpqp1c8mNpv5y9afSWoqXM=
-=UhAF
+iQEcBAEBCgAGBQJPgR/YAAoJEEqz6FtPBkyjIe4IALOBdfH5TJKqxC5I26M4JrIE
+LwYsvNv+/Bx3nLLsIVLF0PochDjddIBLUME/hmuqGD6k8IfIWSCw3E56YUdTFhYT
+9WKDkza558SaZTKMcmh2EAki0FPRkckLOwv6JVHRTYtWvz3WnDWjrpJKHGT4PKvT
+3DMC8IwI8m26YIKa0jYc0UCBysqQ1ymPfed6i1Y4v6hL+2bNFfnUOekR5PkCjdlN
+mQIwjhGFEM+I4E7erX/hAEi59qG0whHmMNRnETtWSTXJzcdE0DEi31QPTdrnZyt2
+BTwdVzCU0yq5xuCd4aGTVQfPSsNJ5tuXQhLpdaiTNZpJs5FmIESl5/o8bPQSP5g=
+=IbM0
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.9-jumbo-5-NT-performance-02.patch b/app-crypt/johntheripper/files/johntheripper-1.7.9-jumbo-5-NT-performance-02.patch
new file mode 100644
index 000000000000..6066cb8f314e
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.9-jumbo-5-NT-performance-02.patch
@@ -0,0 +1,31 @@
+diff --git a/src/NT_fmt_plug.c b/src/NT_fmt_plug.c
+index eb52e3d..411a45b 100644
+--- a/src/NT_fmt_plug.c
++++ b/src/NT_fmt_plug.c
+@@ -652,7 +652,7 @@ static inline void set_key_helper(unsigned int * keybuffer,
+ 	for(; key[md4_size]; i += xBuf, md4_size++)
+ 	{
+ 		unsigned int temp;
+-		if ((temp = key[++md4_size]))
++		if ((temp = key[++md4_size]) && md4_size < PLAINTEXT_LENGTH)
+ 		{
+ 			keybuffer[i] = key[md4_size-1] | (temp << 16);
+ 		}
+@@ -704,7 +704,7 @@ static inline void set_key_helper_utf8(unsigned int * keybuffer, unsigned int xB
+     const UTF8 * source, unsigned int lenStoreOffset, unsigned int *lastlen)
+ {
+ 	unsigned int *target = keybuffer;
+-	unsigned int *targetEnd = &keybuffer[xBuf * ((PLAINTEXT_LENGTH + 1) >> 1)];
++	unsigned int *targetEnd = &keybuffer[xBuf * (PLAINTEXT_LENGTH >> 1)];
+ 	UTF32 chl, chh = 0x80;
+ 	unsigned int outlen = 0;
+ 
+@@ -844,7 +844,7 @@ static inline void set_key_helper_encoding(unsigned int * keybuffer,
+ 		i = 0;
+ 		for(md4_size = 0; key[md4_size]; i += xBuf, md4_size++)
+ 			{
+-				if ((temp = CP_to_Unicode[key[++md4_size]]))
++				if ((temp = CP_to_Unicode[key[++md4_size]]) && md4_size < PLAINTEXT_LENGTH)
+ 					keybuffer[i] = CP_to_Unicode[key[md4_size-1]] | (temp << 16);
+ 				else {
+ 					keybuffer[i] = CP_to_Unicode[key[md4_size-1]] | 0x800000;
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r2.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r2.ebuild
new file mode 100644
index 000000000000..fe6234cc72fe
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r2.ebuild
@@ -0,0 +1,217 @@
+# 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-r2.ebuild,v 1.1 2012/04/08 05:19:03 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-fbsd ~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:0 )
+	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"
+	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
+}
+
+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
+
+	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
+		epatch "${FILESDIR}/${P}-jumbo-5-NT-performance-02.patch"
+
+		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
+	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 -include \\\"${S}\\\"/config.gentoo ${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/*
+}