version bump as per bug #122435.

(Portage version: 2.1_rc4)

6 files changed, 154 insertions, 1 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 718e8d151914..55a7c1230595 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.37 2006/04/11 20:43:24 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.38 2006/06/04 11:32:53 dragonheart Exp $
+
+*johntheripper-1.7.0.2 (04 Jun 2006)
+
+  04 Jun 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/johntheripper-1.7.0.2-stackdef.S, +johntheripper-1.7.0.2.ebuild:
+  version bump as per bug #122435. Thanks Allan Que for the ebuild and all others
 
   11 Apr 2006; Daniel Black <dragonheart@gentoo.org> +files/clk_tck.patch,
   johntheripper-1.6.40.ebuild:
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6 b/app-crypt/johntheripper/files/digest-johntheripper-1.6
index 57eb0f6245df..c8f420367960 100644
--- a/app-crypt/johntheripper/files/digest-johntheripper-1.6
+++ b/app-crypt/johntheripper/files/digest-johntheripper-1.6
@@ -1,2 +1,6 @@
 MD5 aae782f160041b2bdc624b0a84054e32 john-1.6.tar.gz 497341
+RMD160 5a34e7f57b190313cc0773e996f6eed74f28d160 john-1.6.tar.gz 497341
+SHA256 134a45c749190fd0a139edb151cb7b6096c7a3c1a42b89f3bcc2f9187d17a4f5 john-1.6.tar.gz 497341
 MD5 ec0b4fed7c81d370e85544deab48d03c john_1.6-17.diff.gz 11451
+RMD160 52a13303fdfa35b11095c2f8259ed50e45e0bd27 john_1.6-17.diff.gz 11451
+SHA256 d50103a722a44c446abb122d1bf1285ae5474bf21f0fd3b5de3b604873d8971e john_1.6-17.diff.gz 11451
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6-r3 b/app-crypt/johntheripper/files/digest-johntheripper-1.6-r3
index 161684a3ec1a..32b67f173631 100644
--- a/app-crypt/johntheripper/files/digest-johntheripper-1.6-r3
+++ b/app-crypt/johntheripper/files/digest-johntheripper-1.6-r3
@@ -1,2 +1,6 @@
 MD5 17f827dd86f7c7254fceb48f31390c24 john-1.6-gentoo.patch 156681
+RMD160 3d0711fc443e58b157dc8303d8cbcefa34876141 john-1.6-gentoo.patch 156681
+SHA256 d49c1dc6c338dacef5d7235baf13701b9493e1beae7d5fb926b5f1e500bb5914 john-1.6-gentoo.patch 156681
 MD5 aae782f160041b2bdc624b0a84054e32 john-1.6.tar.gz 497341
