fixed support for ntlm. mysql dropped due to patching conficts.

6 files changed, 163 insertions, 3 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 1a06305a0bb4..cf05b6df33a3 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/johntheripper
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.10 2003/10/01 19:50:48 taviso Exp $
+# 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 $
+
+*johntheripper-1.6-r2 (18 May 2004)
+
+  18 May 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/john-ntlm.skey.patch, +johntheripper-1.6-r2.ebuild
+  +metadata.xml:
+  fixes thanks to Ghislain Bourgeois ghislain48@hotmail.com in bug #49988.
+  All patches are patching the same area of code. mysql dropped due
+  conficts with other patches.
 
   01 Oct 2003; Tavis Ormandy <taviso@gentoo.org> johntheripper-1.6.ebuild:
   Stable on alpha
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index c17117277778..a5f5f1995420 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,5 +1,9 @@
-MD5 e7a4ef919aa0f19bf44621d06d484ea5 ChangeLog 2279
+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
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6-r2 b/app-crypt/johntheripper/files/digest-johntheripper-1.6-r2
new file mode 100644
index 000000000000..21cf03f5cab9
--- /dev/null
+++ b/app-crypt/johntheripper/files/digest-johntheripper-1.6-r2
@@ -0,0 +1,6 @@
+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/john-ntlm.skey.patch b/app-crypt/johntheripper/files/john-ntlm.skey.patch
new file mode 100644
index 000000000000..19bd8e28aa33
--- /dev/null
+++ b/app-crypt/johntheripper/files/john-ntlm.skey.patch
@@ -0,0 +1,39 @@
+--- john-ntlm.diff	2004-05-17 22:05:37.286395208 -0400
++++ john-ntlm.diff2	2004-05-17 22:04:48.162863120 -0400
+@@ -1,10 +1,11 @@
+ diff -u clean-src/Makefile src/Makefile
+ --- clean-src/Makefile	Mon Oct 22 13:00:23 2001
+ +++ src/Makefile	Mon Jun 10 15:34:36 2002
+-@@ -37,6 +37,8 @@
++@@ -37,7 +37,9 @@
+  	BF_fmt.o BF_std.o \
+  	AFS_fmt.o \
+  	LM_fmt.o \
++	SKEY_fmt.o \
+ +	NT_fmt.o \
+ +	md4.o smbencrypt.o \
+  	batch.o bench.o charset.o common.o compiler.o config.o cracker.o \
+@@ -13,19 +14,21 @@
+ diff -u clean-src/john.c src/john.c
+ --- clean-src/john.c	Tue May  8 02:59:28 2001
+ +++ src/john.c	Mon Jun 10 15:34:36 2002
+-@@ -36,7 +36,7 @@
++@@ -36,8 +36,8 @@
+  #endif
+  
+  extern struct fmt_main fmt_DES, fmt_BSDI, fmt_MD5, fmt_BF;
+ -extern struct fmt_main fmt_AFS, fmt_LM;
+ +extern struct fmt_main fmt_AFS, fmt_LM, fmt_NT;
++ extern struct fmt_main fmt_SKEY;
+  
+  extern int unshadow(int argc, char **argv);
+  extern int unafs(int argc, char **argv);
+-@@ -63,6 +63,7 @@
++@@ -64,7 +64,8 @@
+  	john_register_one(&fmt_BF);
+  	john_register_one(&fmt_AFS);
+  	john_register_one(&fmt_LM);
++	john_register_one(&fmt_SKEY);
+ +	john_register_one(&fmt_NT);
+  
+  	if (!fmt_list) {
diff --git a/app-crypt/johntheripper/johntheripper-1.6-r2.ebuild b/app-crypt/johntheripper/johntheripper-1.6-r2.ebuild
new file mode 100644
index 000000000000..c7a6a75e66e3
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.6-r2.ebuild
@@ -0,0 +1,93 @@
+# 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/metadata.xml b/app-crypt/johntheripper/metadata.xml
new file mode 100644
index 000000000000..d8b96be3c5cd
--- /dev/null
+++ b/app-crypt/johntheripper/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>bug-wranglers@gentoo.org</email>
+		<description>This package lacks a primary herd or maintainer.</description>
+	</maintainer>
+</pkgmetadata>