johntheripper-1.6-r3 - fixed a few things. Added johntheripper-1.6.40 - bug #116706 still masked due to unidentified TEXTREL. Removed other unstable versions - bug #114677

(Portage version: 2.1_pre3-r1)

10 files changed, 177 insertions, 206 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index bd8941b5cddf..8e108101dd1f 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.32 2006/01/06 12:25:51 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.33 2006/01/07 11:24:14 dragonheart Exp $
+
+*johntheripper-1.6.40 (07 Jan 2006)
+
+  07 Jan 2006; Daniel Black <dragonheart@gentoo.org>
+  johntheripper-1.6-r3.ebuild, -johntheripper-1.6.37_p11.ebuild,
+  -johntheripper-1.6.38.ebuild, +johntheripper-1.6.40.ebuild:
+  johntheripper-1.6-r3 - fixed executable stack. Fixed bad k6 logic. Added
+  selftest. Removed nonuser CFLAG usage (-finline-functions -funroll-loops).
+  Added johntheripper-1.6.40 - bug #116706 thanks to Michael Gaber. 1.6.40 is
+  still masked due to unidentified TEXTREL. Removed other unstable versions as
+  insufficient files were installed - bug #114677 thanks to Matthias Bethke
 
   06 Jan 2006; Fabian Groffen <grobian@gentoo.org>
   johntheripper-1.6.38.ebuild:
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 0d8e51ed510d..08a31cb88bb8 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,11 +1,9 @@
-MD5 0c4cbd4e5b8ebb91bf48eaea23aaa69f johntheripper-1.6-r3.ebuild 2643
-MD5 627ea8b517a40b86c7ff58c326a15c5c johntheripper-1.6.38.ebuild 2124
-MD5 dfb8cfe55b695afa3d3fd24deabc7279 johntheripper-1.6.ebuild 1329
-MD5 47f5a4e19f2bcb5e25dda3ced7e7239f johntheripper-1.6.37_p11.ebuild 2412
 MD5 86aca1949f86362735e5164b32e7e917 ChangeLog 6174
-MD5 1da04b916dc5d18f323ec583c17a7208 metadata.xml 259
-MD5 b007eb04f5b4d9f7a127277e9736c65d files/digest-johntheripper-1.6.38 63
-MD5 c44028343f13bf0e4ff431cca80988d9 files/digest-johntheripper-1.6-r3 126
-MD5 647f92814e453cb358ef2d0df669f026 files/john-ntlm.skey.patch 1168
-MD5 b3df92253986351db713d914eff2340b files/digest-johntheripper-1.6.37_p11 138
 MD5 2a2c77e0b8b4692a9e20de4d68983071 files/digest-johntheripper-1.6 123
+MD5 dd34c8d2b730b0a8ae9eec5582698fc2 files/digest-johntheripper-1.6-r3 126
+MD5 d9ceb6148f478e763e8e358aa324e71a files/digest-johntheripper-1.6.40 152
+MD5 647f92814e453cb358ef2d0df669f026 files/john-ntlm.skey.patch 1168
+MD5 8d39284613d4e85a6dfedc85b39d5780 johntheripper-1.6-r3.ebuild 3045
+MD5 6f169ec0e8b5a9b7e97591f024db13e8 johntheripper-1.6.40.ebuild 3332
+MD5 dfb8cfe55b695afa3d3fd24deabc7279 johntheripper-1.6.ebuild 1329
+MD5 1da04b916dc5d18f323ec583c17a7208 metadata.xml 259
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6-r3 b/app-crypt/johntheripper/files/digest-johntheripper-1.6-r3
index 991a52bb4768..161684a3ec1a 100644
--- a/app-crypt/johntheripper/files/digest-johntheripper-1.6-r3
+++ b/app-crypt/johntheripper/files/digest-johntheripper-1.6-r3
@@ -1,2 +1,2 @@
-MD5 aae782f160041b2bdc624b0a84054e32 john-1.6.tar.gz 497341
 MD5 17f827dd86f7c7254fceb48f31390c24 john-1.6-gentoo.patch 156681
+MD5 aae782f160041b2bdc624b0a84054e32 john-1.6.tar.gz 497341
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6.37_p11 b/app-crypt/johntheripper/files/digest-johntheripper-1.6.37_p11
deleted file mode 100644
index 1252ecbc488b..000000000000
--- a/app-crypt/johntheripper/files/digest-johntheripper-1.6.37_p11
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 156a7881a7f7..000000000000
--- a/app-crypt/johntheripper/files/digest-johntheripper-1.6.38
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cad2877bc4d0e54c3863f5e7d1143fc6 john-1.6.38.tar.gz 151331
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6.40 b/app-crypt/johntheripper/files/digest-johntheripper-1.6.40
new file mode 100644
index 000000000000..2373d8b83a03
--- /dev/null
+++ b/app-crypt/johntheripper/files/digest-johntheripper-1.6.40
@@ -0,0 +1,2 @@
+MD5 e707f3708e5741bb470b2dc8129cb901 john-1.6.40-banquise-to-bigpatch-17.patch.bz2 58732
+MD5 507916220812c5834136d378a13e48a0 john-1.6.40.tar.gz 797220
diff --git a/app-crypt/johntheripper/johntheripper-1.6-r3.ebuild b/app-crypt/johntheripper/johntheripper-1.6-r3.ebuild
index 41a67c824e73..4891026e5f0d 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-2005 Gentoo Foundation
+# Copyright 1999-2006 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.10 2005/09/20 15:01:22 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6-r3.ebuild,v 1.11 2006/01/07 11:24:14 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -39,23 +39,38 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	epatch "${DISTDIR}/${MY_P}-gentoo.patch"
+	cd ${S}/src
+	for file in  alpha.S  sparc.S  x86.S; do
+		cat <<EOF >> ${file}
+#ifdef __ELF__
+.section .note.GNU-stack,"",@progbits
+#endif
+EOF
+
+	done
 }
 
 src_compile() {
 	cd src
-	sed -i -e "s:-march=i486::" -e "s:-Wall -O2:${CFLAGS}:" \
+	sed -i -e "s:-march=i486::" -e "s:-O2:${CFLAGS}:" \
 		Makefile
-	local OPTIONS="EGG=true"
+	local OPTIONS="OPT_NORMAL= OPT_INLINE=  EGG=true"
+	#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 mysql;
+	then
+		OPTIONS="${OPTIONS} MYSQL=true"
+		# bug #106652 thanks to Rutger
+		append-ldflags -lm
+	fi
 
 	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
+		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} generic || die "Make failed"
@@ -69,6 +84,15 @@ src_compile() {
 	fi
 
 }
