version bump. depend fix on johntheripper-1.6-r3

6 files changed, 119 insertions, 105 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 4ca8eb6d26dc..75219a646820 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,14 @@
 # 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.12 2004/05/20 03:03:18 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.13 2004/05/22 01:42:11 dragonheart Exp $
+
+*johntheripper-1.6.37 (22 May 2004)
+
+  22 May 2004; Daniel Black <dragonheart@gentoo.org>
+  -johntheripper-1.6-r2.ebuild, johntheripper-1.6-r3.ebuild,
+  +johntheripper-1.6.37.ebuild:
+  version bump to solve bug #44203. johntheripper-1.6-r3 small
+  dependancy fix.
 
 *johntheripper-1.6-r3 (20 May 2004)
 
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6-r2 b/app-crypt/johntheripper/files/digest-johntheripper-1.6-r2
deleted file mode 100644
index 21cf03f5cab9..000000000000
--- a/app-crypt/johntheripper/files/digest-johntheripper-1.6-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 aae782f160041b2bdc624b0a84054e32 john-1.6.tar.gz 497341
-MD5 ec0b4fed7c81d370e85544deab48d03c john_1.6-17.diff.gz 11451
-MD5 8da212c49e452650b1d94984698be670 john-ntlm-patch-v02.tgz 8649
-MD5 8245b5565cf3bf4df38f788f2450d337 john-1.6.krb4.patch-3 20603
-MD5 e8f5a5402d98dd1e604e08bb89ba507e john-1.6-mysql-1.diff 8778
-MD5 53d8caee3f29eebaee7403524fffd2ce john-1.6.skey.patch-1 7433
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6.37 b/app-crypt/johntheripper/files/digest-johntheripper-1.6.37
new file mode 100644
index 000000000000..3db926e21093
--- /dev/null
+++ b/app-crypt/johntheripper/files/digest-johntheripper-1.6.37
@@ -0,0 +1,2 @@
+MD5 9403233b640927295c05b0564ff1f678 john-1.6.37.tar.gz 139372
+MD5 945a200a3b0553c1d6476da3806f4736 john-1.6.37-gentoo.patch 166266
diff --git a/app-crypt/johntheripper/johntheripper-1.6-r2.ebuild b/app-crypt/johntheripper/johntheripper-1.6-r2.ebuild
deleted file mode 100644
index c7a6a75e66e3..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.6-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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-r2.ebuild,v 1.1 2004/05/18 04:09:39 dragonheart Exp $
-
-inherit eutils
-
-MY_P=${P/theripper/}
-S=${WORKDIR}/${MY_P}
-DEBPATCH=${MY_P/-/_}-17.diff
-DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/${PN/theripper/}/"
-SRC_URI="http://www.openwall.com/john/dl/${MY_P}.tar.gz
-	mirror://debian/pool/main/j/${PN/theripper/}/${DEBPATCH}.gz
-	ntlm? ( ftp://ftp.openwall.com/pub/projects/john/contrib/john-ntlm-patch-v02.tgz )
-	kerberos? ( http://www.monkey.org/~dugsong/john-1.6.krb4.patch-3 )
-	skey? ( http://www.monkey.org/~dugsong/john-1.6.skey.patch-1 )"
-
-#	mysql? ( 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-2.8.1.0.15
-	skey? ( app-admin/skey )"
-
-
-src_unpack() {
-	unpack ${A}
-	if use ntlm
-	then
-		if use skey
-		then
-				cd ${WORKDIR}/john-ntlm-patch-v02/
-				epatch ${FILESDIR}/john-ntlm.skey.patch
-		fi
-	fi
-	cd ${S}
-	epatch ${WORKDIR}/${DEBPATCH}
-	cd ${S}/src
-	if use skey
-	then
-		epatch ${DISTDIR}/${MY_P}.skey.patch-1
-	fi
-	cd ${S}
-
-#	use mysql && epatch ${DISTDIR}/${MY_P}-mysql-1.diff
-#	epatch ${WORKDIR}/${MY_P}.31-eggpatch-8.diff
-
-	if use ntlm
-	then
-		mv ${WORKDIR}/john-ntlm-patch-v02/* ${S}/src
-		cd ${S}/src
-		epatch john-ntlm.diff
-		cd ${S}
-	fi
-
-	if use kerberos
-	then
-		epatch ${DISTDIR}/${MY_P}.krb4.patch-3
-	fi
-}
-
-src_compile() {
-	cd src
-	sed -i -e "s:-m486::" -e "s:-Wall -O2:${CFLAGS}:" \
-		Makefile
-	if [ `use mmx` ] ; then
-		emake linux-x86-mmx-elf || die
-	else
-		emake generic || die
-	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
-
-	dodoc debian/{CONFIG.mailer,copyright} doc/*
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.6-r3.ebuild b/app-crypt/johntheripper/johntheripper-1.6-r3.ebuild
index 01e5f063600a..0954d32b24b5 100644
--- a/app-crypt/johntheripper/johntheripper-1.6-r3.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.6-r3.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6-r3.ebuild,v 1.2 2004/05/22 01:42:12 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -28,13 +28,14 @@ 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
+RDEPEND="virtual/glibc
 	skey? ( app-admin/skey )
 	kerberos? ( dev-libs/openssl )"
 
+DEPEND="${RDEPEND}
+	sys-devel/binutils
+	sys-devel/gcc"
+
 src_unpack() {
 	unpack ${A}
 	epatch ${DISTDIR}/${MY_P}-gentoo.patch
diff --git a/app-crypt/johntheripper/johntheripper-1.6.37.ebuild b/app-crypt/johntheripper/johntheripper-1.6.37.ebuild
new file mode 100644
index 000000000000..adf542cd2a06
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.6.37.ebuild
@@ -0,0 +1,102 @@
+# 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.37.ebuild,v 1.1 2004/05/22 01:42:12 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/b/${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"
+
+# use debug && RESTRICT="${RESTRICT} nostrip"
+
+RDEPEND="virtual/glibc
+	skey? ( app-admin/skey )
+	kerberos? ( dev-libs/openssl )"
+
+DEPEND="${RDEPEND}
+	sys-devel/binutils
+	sys-devel/gcc"
+
+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"
+	elif use ppc; then
+		emake ${OPTIONS} linux-ppc  || 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
+	else
+		emake ${OPTIONS} generic || die "Make failed"
+	fi
+
+	#use debug && emake bench
+
+}
+
+src_install() {
+	insinto /etc
+	doins run/john.ini debian/john-mail.msg debian/john-mail.conf
+	insinto /usr/share/${PN/theripper/}
+	doins run/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
+
+	# use debug && dobin src/bench
+
+	dodoc debian/{CONFIG.mailer,copyright} doc/*
+}