Taking maintainership. Version bump. Fixing #132844 (thanks Alex Efros <powerman-asdf at yandex.ru>), #136719 (thanks to jakub), #140468 (thanks to Max Dilay <max.dilay at gmail.com>).

(Portage version: 2.1.1_pre4-r2)

8 files changed, 280 insertions, 3 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 9894cd76a37d..fb6e13f9e24c 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,18 @@
 # 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.40 2006/06/15 15:12:07 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.41 2006/08/04 07:49:09 phreak Exp $
+
+*johntheripper-1.7.2 (04 Aug 2006)
+
+  04 Aug 2006; Christian Heim <phreak@gentoo.org>
+  +files/johntheripper-1.7.2-params.h.patch,
+  +files/johntheripper-1.7.2-sha1-memset.patch,
+  +files/johntheripper-1.7.2-stackdef.S.patch,
+  +files/johntheripper-1.7.2-stripping.patch, metadata.xml,
+  +johntheripper-1.7.2.ebuild:
+  Taking maintainership. Version bump. Fixing #132844 (thanks Alex Efros
+  <powerman-asdf at yandex.ru>), #136719 (thanks to jakub), #140468 (thanks to
+  Max Dilay <max.dilay at gmail.com>).
 
   15 Jun 2006; Pieter Van den Abeele <pvdabeel@gentoo.org>
   Typo in this one too.
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.7.2 b/app-crypt/johntheripper/files/digest-johntheripper-1.7.2
new file mode 100644
index 000000000000..a90f5138c57f
--- /dev/null
+++ b/app-crypt/johntheripper/files/digest-johntheripper-1.7.2
@@ -0,0 +1,6 @@
+MD5 4429722ba242a5a33ca8ebf45fd42797 john-1.7-all-4.diff.gz 50311
+RMD160 eafed1e75d72beef62664b238adf38ec6e6d4c52 john-1.7-all-4.diff.gz 50311
+SHA256 cb51be6cb03e952a21ea1a85e60253b932c946959b62f8082665ac2c7a792909 john-1.7-all-4.diff.gz 50311
+MD5 78a0294fba77ebd63bdb39837df917c8 john-1.7.2.tar.gz 809308
+RMD160 8ab90216401cf5cda7ba50a8bb88f53678e35eac john-1.7.2.tar.gz 809308
+SHA256 9a94d2417b13d49cb11aeb11186933fe0e0491904987ca47c88bf5710935c3cb john-1.7.2.tar.gz 809308
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.2-params.h.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-params.h.patch
new file mode 100644
index 000000000000..04d22015e8a8
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.2-params.h.patch
@@ -0,0 +1,15 @@
+Index: john-1.7.2/src/params.h
+===================================================================
+--- john-1.7.2.orig/src/params.h
++++ john-1.7.2/src/params.h
+@@ -101,8 +101,8 @@
+ /*
+  * File names.
+  */
+-#define CFG_FULL_NAME			"$JOHN/john.conf"
+-#define CFG_ALT_NAME			"$JOHN/john.ini"
++#define CFG_FULL_NAME			"/etc/john/john.conf"
++#define CFG_ALT_NAME			"/etc/john/john.ini"
+ #if JOHN_SYSTEMWIDE
+ #define CFG_PRIVATE_FULL_NAME		JOHN_PRIVATE_HOME "/john.conf"
+ #define CFG_PRIVATE_ALT_NAME		JOHN_PRIVATE_HOME "/john.ini"
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.2-sha1-memset.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-sha1-memset.patch
new file mode 100644
index 000000000000..a713deffffe5
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.2-sha1-memset.patch
@@ -0,0 +1,13 @@
+Index: src/rawSHA1_fmt.c
+===================================================================
+--- src.orig/rawSHA1_fmt.c
++++ src/rawSHA1_fmt.c
+@@ -100,7 +100,7 @@ static void rawsha1_set_key(char *key, i
+ 	if(index==0)
+ 	{
+ 		total_len = 0;
+-		memset(saved_key, 0, PLAINTEXT_LENGTH*MMX_COEF);
++		memset(saved_key, 0, sizeof(saved_key));
+ 	}
+ 	len = strlen(key);
+ 	if(len>PLAINTEXT_LENGTH)
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef.S.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef.S.patch
new file mode 100644
index 000000000000..e1ed5ae06812
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef.S.patch
@@ -0,0 +1,72 @@
+Index: john-1.7.2/src/alpha.S
+===================================================================
+--- john-1.7.2.orig/src/alpha.S
++++ john-1.7.2/src/alpha.S
+@@ -318,3 +318,7 @@ DES_KS_current:
+ .space 128
+ 
+ .comm DES_KS_table, (8 * 128 * 16 * 8), 128
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+Index: john-1.7.2/src/sparc.S
+===================================================================
+--- john-1.7.2.orig/src/sparc.S
++++ john-1.7.2/src/sparc.S
+@@ -410,3 +410,7 @@ DES_count:
+ .common DES_KS_table, (8 * 128 * 16 * 8), 32
+ 
+ #endif
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+Index: john-1.7.2/src/x86-64.S
+===================================================================
+--- john-1.7.2.orig/src/x86-64.S
++++ john-1.7.2/src/x86-64.S
+@@ -1040,3 +1040,7 @@ DES_bs_crypt_LM_loop:
+ 	subl $1,rounds
+ 	jnz DES_bs_crypt_LM_loop
+ 	ret
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+Index: john-1.7.2/src/x86-mmx.S
+===================================================================
+--- john-1.7.2.orig/src/x86-mmx.S
++++ john-1.7.2/src/x86-mmx.S
+@@ -1302,3 +1302,7 @@ DES_bs_crypt_LM_loop:
+ 	emms
+ #endif
+ 	ret
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+Index: john-1.7.2/src/x86-sse.S
+===================================================================
+--- john-1.7.2.orig/src/x86-sse.S
++++ john-1.7.2/src/x86-sse.S
+@@ -1289,3 +1289,7 @@ DES_bs_crypt_LM_loop:
+ 	jnz DES_bs_crypt_LM_loop
+ 	popl %esi
+ 	ret
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+Index: john-1.7.2/src/x86.S
+===================================================================
+--- john-1.7.2.orig/src/x86.S
++++ john-1.7.2/src/x86.S
+@@ -1362,3 +1362,7 @@ CPU_detect_ret:
+ 	movzbl %al,%eax
+ 	popl %ebx
+ 	ret
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.2-stripping.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-stripping.patch
new file mode 100644
index 000000000000..8c1afb19eec9
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.2-stripping.patch
@@ -0,0 +1,28 @@
+Index: john-1.7.2/src/Makefile
+===================================================================
+--- john-1.7.2.orig/src/Makefile
++++ john-1.7.2/src/Makefile
+@@ -718,23 +718,18 @@ john.com: john.asm
+ 
+ ../run/john.exe: $(JOHN_OBJS)
+ 	$(LD) $(JOHN_OBJS) -lkernel32 -o ../run/john.exe
+-	strip ../run/john.exe
+ 
+ ../run/unshadow.exe: symlink.c
+ 	$(CC) symlink.c -o ../run/unshadow.exe
+-	strip ../run/unshadow.exe
+ 
+ ../run/unafs.exe: symlink.c
+ 	$(CC) symlink.c -o ../run/unafs.exe
+-	strip ../run/unafs.exe
+ 
+ ../run/undrop.exe: symlink.c
+ 	$(CC) symlink.c -o ../run/undrop.exe
+-	strip ../run/undrop.exe
+ 
+ ../run/unique.exe: symlink.c
+ 	$(CC) symlink.c -o ../run/unique.exe
+-	strip ../run/unique.exe
+ 
+ # Inlining the S-boxes produces faster code, as long as they fit in the cache
+ # (that is, on RISC with at least 8 KB of L1 code cache).
diff --git a/app-crypt/johntheripper/johntheripper-1.7.2.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2.ebuild
new file mode 100644
index 000000000000..3aed4eb5a116
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.2.ebuild
@@ -0,0 +1,131 @@
+# 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.7.2.ebuild,v 1.1 2006/08/04 07:49:09 phreak Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_PBASE=${P/theripper/}
+MY_PNBASE=${PN/theripper/}
+S=${WORKDIR}/${MY_PBASE}
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+SRC_URI="http://www.openwall.com/john/f/${MY_PBASE}.tar.gz
+		http://www.openwall.com/john/contrib/${MY_PNBASE}-1.7-all-4.diff.gz"
+
+# 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 altivec"
+
+RDEPEND="virtual/libc
+	>=dev-libs/openssl-0.9.7"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${DISTDIR}"/${MY_PNBASE}-1.7-all-4.diff.gz
+	epatch "${FILESDIR}"/${P}-*.patch
+
+	ebegin "Applying ${P}-Makefile.patch"
+	sed -i -e "s|^CFLAGS.*|CFLAGS= -c -Wall ${CFLAGS}|" \
+		-e 's|^LDFLAGS.*|LDFLAGS= -lm|' "${S}"/src/Makefile
+	eend $?
+
+	ebegin "Applying ${P}-john.conf.patch"
+	sed -i -e 's:$JOHN:/usr/share/john:g' "${S}"/run/john.conf
+	eend $?
+}
+
+
+src_compile() {
+	cd "${S}"/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
+		CFG_FULL_NAME=/etc/john/john.conf
+		CFG_ALT_NAME=/etc/john/john.ini"
+
+	if use x86 ; then
+		if 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
+}
+
+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
+
+	# share
+	insinto /usr/share/john/
+	doins run/*.chr run/password.lst
+
+	# documentation
+	dodoc doc/*
+}
diff --git a/app-crypt/johntheripper/metadata.xml b/app-crypt/johntheripper/metadata.xml
index 4b8964c8b919..99604958ee8f 100644
--- a/app-crypt/johntheripper/metadata.xml
+++ b/app-crypt/johntheripper/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>crypto</herd>
 	<maintainer>
-		<email>dragonheart@gentoo.org</email>
-		<description></description>
+		<email>phreak@gentoo.org</email>
+		<name>Christian Heim</name>
 	</maintainer>
 </pkgmetadata>