+src_test() {
+	cd run
+	if  [[ -f /etc/john.ini  ]]
+	then
+		./john --test || die 'self test failed'
+	else
+		ewarn "selftest requires /etc/john.ini"
+	fi
+}
 
 src_install() {
 	insinto /etc
diff --git a/app-crypt/johntheripper/johntheripper-1.6.37_p11.ebuild b/app-crypt/johntheripper/johntheripper-1.6.37_p11.ebuild
deleted file mode 100644
index f4bf9d4dfd07..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.6.37_p11.ebuild
+++ /dev/null
@@ -1,99 +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_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
deleted file mode 100644
index 22d229bf4800..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.6.38.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2006 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.4 2006/01/06 12:25:51 grobian 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/c/${MY_PBASE}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-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 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-ppc32-altivec-cc || die "Make failed"
-		# for Tiger this can be macosx-ppc64-cc
-	elif use ppc; then
-		emake ${OPTIONS} linux-ppc  || die "Make failed"
-	else
-		emake ${OPTIONS} generic || die "Make failed"
-	fi
-
-	# currently broken
-	#emake bench || die "make failed"
-}
-
-
-src_test() {
-	cd run
-	./john --test || die 'self test failed'
-}
-
-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.40.ebuild b/app-crypt/johntheripper/johntheripper-1.6.40.ebuild
new file mode 100644
index 000000000000..cc53151755f2
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.6.40.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6.40.ebuild,v 1.1 2006/01/07 11:24:14 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/ http://www.banquise.net/misc/patch-john.html"
+SRC_URI="http://www.openwall.com/john/c/${MY_PBASE}.tar.gz
+		mirror://gentoo/${MY_PBASE}-banquise-to-bigpatch-17.patch.bz2"
+
+# banquise-to-bigpatch-17.patch.bz2"
+# based off /var/tmp/portage/johntheripper-1.6.40
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE="mmx sse2 altivec"
+
+RDEPEND="virtual/libc"
+
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${MY_PBASE}-banquise-to-bigpatch-17.patch
+	sed -i -e "s|^CFLAGS.*|CFLAGS= -c -Wall ${CFLAGS}|" "${MY_PBASE}"/src/Makefile
+}
+
+
+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) \
+		OPT_NORMAL= OPT_INLINE= JOHN_SYSTEMWIDE=1"
+
+	if use x86 ; then
+		if use sse2 ; then
+			emake ${OPTIONS} linux-x86-sse2 || die "Make failed"
+		elif use mmx ; then
+			emake ${OPTIONS} linux-x86-mmx || die "Make failed"
+		else
+			emake ${OPTIONS} linux-x86-any || 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 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
+		if use altivec; then
+			emake ${OPTIONS} macosx-ppc32-altivec || die "Make failed"
+		else
+			emake ${OPTIONS} macosx-ppc32 || die "Make failed"
+		fi
+		# for Tiger this can be macosx-ppc64
+	elif use ppc64; then
+		if use altivec; then
+			emake ${OPTIONS} linux-ppc32-altivec  || die "Make failed"	
+		else
+			emake ${OPTIONS} linux-ppc64  || die "Make failed"
+		fi
+		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
+		# as per the Makefile comments
+	elif use ppc; then
+		if use altivec; then
+			emake ${OPTIONS} linux-ppc32-altivec:  || die "Make failed"
+		else
+			emake ${OPTIONS} linux-ppc32 || die "Make failed"
+		fi
+	else
+		emake ${OPTIONS} generic || die "Make failed"
+	fi
+
+	# currently broken
+	#emake bench || die "make failed"
+}
+
+
+src_test() {
+	cd run
+	if  [[ -f /etc/john/john.conf || -f /etc/john/john.ini  ]]
+	then
+		./john --test || die 'self test failed'
+	else
+		ewarn "selftest requires /etc/john/john.conf or /etc/john/john.ini"
+	fi
+	ewarn "WPA PSK failes on MMX and SSE2 - see"
+	ewarn "http://www.banquise.net/misc/patch-john.html"
+}
+
+src_install() {
+	# config files
+	insinto /etc/john
+	doins run/john.conf
+	sed -i -e 's:$JOHN:/usr/share/john:g' "${D}/etc/john/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
+
+	# share
+	insinto /usr/share/john/
+	doins run/*.chr run/password.lst
+
+	# documentation
+	dodoc doc/*
+}