Patch update, bug#185646, sse2 support, bug#185645, thanks to Erwin Paternotte

(Portage version: 2.1.3_rc8)

5 files changed, 162 insertions, 4 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 6eb4ec5d6143..199b2258bb27 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.54 2007/04/04 17:59:50 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.55 2007/07/19 16:16:49 alonbl Exp $
+
+*johntheripper-1.7.2-r1 (19 Jul 2007)
+
+  19 Jul 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/johntheripper-1.7.2-stackdef-2.S.patch, johntheripper-1.7.2.ebuild,
+  +johntheripper-1.7.2-r1.ebuild:
+  Patch update, bug#185646, sse2 support, bug#185645, thanks to Erwin Paternotte
 
   04 Apr 2007; Christian Heim <phreak@gentoo.org>
   johntheripper-1.6.40.ebuild, johntheripper-1.7.0.2.ebuild:
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.7.2-r1 b/app-crypt/johntheripper/files/digest-johntheripper-1.7.2-r1
new file mode 100644
index 000000000000..e2d7fb28a6db
--- /dev/null
+++ b/app-crypt/johntheripper/files/digest-johntheripper-1.7.2-r1
@@ -0,0 +1,6 @@
+MD5 cb0dd31fc8ea39ee34cac779fd9bdf68 john-1.7.2-all-7.diff.gz 64450
+RMD160 c0adeb226ee75bbc9a875b93a622b99927fb825f john-1.7.2-all-7.diff.gz 64450
+SHA256 fb2f42d12ec94be02ad398ac9e823190e518cefcb096a4197c6a37d83d29124c john-1.7.2-all-7.diff.gz 64450
+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-stackdef-2.S.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef-2.S.patch
new file mode 100644
index 000000000000..8ffb8d25c94f
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef-2.S.patch
@@ -0,0 +1,10 @@
+diff -urNp john-1.7.2.org/src/sha1-mmx.S john-1.7.2/src/sha1-mmx.S
+--- john-1.7.2.org/src/sha1-mmx.S	2007-07-19 18:57:26.000000000 +0300
++++ john-1.7.2/src/sha1-mmx.S	2007-07-19 18:58:20.000000000 +0300
+@@ -558,3 +558,6 @@ endianity:
+ 	por tmp2, ctxd
+ 	por tmp4, ctxe
+ */
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/app-crypt/johntheripper/johntheripper-1.7.2-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2-r1.ebuild
new file mode 100644
index 000000000000..7e716fd4a4c7
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.2-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/07/19 16:16:49 alonbl Exp $
+
+inherit eutils flag-o-matic toolchain-funcs pax-utils
+
+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.2-all-7.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 ~ppc64 ~sparc ~x86"
+IUSE="mmx altivec sse2"
+
+RDEPEND="virtual/libc
+	>=dev-libs/openssl-0.9.7"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/${MY_PNBASE}-1.7.2-all-7.diff
+
+	for p in params.h sha1-memset stackdef.S stackdef-2.S stripping; do
+		epatch "${FILESDIR}/${P}-${p}.patch"
+	done
+
+	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 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
+		emake ${OPTIONS} linux-x86-64  || die "Make failed"
+	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
+
+	pax-mark -m "${D}"/usr/sbin/john
+
+	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/johntheripper-1.7.2.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2.ebuild
index 67cfb6924081..cf65eaf1c330 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.2.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.14 2007/07/13 21:47:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.2.ebuild,v 1.15 2007/07/19 16:16:49 alonbl Exp $
 
 inherit eutils flag-o-matic toolchain-funcs pax-utils
 
@@ -26,8 +26,11 @@ RDEPEND="virtual/libc
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${DISTDIR}"/${MY_PNBASE}-1.7-all-4.diff.gz
-	epatch "${FILESDIR}"/${P}-*.patch
+	epatch "${WORKDIR}"/${MY_PNBASE}-1.7-all-4.diff
+
+	for p in params.h sha1-memset stackdef.S stripping; do
+		epatch "${FILESDIR}/${P}-${p}.patch"
+	done
 
 	ebegin "Applying ${P}-Makefile.patch"
 	sed -i -e "s|^CFLAGS.*|CFLAGS= -c -Wall ${CFLAGS}|" \