fixes to bug #76399 (removed 1.6.37_p1). replaced with 1.6.37_p11 and 1.6.38

(Portage version: 2.0.51.22-r2)

8 files changed, 209 insertions, 142 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 5f0035ff4809..3470234eee5d 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.27 2005/04/21 18:05:17 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.28 2005/08/23 14:04:28 dragonheart Exp $
+
+*johntheripper-1.6.38 (23 Aug 2005)
+*johntheripper-1.6.37_p11 (23 Aug 2005)
+
+  23 Aug 2005; Daniel Black <dragonheart@gentoo.org>
+  -johntheripper-1.6.37_p1.ebuild, +johntheripper-1.6.37_p11.ebuild,
+  +johntheripper-1.6.38.ebuild:
+  fixes to bug #76399 (removed johntheripper-1.6.37_p1). replaced with
+  johntheripper-1.6.37_p11 and johntheripper-1.6.38
 
   21 Apr 2005; Simon Stelling <blubb@gentoo.org>
   johntheripper-1.6.37_p1.ebuild:
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 3be374fa8bd7..d06f4bf9198f 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,9 +1,11 @@
+MD5 1da04b916dc5d18f323ec583c17a7208 metadata.xml 259
+MD5 62771d31029ca00fd10b708b853663ff johntheripper-1.6.37_p11.ebuild 2405
+MD5 dfb8cfe55b695afa3d3fd24deabc7279 johntheripper-1.6.ebuild 1329
 MD5 4fa3f8e98b3b9432ec736692b14bd905 ChangeLog 5195
 MD5 ae1423d50cca4adb720f8019a67ba964 johntheripper-1.6-r3.ebuild 2638
-MD5 12b3b857cd69b82bd20c67c877d30ff6 johntheripper-1.6.37_p1.ebuild 4181
-MD5 dfb8cfe55b695afa3d3fd24deabc7279 johntheripper-1.6.ebuild 1329
-MD5 1da04b916dc5d18f323ec583c17a7208 metadata.xml 259
+MD5 a5f01e46d2d746256a39f13117521893 johntheripper-1.6.38.ebuild 2203
 MD5 2a2c77e0b8b4692a9e20de4d68983071 files/digest-johntheripper-1.6 123
-MD5 c44028343f13bf0e4ff431cca80988d9 files/digest-johntheripper-1.6-r3 126
-MD5 b9df19f7492342330f084ff8454a2e78 files/digest-johntheripper-1.6.37_p1 139
+MD5 b007eb04f5b4d9f7a127277e9736c65d files/digest-johntheripper-1.6.38 63
 MD5 647f92814e453cb358ef2d0df669f026 files/john-ntlm.skey.patch 1168
+MD5 c44028343f13bf0e4ff431cca80988d9 files/digest-johntheripper-1.6-r3 126
+MD5 b3df92253986351db713d914eff2340b files/digest-johntheripper-1.6.37_p11 138
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6.37_p1 b/app-crypt/johntheripper/files/digest-johntheripper-1.6.37_p1
deleted file mode 100644
index 5137c498ec19..000000000000
--- a/app-crypt/johntheripper/files/digest-johntheripper-1.6.37_p1
+++ /dev/null
@@ -1,2 +0,0 @@
-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/files/digest-johntheripper-1.6.37_p11 b/app-crypt/johntheripper/files/digest-johntheripper-1.6.37_p11
new file mode 100644
index 000000000000..1252ecbc488b
--- /dev/null
+++ b/app-crypt/johntheripper/files/digest-johntheripper-1.6.37_p11
@@ -0,0 +1,2 @@
+MD5 9403233b640927295c05b0564ff1f678 john-1.6.37.tar.gz 139372
+MD5 84c0640c2d8a03906dcab08e678044e3 john-1.6.37-bigpatch-11.diff.gz 38521
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6.38 b/app-crypt/johntheripper/files/digest-johntheripper-1.6.38
new file mode 100644
index 000000000000..156a7881a7f7
--- /dev/null
+++ b/app-crypt/johntheripper/files/digest-johntheripper-1.6.38
@@ -0,0 +1 @@
+MD5 cad2877bc4d0e54c3863f5e7d1143fc6 john-1.6.38.tar.gz 151331
diff --git a/app-crypt/johntheripper/johntheripper-1.6.37_p1.ebuild b/app-crypt/johntheripper/johntheripper-1.6.37_p1.ebuild
deleted file mode 100644
index e95586e7583a..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.6.37_p1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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.4 2005/04/21 18:05:17 blubb 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 ppc64"
-
-#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.37_p11.ebuild b/app-crypt/johntheripper/johntheripper-1.6.37_p11.ebuild
new file mode 100644
index 000000000000..f4bf9d4dfd07
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.6.37_p11.ebuild
@@ -0,0 +1,99 @@
+# 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_p11.ebuild,v 1.1 2005/08/23 14:04:28 dragonheart Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_P1=${P/theripper/}
+MY_PBASE=${MY_P1/_p??}
+MY_P=${MY_P1/_p/-bigpatch-}
+S=${WORKDIR}/${MY_PBASE}
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+SRC_URI="http://www.openwall.com/john/b/${MY_PBASE}.tar.gz
+	http://www.cr0.net:8040/misc/${MY_P}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64 ~ppc64 ~mips ~hppa"
+IUSE="mmx"
+
+RDEPEND="virtual/libc"
+
+DEPEND="${RDEPEND}
+	sys-devel/binutils
+	sys-devel/gcc"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${MY_P}.diff || die "patch failed"
+}
+
+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)"
+
+	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() {
+#	cd run
+#	mkdir etc
+#	mkdir lib
+#	ln john.conf etc
+#	cp ${ROOT}/lib/libc.so.? /lib/ld-linux.so.? lib
+#	chroot . john --test
+#}
+
+src_install() {
+	# config files
+	insinto /etc/john
+	doins run/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
+
+	# documentation
+	dodoc doc/*
+}
diff --git a/app-crypt/johntheripper/johntheripper-1.6.38.ebuild b/app-crypt/johntheripper/johntheripper-1.6.38.ebuild
new file mode 100644
index 000000000000..92bbd2debc14
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.6.38.ebuild
@@ -0,0 +1,90 @@
+# 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.38.ebuild,v 1.1 2005/08/23 14:04:28 dragonheart Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_PBASE=${P/theripper/}
+S=${WORKDIR}/${MY_PBASE}
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+SRC_URI="http://www.openwall.com/john/b/${MY_PBASE}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64 ~ppc64 ~mips ~hppa"
+IUSE="mmx"
+
+RDEPEND="virtual/libc"
+
+DEPEND="${RDEPEND}"
+
+
+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)"
+
+	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() {
+#	cd run
+#	mkdir etc
+#	mkdir lib
+#	ln john.conf etc
+#	cp ${ROOT}/lib/libc.so.? /lib/ld-linux.so.? lib
+#	chroot . john --test
+#}
+
+src_install() {
+	# config files
+	insinto /etc/john
+	doins run/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
+
+	# documentation
+	dodoc doc/*
+}