+RMD160 5a34e7f57b190313cc0773e996f6eed74f28d160 john-1.6.tar.gz 497341
+SHA256 134a45c749190fd0a139edb151cb7b6096c7a3c1a42b89f3bcc2f9187d17a4f5 john-1.6.tar.gz 497341
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.7.0.2 b/app-crypt/johntheripper/files/digest-johntheripper-1.7.0.2
new file mode 100644
index 000000000000..c6c32fdd9305
--- /dev/null
+++ b/app-crypt/johntheripper/files/digest-johntheripper-1.7.0.2
@@ -0,0 +1,6 @@
+MD5 4429722ba242a5a33ca8ebf45fd42797 john-1.7-all-4.diff.gz 50311
+RMD160 eafed1e75d72beef62664b238adf38ec6e6d4c52 john-1.7-all-4.diff.gz 50311
+SHA256 cb51be6cb03e952a21ea1a85e60253b932c946959b62f8082665ac2c7a792909 john-1.7-all-4.diff.gz 50311
+MD5 084fa03f265491ef7e32c05e9fb027db john-1.7.0.2.tar.gz 802354
+RMD160 f4e7fead92d0b14ad088c8331d1b5c5ca941b85b john-1.7.0.2.tar.gz 802354
+SHA256 b53633941ad52083d7143499ea06c60d918881a85d9685cd3f1917de7b0e61df john-1.7.0.2.tar.gz 802354
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.0.2-stackdef.S b/app-crypt/johntheripper/files/johntheripper-1.7.0.2-stackdef.S
new file mode 100644
index 000000000000..96b46e6effc3
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.0.2-stackdef.S
@@ -0,0 +1,3 @@
+#ifdef __ELF__
+.section .note.GNU-stack,"",@progbits
+#endif
diff --git a/app-crypt/johntheripper/johntheripper-1.7.0.2.ebuild b/app-crypt/johntheripper/johntheripper-1.7.0.2.ebuild
new file mode 100644
index 000000000000..9a39695e6cae
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.0.2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_PBASE=${P/theripper/}
+MY_PNBASE=${PN/theripper/}
+S=${WORKDIR}/${MY_PBASE}
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+SRC_URI="http://www.openwall.com/john/f/${MY_PBASE}.tar.gz
+		http://www.openwall.com/john/contrib/${MY_PNBASE}-1.7-all-4.diff.gz"
+
+# banquise-to-bigpatch-17.patch.bz2"
+# based off /var/tmp/portage/johntheripper-1.6.40
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE="mmx altivec"
+
+RDEPEND="virtual/libc
+         >=dev-libs/openssl-0.9.7"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${DISTDIR}/${MY_PNBASE}-1.7-all-4.diff.gz
+	sed -i -e "s|^CFLAGS.*|CFLAGS= -c -Wall ${CFLAGS}|" \
+		-e 's|^LDFLAGS =\(.*\)|LDFLAGS =\1 -lm|' "${S}"/src/Makefile
+	sed -i -e 's+$JOHN/john\.\(conf\|ini\)+/etc/john/john\.\1+' \
+		"${S}"/src/params.h
+	for file in src/*.S
+	do
+		einfo "adding stack to file ${file}"
+		cat "${FILESDIR}/${P}-stackdef.S" >> "${file}"
+	done
+}
+
+
+src_compile() {
+	cd src
+	# Note this program uses AS and LD incorrectly
+	OPTIONS="CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC) \
+		OPT_NORMAL= OPT_INLINE= JOHN_SYSTEMWIDE=1
+		CFG_FULL_NAME=/etc/john/john.conf
+		CFG_ALT_NAME=/etc/john/john.ini"
+
+	if use x86 ; then
+		if use mmx ; then
+			emake ${OPTIONS} linux-x86-mmx || die "Make failed"
+		else
+			emake ${OPTIONS} linux-x86-any || die "Make failed"
+		fi
+	elif use alpha ; then
+		emake ${OPTIONS} linux-alpha || die "Make failed"
+	elif use sparc; then
+		emake ${OPTIONS} linux-sparc  || die "Make failed"
+	elif use amd64; then
+		if use mmx; then
+			emake ${OPTIONS} linux-x86-64-mmx  || die "Make failed"
+		else
+			emake ${OPTIONS} linux-x86-64  || die "Make failed"
+		fi
+	elif use ppc-macos; then
+		if use altivec; then
+			emake ${OPTIONS} macosx-ppc32-altivec || die "Make failed"
+		else
+			emake ${OPTIONS} macosx-ppc32 || die "Make failed"
+		fi
+		# for Tiger this can be macosx-ppc64
+	elif use ppc64; then
+		if use altivec; then
+			emake ${OPTIONS} linux-ppc32-altivec  || die "Make failed"
+		else
+			emake ${OPTIONS} linux-ppc64  || die "Make failed"
+		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
+			emake ${OPTIONS} linux-ppc32-altivec:  || die "Make failed"
+		else
+			emake ${OPTIONS} linux-ppc32 || die "Make failed"
+		fi
+	else
+		emake ${OPTIONS} generic || die "Make failed"
+	fi
+
+	# currently broken
+	#emake bench || die "make failed"
+}
+
+
+src_test() {
+	cd run
+	if  [[ -f /etc/john/john.conf || -f /etc/john/john.ini  ]]
+	then
+		./john --test || die 'self test failed'
+	else
+		ewarn "selftest requires /etc/john/john.conf or /etc/john/john.ini"
+	fi
+}
+
+src_install() {
+	# config files
+	insinto /etc/john
+	doins run/john.conf
+	sed -i -e 's:$JOHN:/usr/share/john:g' "${D}/etc/john/john.conf"
+
+	# executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	dosym john /usr/sbin/unafs
+	dosym john /usr/sbin/unique
+	dosym john /usr/sbin/unshadow
+
+	# for EGG only
+	dosym john /usr/sbin/undrop
+
+	#newsbin src/bench john-bench
+
+	# share
+	insinto /usr/share/john/
+	doins run/*.chr run/password.lst
+
+	# documentation
+	dodoc doc/*
+}