fixes to bug #51442 and bug #49988. Thanks to Ghislain Bourgeois

4 files changed, 101 insertions, 10 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index cf05b6df33a3..4ca8eb6d26dc 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.11 2004/05/18 04:09:39 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.12 2004/05/20 03:03:18 dragonheart Exp $
+
+*johntheripper-1.6-r3 (20 May 2004)
+
+  20 May 2004; Daniel Black <dragonheart@gentoo.org>
+  +johntheripper-1.6-r3.ebuild:
+  fixes to bug #51442 and bug #49988. Thanks to Ghislain Bourgeois
+  <ghislain48@hotmail.com>
 
 *johntheripper-1.6-r2 (18 May 2004)
 
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index a5f5f1995420..a65fe5c0c31f 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,9 +1,2 @@
-MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 5b37d0e2e0a8877fa7fc60da0944b9c7 johntheripper-1.6-r1.ebuild 2070
-MD5 00a2a9ef4ac96b131bc282e8169d9a44 johntheripper-1.6.ebuild 1324
-MD5 b7fdea949de001c35035b2d19eb1e760 johntheripper-1.6-r2.ebuild 2324
-MD5 50e24bde0e729dbcf82240b2b351ef69 ChangeLog 2626
-MD5 2a2c77e0b8b4692a9e20de4d68983071 files/digest-johntheripper-1.6 123
-MD5 d2a0df18590c71836e4c423af635353f files/digest-johntheripper-1.6-r1 456
-MD5 aca0764a8bea14596f679cc140b80c64 files/digest-johntheripper-1.6-r2 382
-MD5 647f92814e453cb358ef2d0df669f026 files/john-ntlm.skey.patch 1168
+MD5 1affd04778b5df6ee9a26c34e58e2388 johntheripper-1.6-r3.ebuild 2002
+MD5 c44028343f13bf0e4ff431cca80988d9 files/digest-johntheripper-1.6-r3 126
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6-r3 b/app-crypt/johntheripper/files/digest-johntheripper-1.6-r3
new file mode 100644
index 000000000000..991a52bb4768
--- /dev/null
+++ b/app-crypt/johntheripper/files/digest-johntheripper-1.6-r3
@@ -0,0 +1,2 @@
+MD5 aae782f160041b2bdc624b0a84054e32 john-1.6.tar.gz 497341
+MD5 17f827dd86f7c7254fceb48f31390c24 john-1.6-gentoo.patch 156681
diff --git a/app-crypt/johntheripper/johntheripper-1.6-r3.ebuild b/app-crypt/johntheripper/johntheripper-1.6-r3.ebuild
new file mode 100644
index 000000000000..01e5f063600a
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.6-r3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6-r3.ebuild,v 1.1 2004/05/20 03:03:20 dragonheart Exp $
+
+inherit eutils flag-o-matic
+
+MY_P=${P/theripper/}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+SRC_URI="http://www.openwall.com/john/dl/${MY_P}.tar.gz
+	mirror://gentoo/${MY_P}-gentoo.patch"
+
+#
+# john-{$PV}-gentoo.patch is a heavly hacked combination of:
+#        mirror://debian/pool/main/j/john/${DEBPATCH}.gz
+#        ftp://ftp.openwall.com/pub/projects/john/contrib/john-ntlm-patch-v02.tgz
+#        http://www.monkey.org/~dugsong/john-1.6.krb4.patch-3
+#        http://www.monkey.org/~dugsong/john-1.6.skey.patch-1
+#        ftp://ftp.openwall.com/pub/projects/john/contrib/john-1.6-mysql-1.diff
+#        ftp://ftp.openwall.com/pub/projects/john/contrib/john-1.6.31-eggpatch-8.diff.gz
+#
+
+
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~mips ~hppa"
+IUSE="mmx ntlm skey mysql"
+
+RDEPEND="virtual/glibc"
+DEPEND="${RDEPEND}
+	sys-devel/binutils
+	sys-devel/gcc
+	skey? ( app-admin/skey )
+	kerberos? ( dev-libs/openssl )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${DISTDIR}/${MY_P}-gentoo.patch
+}
+
+src_compile() {
+	cd src
+	sed -i -e "s:-march=i486::" -e "s:-Wall -O2:${CFLAGS}:" \
+		Makefile
+	local OPTIONS="EGG=true"
+	use kerberos && OPTIONS="${OPTIONS} KERBEROS=true"
+	use ntlm && OPTIONS="${OPTIONS} NTLM=true"
+	use skey && OPTIONS="${OPTIONS} SKEY=true"
+	use mysql && OPTIONS="${OPTIONS} MYSQL=true"
+
+	if use x86 ; then
+		local K6=is-flag "-march=k6-3" || is-flag "-march=k6-2" || is-flag "-march=k6"
+		if use mmx ; then
+			emake ${OPTIONS} linux-x86-mmx-elf || die "Make failed"
+		elif ${K6} ; then
+			emake ${OPTIONS} linux-x86-k6-elf || die "Make failed"
+		else
+			emake ${OPTIONS} generic || 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"
+	else
+		emake ${OPTIONS} generic || die "Make failed"
+	fi
+
+}
+
+src_install() {
+	insinto /etc
+	doins run/john.ini debian/john-mail.msg debian/john-mail.conf
+	insinto /usr/share/${PN/theripper/}
+	doins run/{all.chr,alpha.chr,digits.chr,lanman.chr,password.lst} \
+		debian/john-dailyscript
+	doman debian/*.1
+	dosbin run/john debian/mailer debian/john-cronjob
+
+	dosym john /usr/sbin/unafs
+	dosym john /usr/sbin/unique
+	dosym john /usr/sbin/unshadow
+
+	# for EGG only
+	dosym john /usr/sbin/undrop
+
+	dodoc debian/{CONFIG.mailer,copyright} doc/*
+}