Version bump.

Package-Manager: portage-14484-svn/cvs/Linux x86_64

3 files changed, 160 insertions, 2 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 16e6afa8f3be..a2a64e9338af 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.99 2009/09/05 15:23:30 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.100 2009/10/03 22:54:22 arfrever Exp $
+
+*johntheripper-1.7.3.4 (04 Oct 2009)
+
+  04 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +johntheripper-1.7.3.4.ebuild:
+  Version bump.
 
   05 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   johntheripper-1.7.3.1-r1.ebuild:
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 24c1909d1411..acec77bd2739 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -18,10 +18,13 @@ DIST john-1.7.3.1-all-5.diff.gz 124682 RMD160 e52e740dd6c89893a8261baace6b8e7c39
 DIST john-1.7.3.1-mpi10.patch.gz 4723 RMD160 9c43172866591996ae0b135bdf4f90449e33c4c9 SHA1 0b2c6495e3c8aa5711a5f36acb2e8170b3431454 SHA256 23f8d07df3f3a9cfb39d77daffc2f9a5137e1e0c2d9683a03a0b8f3bdc4125c8
 DIST john-1.7.3.1-mpi8-small.patch.gz 9395 RMD160 ca55d3c7c31d6f3e023f74cfc6c453bdb64bb21e SHA1 c6d1d4d91d76a774470b66f120de93aca7906319 SHA256 5242b50d3709698edac17774b4394eef372bdac4b09fe4d2f01178f01a66deba
 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
 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 3808 RMD160 5267118142c809f7274c069eebc65b566e633b02 SHA1 e747ac355824438d69c4d1af19c45a4705e5262b SHA256 71bb24ee215d0ff27c49edfc6f3468bb8d9ea4d6387bccf2c32931a17ce97eea
 EBUILD johntheripper-1.7.3.1.ebuild 3991 RMD160 339f70feb161e7bc6e5716cd02c99a77e8a9ed1a SHA1 f20d2ae314093f270393814abc7dba0a245d3e0d SHA256 249101538909c1a303923662c360c44e5eb0ac99069b8744674bbf2e62f5f812
-MISC ChangeLog 16476 RMD160 8c105c68f709c394c8f437be44e9076b6ef57fd0 SHA1 239a354c014398c0850c1eefa66c39d1ec4cbed3 SHA256 deae9e77f2da2763211f44dfa6a805e4ca0250595edd691a1d5add0bb7072e9b
+EBUILD johntheripper-1.7.3.4.ebuild 3741 RMD160 4fc757b7395be802e7d3e19b465c6e40c88e2f73 SHA1 dcd559c01ec470ccf43e28238400d829f5626859 SHA256 2d0e99861f0e637d0ddb51bf1414de44ec40f63542645461b551552c85c59669
+MISC ChangeLog 16638 RMD160 cf88be5d414ea52af8030cab7fc72041f49ac981 SHA1 71ac39039ad8818f0052547adade5bf1df1bc452 SHA256 843a4efd4b3178276a66a5b71476a5af35c4317802fdfd322b3797ac9e0d90a0
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
diff --git a/app-crypt/johntheripper/johntheripper-1.7.3.4.ebuild b/app-crypt/johntheripper/johntheripper-1.7.3.4.ebuild
new file mode 100644
index 000000000000..8503eca1a90a
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.3.4.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.3.4.ebuild,v 1.1 2009/10/03 22:54:22 arfrever Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs pax-utils
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+JUMBO="jumbo-1"
+#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/*
+}