Version bump removes old version. New _p1 version contains new patches and fixes bug #59195 (by Benoit Izac <benoit.izac@free.fr>) and bug #56528 (Alexander Holler <aholler@gentoo.de>)

10 files changed, 157 insertions, 207 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 471c15231bbe..35239ebc7b52 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/johntheripper
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.22 2004/11/28 19:05:56 blubb Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.23 2005/01/01 06:53:20 dragonheart Exp $
+
+*johntheripper-1.6.37_p1 (01 Jan 2005)
+
+  01 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  -johntheripper-1.6-r1.ebuild, -johntheripper-1.6.37-r1.ebuild,
+  +johntheripper-1.6.37_p1.ebuild:
+  Version bump removes old version. New _p1 version contains new patches and
+  fixes bug #59195 (by Benoit Izac <benoit.izac@free.fr>) and bug #56528
+  (Alexander Holler <aholler@gentoo.de>)
 
   28 Nov 2004; Simon Stelling <blubb@gentoo.org>
   johntheripper-1.6.37-r1.ebuild:
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 9e7fe0b190fe..a1745ace3e9d 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,11 +1,9 @@
-MD5 8dded87eb89e8a9d27cadca3db21c5dd ChangeLog 4481
-MD5 0d6d4c0350fc9c755eb97bd83c28e6cf johntheripper-1.6-r1.ebuild 2088
-MD5 6118ccbd118b5fc883571f45567064a9 johntheripper-1.6-r3.ebuild 2632
-MD5 317d788f32e60e6404fab32818c6e23d johntheripper-1.6.37-r1.ebuild 3121
-MD5 21db1d2955c07704e9dbcca4ab1b4a17 johntheripper-1.6.ebuild 1326
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 a60e23d6ec3b4a3482aac3847bf315cb johntheripper-1.6.ebuild 1326
+MD5 5730f80ea0d90dbb561c5dc68d297226 ChangeLog 4866
+MD5 9cdb0b06a9f931a998ea9608533b5b95 johntheripper-1.6-r3.ebuild 2632
+MD5 ec90d80d73ca850b72139fd150d7b04b johntheripper-1.6.37_p1.ebuild 4176
 MD5 2a2c77e0b8b4692a9e20de4d68983071 files/digest-johntheripper-1.6 123
-MD5 d2a0df18590c71836e4c423af635353f files/digest-johntheripper-1.6-r1 456
-MD5 c44028343f13bf0e4ff431cca80988d9 files/digest-johntheripper-1.6-r3 126
-MD5 61846869257f883217c0a2afea16acb4 files/digest-johntheripper-1.6.37-r1 138
+MD5 b9df19f7492342330f084ff8454a2e78 files/digest-johntheripper-1.6.37_p1 139
 MD5 647f92814e453cb358ef2d0df669f026 files/john-ntlm.skey.patch 1168
