Bump for #305089

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

3 files changed, 160 insertions, 2 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 2d0a4fa86eee..325d1828d604 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.111 2010/01/31 16:09:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.112 2010/02/19 14:39:18 patrick Exp $
+
+*johntheripper-1.7.4.2 (19 Feb 2010)
+
+  19 Feb 2010; Patrick Lauer <patrick@gentoo.org>
+  +johntheripper-1.7.4.2.ebuild:
+  Bump for #305089
 
   31 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   johntheripper-1.7.3.4.ebuild:
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 613597d43eca..adb9afc68cba 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -20,11 +20,14 @@ DIST john-1.7.3.1-mpi8-small.patch.gz 9395 RMD160 ca55d3c7c31d6f3e023f74cfc6c453
 DIST john-1.7.3.1.tar.gz 814903 RMD160 c810466241889f307c0e7096bcdd4fb39d8638ca SHA1 29a283933219dabe0f363618a0c8a083e79e6748 SHA256 e152c34bfc2ca1b79d78a5d243cd51930ebf3e4ec77810f4d9eaa560077be635
 DIST john-1.7.3.4-jumbo-1.diff.gz 124346 RMD160 6876511de35b0743df6b9ce23529b2e3e8269ee7 SHA1 05a31bee24685da89bde5d0d13981bb6d1dcd5ca SHA256 580e2db04338fe5a8841943bd588640ba9c80884e1d8a21bb44be7fec581e178
 DIST john-1.7.3.4.tar.gz 816259 RMD160 975116059a26e7030cdd573109dae36812160543 SHA1 9fd327416188c405d4927a32f1a8e756b4a259e1 SHA256 017936a2a98e0a4bcec56c53177e4ee8f515ebd5e39fd97e55b1962076eb5d16
+DIST john-1.7.4.2-jumbo-3.diff.gz 189325 RMD160 4b1a1d48aba31dbe25b6e5a1de9c837203b30419 SHA1 369882a289d28e78b0917bf7b58ce6c486cb9b72 SHA256 cbb99ceb814c786500e61eacd6432fbcc6c69ec6b92218f29c851a9546b0d177
+DIST john-1.7.4.2.tar.gz 823747 RMD160 bf36f64921454ee593bf588dcffe7053e9cbf73a SHA1 954eedaa17868cce0ac507042407269bcea2c63b SHA256 ad1c10e63c8346d4319e156e30fdbbe3457eb44441bd40e93a64ae44f9be7329
 EBUILD johntheripper-1.7.2-r3.ebuild 3270 RMD160 11c92633890bfd0512cb91853223d220d65ed4fa SHA1 2d96500dd2d8575caaa84a095e0cfa52b570bf92 SHA256 121a0cb4f6df1d841738411ceaf7485c90d4b52dbb9e78919930ab8e52a8ffce
 EBUILD johntheripper-1.7.2-r4.ebuild 2978 RMD160 7e8851cec1060b8794d95392bd0c37b5f21ee993 SHA1 72fb81509358e99fa576f59b9ca12c1eb5108f8f SHA256 ee57da8c6129754d2b52195dd7e0a560384a42ae7e4cc154b9074ea580cd511a
 EBUILD johntheripper-1.7.2-r5.ebuild 3246 RMD160 ffd3cef44a37ccdeee90f9a252c35b671842b741 SHA1 0d3d612dac576e58a85afe9b2bb1fc9a5caae844 SHA256 eaec78bba96cc112e1b2c51be1e4600ddab491687e28ba720e2ec9e952bf31e2
 EBUILD johntheripper-1.7.3.1-r1.ebuild 3802 RMD160 cd748e97576a721d12c02cde6eed254e24f4e57b SHA1 6f0226e61d8ca6a574301ef68e0bf3fca4ca52fa SHA256 8bf1feecc435d047e66ef8d3795510f0842dd9b5d1a452caf9370ee5267b8b2c
 EBUILD johntheripper-1.7.3.1.ebuild 3991 RMD160 339f70feb161e7bc6e5716cd02c99a77e8a9ed1a SHA1 f20d2ae314093f270393814abc7dba0a245d3e0d SHA256 249101538909c1a303923662c360c44e5eb0ac99069b8744674bbf2e62f5f812
 EBUILD johntheripper-1.7.3.4.ebuild 3734 RMD160 7c7306cf92a572c9e5d7ee1c010f7b726d6bffdd SHA1 5c1456fddf71f4847273a347f00450cb535d5642 SHA256 4371287f7f6001c728c41984fd2c8dcd05e595536b15755f3ab01313a55025cd
-MISC ChangeLog 17842 RMD160 7352bf81dc36f45a294fc76dd2227887a1ed4b7c SHA1 95d3c70f63f7ddb1b168bb8ade3b4cbc3f8efd91 SHA256 f4b24cadf9081eddae60e179a3bbb82e4f33f241e5bdd2dfbd4d96c0837ea982
+EBUILD johntheripper-1.7.4.2.ebuild 3740 RMD160 41201d9c451e67e3cc851276a52c89863397874e SHA1 50db1cfe7d41608369fc08d9628211552317ae80 SHA256 3e0b1a1fcbe38494669963677712a9a3bf0875f6f719ca15d9ab9d895fe13ea3
+MISC ChangeLog 17983 RMD160 9e39f58df211eefd046ae9735d97c400be3077c9 SHA1 aae123bd1e531f046d464070bd5e92f764a38d4e SHA256 e06cbdad10cbe98765bfa0641c9cee404d08b3b896b62e92fcb90242229aa4c5
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
diff --git a/app-crypt/johntheripper/johntheripper-1.7.4.2.ebuild b/app-crypt/johntheripper/johntheripper-1.7.4.2.ebuild
new file mode 100644
index 000000000000..69cb31931e3f
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.4.2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.4.2.ebuild,v 1.1 2010/02/19 14:39:18 patrick Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs pax-utils
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+JUMBO="jumbo-3"
+#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? ( ftp://ftp.openwall.com/john/contrib/${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"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="altivec custom-cflags -minimal mmx 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 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 alpha; then
+		echo "linux-alpha"
+	elif use sparc; then
+		echo "linux-sparc"
+	elif use amd64; then
+		echo "linux-x86-64"
+	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 ppc; then
+		if use altivec; then
+			echo "linux-ppc32-altivec"
+		else
+			echo "linux-ppc32"
+		fi
+	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="${PATCHLIST} cflags mkdir-sandbox"
+
+	cd src
+	for p in ${PATCHLIST}; do
+		epatch "${FILESDIR}/${PN}-1.7.3.1-${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() {
+	use custom-cflags || strip-flags
+	append-flags -fPIC -fPIE
+	append-ldflags -nopie
+
+	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} -DJOHN_SYSTEMWIDE -DJOHN_SYSTEMWIDE_HOME=\"\\\"/etc/john\\\"\" -DJOHN_SYSTEMWIDE_EXEC=\"\\\"/usr/libexec/john\\\"\"" \
+		LDFLAGS="${LDFLAGS}" \
+		OPT_NORMAL="" \
+		$(get_target) || die "emake failed"
+}
+
+src_test() {
+	cd run
+	if [[ -f "/etc/john/john.conf" || -f "/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 "selftest requires /etc/john/john.conf or /etc/john/john.ini"
+	fi
+}
+
+src_install() {
+	# executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	pax-mark -m "${D}"/usr/sbin/john
+
+	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/*
+}