+MD5 c44028343f13bf0e4ff431cca80988d9 files/digest-johntheripper-1.6-r3 126
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6-r1 b/app-crypt/johntheripper/files/digest-johntheripper-1.6-r1
deleted file mode 100644
index f23c52523aeb..000000000000
--- a/app-crypt/johntheripper/files/digest-johntheripper-1.6-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 aae782f160041b2bdc624b0a84054e32 john-1.6.tar.gz 497341
-MD5 ec0b4fed7c81d370e85544deab48d03c john_1.6-17.diff.gz 11451
-MD5 e8f5a5402d98dd1e604e08bb89ba507e john-1.6-mysql-1.diff 8778
-MD5 8da212c49e452650b1d94984698be670 john-ntlm-patch-v02.tgz 8649
-MD5 8245b5565cf3bf4df38f788f2450d337 john-1.6.krb4.patch-3 20603
-MD5 53d8caee3f29eebaee7403524fffd2ce john-1.6.skey.patch-1 7433
-MD5 6078b01600c807ee2f1700e8e39c594d john-1.6.31-eggpatch-8.diff.gz 18715
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6.37-r1 b/app-crypt/johntheripper/files/digest-johntheripper-1.6.37-r1
deleted file mode 100644
index 0ccd560f2d2f..000000000000
--- a/app-crypt/johntheripper/files/digest-johntheripper-1.6.37-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9403233b640927295c05b0564ff1f678 john-1.6.37.tar.gz 139372
-MD5 5bb593aad5c61adc79d440adc9159c31 john-1.6.37-r1-gentoo.patch.bz2 47172
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6.37_p1 b/app-crypt/johntheripper/files/digest-johntheripper-1.6.37_p1
new file mode 100644
index 000000000000..5137c498ec19
--- /dev/null
+++ b/app-crypt/johntheripper/files/digest-johntheripper-1.6.37_p1
@@ -0,0 +1,2 @@
+MD5 9403233b640927295c05b0564ff1f678 john-1.6.37.tar.gz 139372
+MD5 06ac874b2e63568b067272f29452bd7e john-1.6.37_p1-gentoo.patch.bz2 373501
diff --git a/app-crypt/johntheripper/johntheripper-1.6-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.6-r1.ebuild
deleted file mode 100644
index 2ac5d857bd89..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.6-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6-r1.ebuild,v 1.10 2004/06/29 20:05:48 agriffis 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
-	mysql? ( ftp://ftp.openwall.com/pub/projects/john/contrib/john-1.6-mysql-1.diff )
-	samba? ( 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 )
-	http://www.monkey.org/~dugsong/john-1.6.skey.patch-1
-	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="kerberos mmx mysql samba"
-
-DEPEND=">=sys-devel/binutils-2.8.1.0.15
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${WORKDIR}/${DEBPATCH}
-	cd ${S}/src
-	epatch ${DISTDIR}/${MY_P}.skey.patch-1
-	cd ${S}
-#	use mysql && epatch ${DISTDIR}/${MY_P}-mysql-1.diff
-
-	if use samba
-	then
-		mv ${WORKDIR}/john-ntlm-patch-v02/* ${S}/src
-		cd ${S}/src
-		epatch john-ntlm.diff
-		cd ${S}
-	fi
-
-	epatch ${WORKDIR}/${MY_P}.31-eggpatch-8.diff
-	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 88785bee689f..d7c145f0cbba 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 Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # 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.6 2004/09/19 15:33:49 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6-r3.ebuild,v 1.7 2005/01/01 06:53:20 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/app-crypt/johntheripper/johntheripper-1.6.37-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.6.37-r1.ebuild
deleted file mode 100644
index e42fc94a3153..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.6.37-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6.37-r1.ebuild,v 1.7 2004/11/28 19:05:56 blubb 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/${PF/theripper/}-gentoo.patch.bz2"
-
-#
-# 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
-#
-
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ppc ~alpha ~amd64"
-#KEYWORDS removed until "generic" target is fixed - "~mips ~hppa"
-IUSE="mmx ntlm skey mysql kerberos"
-
-RDEPEND="virtual/libc
-	skey? ( app-admin/skey )
-	kerberos? ( dev-libs/openssl )"
-
-DEPEND="${RDEPEND}
-	sys-devel/binutils
-	sys-devel/gcc
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${PF/theripper/}-gentoo.patch
-}
-
-src_compile() {
-	cd src
-	sed -i -e "s:^\(CFLAGS =.*\):\1 ${CFLAGS}:" \
-		Makefile
-
-	sed -i -e 's:^#define CFG_ALT_NAME.*:#define CFG_ALT_NAME "/etc/john.ini":' \
-	-e 's:^#define WORDLIST_NAME.*:#define WORDLIST_NAME "/usr/share/john/password.lst":' \
-	params.h
-
-	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
-		if use mmx ; then
-			emake ${OPTIONS} linux-x86-mmx-elf || die "Make failed"
-		elif is-flag "-march=k6-3" || is-flag "-march=k6-2" \
-			|| is-flag "-march=k6"; then
-			emake ${OPTIONS} linux-x86-k6-elf || die "Make failed"
-		else
-			emake ${OPTIONS} linux-x86-any-elf || 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/*
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.6.37_p1.ebuild b/app-crypt/johntheripper/johntheripper-1.6.37_p1.ebuild
new file mode 100644
index 000000000000..25b75a16ef2c
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.6.37_p1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6.37_p1.ebuild,v 1.1 2005/01/01 06:53:20 dragonheart Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_P1=${P/theripper/}
+MY_P=${MY_P1/_p?/}
+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_P1}-gentoo.patch.bz2"
+
+#
+# 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-1.6.37-apache-md5v01.diff.gz'
+#'ftp://ftp.openwall.com/pub/projects/john/contrib/john-1.6.37-eggpatch-11.diff.gz'
+#'ftp://ftp.openwall.com/pub/projects/john/contrib/john-1.6.37-krb5-1.diff.gz'
+#'ftp://ftp.openwall.com/pub/projects/john/contrib/john-1.6.37-macosx-ppc-altivec-1.diff.gz'
+#'ftp://ftp.openwall.com/pub/projects/john/contrib/john-1.6.37-mysql-1.diff.gz'
+#'ftp://ftp.openwall.com/pub/projects/john/contrib/john-1.6.37-nsldap-2.diff.gz'
+#'ftp://ftp.openwall.com/pub/projects/john/contrib/john-1.6.37-raw-md5-1.diff.gz'
+#'ftp://ftp.openwall.com/pub/projects/john/contrib/john-1.6-nsldaps4.diff.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
+#
+
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ppc ~alpha ~amd64"
+
+#KEYWORDS removed until "generic" target is fixed - "~mips ~hppa"
+IUSE="mmx ntlm skey mysql krb4 kerberos"
+
+# ldap - removed as it causes segfault when running
+
+RDEPEND="virtual/libc
+	skey? ( app-admin/skey )
+	kerberos? ( dev-libs/openssl )"
+
+DEPEND="${RDEPEND}
+	sys-devel/binutils
+	sys-devel/gcc"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${DISTDIR}/${MY_P1}-gentoo.patch.bz2 || die "patch failed"
+}
+
+src_compile() {
+	cd src
+	# Note this program uses AS and LD incorrectly
+	local OPTIONS="CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC)"
+	OPTIONS="${OPTIONS} EGG=true RAWMD5=true APACHE=true"
+	use kerberos && OPTIONS="${OPTIONS} KERBEROS5=true"
+	use krb4 && OPTIONS="${OPTIONS} KERBEROS4=true"
+	use ntlm && OPTIONS="${OPTIONS} NTLM=true"
+	use skey && OPTIONS="${OPTIONS} SKEY=true"
+	use mysql && OPTIONS="${OPTIONS} MYSQL=true"
+	# ldap broken - segfaults in selftest
+	# use ldap && OPTIONS="${OPTIONS} LDAP=true"
+
+	if use x86 ; then
+		if use mmx ; then
+			emake ${OPTIONS} linux-x86-mmx-elf || die "Make failed"
+		elif is-flag "-march=k6-3" || is-flag "-march=k6-2" \
+			|| is-flag "-march=k6"; then
+			emake ${OPTIONS} linux-x86-k6-elf || die "Make failed"
+		else
+			emake ${OPTIONS} linux-x86-any-elf || 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
+	elif use ppc-macos; then
+		emake ${OPTIONS} macosx-ppc-altivec-cc || die "Make failed"
+		#emake ${OPTIONS} macosx-ppc-cc || die "Make failed"
+	else
+		emake ${OPTIONS} generic || die "Make failed"
+	fi
+
+	# currently broken
+	#emake bench || die "make failed"
+}
+
+
+src_test() {
+	einfo "S/KEY and Kerberos 4 known to fail selftest"
+	run/john --test
+}
+
+src_install() {
+	# config files
+	insinto /etc
+	doins run/john.conf debian/john-mail.msg debian/john-mail.conf
+
+	# shared fies
+	insinto /usr/share/john
+	doins run/password.lst \
+		debian/john-dailyscript \
+		run/all.chr run/alpha.chr run/digits.chr run/lanman.chr
+
+	# Man pages
+	doman debian/*.1
+
+	# executables
+	dosbin run/john debian/john-cronjob debian/john-dailyscript
+	newsbin debian/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
+
+	# documentation
+	dodoc debian/CONFIG.mailer doc/*
+}
diff --git a/app-crypt/johntheripper/johntheripper-1.6.ebuild b/app-crypt/johntheripper/johntheripper-1.6.ebuild
index e669a5b95d69..7b9cbe6b9b5d 100644
--- a/app-crypt/johntheripper/johntheripper-1.6.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6.ebuild,v 1.23 2004/06/29 20:05:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6.ebuild,v 1.24 2005/01/01 06:53:20 dragonheart Exp $
 
 inherit eutils