version bump thanks to Erwin Paternotte, Aoz, Anton Bolshakov as per bug #228013

(Portage version: 2.2_rc12/cvs/Linux 2.6.25-gentoo-r7 x86_64)

8 files changed, 280 insertions, 8 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index a756a6d7fa37..de8372b83a96 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.86 2008/07/24 21:25:27 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.87 2008/11/04 08:06:54 dragonheart Exp $
+
+*johntheripper-1.7.3.1 (04 Nov 2008)
+
+  04 Nov 2008; Daniel Black <dragonheart@gentoo.org>
+  +files/johntheripper-1.7.3.1-mkdir-sandbox.patch,
+  +files/johntheripper-1.7.3.1-params.h.patch,
+  +files/johntheripper-1.7.3.1-stackdef.S.patch,
+  johntheripper-1.7.2-r3.ebuild, johntheripper-1.7.2-r4.ebuild,
+  johntheripper-1.7.2-r5.ebuild, +johntheripper-1.7.3.1.ebuild:
+  version bump thanks to Erwin Paternotte, Aoz, Anton Bolshakov as per bug
+  #228013. SRC_URIs fixed for other ebuilds
 
   24 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch
new file mode 100644
index 000000000000..5600f3cc17ec
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch
@@ -0,0 +1,12 @@
+diff -urNp john-1.7.3.1.org/src/path.c john-1.7.3.1/src/path.c
+--- john-1.7.3.1.org/src/path.c	2003-10-01 04:26:25.000000000 +0300
++++ john-1.7.3.1/src/path.c	2007-11-10 15:53:23.000000000 +0200
+@@ -55,7 +55,7 @@ void path_init(char **argv)
+ #ifdef JOHN_PRIVATE_HOME
+ 	private = path_expand(JOHN_PRIVATE_HOME);
+ 	if (mkdir(private, S_IRUSR | S_IWUSR | S_IXUSR)) {
+-		if (errno != EEXIST) pexit("mkdir: %s", private);
++		if (errno != EEXIST && errno != EACCES) pexit("mkdir: %s", private);
+ 	} else
+ 		fprintf(stderr, "Created directory: %s\n", private);
+ #endif
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-params.h.patch b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-params.h.patch
new file mode 100644
index 000000000000..0f430df84b02
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-params.h.patch
@@ -0,0 +1,15 @@
+Index: john-1.7.3.1/src/params.h
+===================================================================
+--- john-1.7.3.1.orig/src/params.h
++++ john-1.7.3.1/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.3.1-stackdef.S.patch b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-stackdef.S.patch
new file mode 100644
index 000000000000..225e248e5764
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-stackdef.S.patch
@@ -0,0 +1,71 @@
+Index: john-1.7.3.1/src/sha1-mmx.S
+===================================================================
+--- john-1.7.3.1.orig/src/sha1-mmx.S
++++ john-1.7.3.1/src/sha1-mmx.S
+@@ -558,3 +558,6 @@ endianity:
+ 	por tmp2, ctxd
+ 	por tmp4, ctxe
+ */
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+Index: john-1.7.3.1/src/sparc.S
+===================================================================
+--- john-1.7.3.1.orig/src/sparc.S
++++ john-1.7.3.1/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.3.1/src/x86-64.S
+===================================================================
+--- john-1.7.3.1.orig/src/x86-64.S
++++ john-1.7.3.1/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.3.1/src/x86-mmx.S
+===================================================================
+--- john-1.7.3.1.orig/src/x86-mmx.S
++++ john-1.7.3.1/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.3.1/src/x86-sse.S
+===================================================================
+--- john-1.7.3.1.orig/src/x86-sse.S
++++ john-1.7.3.1/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.3.1/src/x86.S
+===================================================================
+--- john-1.7.3.1.orig/src/x86.S
++++ john-1.7.3.1/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/johntheripper-1.7.2-r3.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2-r3.ebuild
index 3e2325a3abc0..67fb16920e19 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.2-r3.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r3.ebuild,v 1.8 2008/02/04 18:47:56 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.2-r3.ebuild,v 1.9 2008/11/04 08:06:54 dragonheart Exp $
 
 inherit eutils flag-o-matic toolchain-funcs pax-utils
 
@@ -10,7 +10,7 @@ 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"
+		ftp://ftp.openwall.com/john/contrib/historical/${MY_PNBASE}-1.7.2-all-7.diff.gz"
 
 # banquise-to-bigpatch-17.patch.bz2"
 # based off /var/tmp/portage/johntheripper-1.6.40
diff --git a/app-crypt/johntheripper/johntheripper-1.7.2-r4.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2-r4.ebuild
index bf44b47d8fda..062d75c8bc82 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.2-r4.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r4.ebuild,v 1.2 2008/02/04 18:47:56 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.2-r4.ebuild,v 1.3 2008/11/04 08:06:54 dragonheart Exp $
 
 inherit eutils flag-o-matic toolchain-funcs pax-utils
 
@@ -12,7 +12,7 @@ DESCRIPTION="fast password cracker"
 HOMEPAGE="http://www.openwall.com/john/"
 
 SRC_URI="http://www.openwall.com/john/f/${MY_P}.tar.gz
-	http://www.openwall.com/john/contrib/${MY_P}-all-9.diff.gz"
+	ftp://ftp.openwall.com/john/contrib/historical/${MY_P}-all-9.diff.gz"
 # When mpi stable:
 #	mpi? ( http://bindshell.net/tools/johntheripper/${MY_P}-bp17-mpi2.patch.gz )"
 
diff --git a/app-crypt/johntheripper/johntheripper-1.7.2-r5.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2-r5.ebuild
index e003e791f0f1..d306c7ccb985 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.2-r5.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r5.ebuild,v 1.2 2008/06/16 19:48:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.2-r5.ebuild,v 1.3 2008/11/04 08:06:54 dragonheart Exp $
 
 inherit eutils flag-o-matic toolchain-funcs pax-utils
 
@@ -12,8 +12,8 @@ DESCRIPTION="fast password cracker"
 HOMEPAGE="http://www.openwall.com/john/"
 
 SRC_URI="http://www.openwall.com/john/f/${MY_P}.tar.gz
-	http://www.openwall.com/john/contrib/${MY_P}-all-9.diff.gz
-	mpi? ( http://bindshell.net/tools/johntheripper/${MY_P}-bp17-mpi8.patch.gz )"
+	ftp://ftp.openwall.com/john/contrib/historical/${MY_P}-all-9.diff.gz
+	mpi? ( mirror://gentoo/${MY_P}-bp17-mpi8.patch.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-crypt/johntheripper/johntheripper-1.7.3.1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.3.1.ebuild
new file mode 100644
index 000000000000..3898a7758615
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.3.1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.3.1.ebuild,v 1.1 2008/11/04 08:06:54 dragonheart Exp $
+
+inherit eutils flag-o-matic toolchain-funcs pax-utils
+
+JUMBO='all-3'
+MPI='mpi8-small'
+
+MY_PN="${PN/theripper/}"
+MY_P="${MY_PN/theripper/}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+
+SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.gz
+	!minimal? ( ftp://ftp.openwall.com/john/contrib/historical/${MY_P}-${JUMBO}.diff.gz )
+	mpi? ( http://bindshell.net/tools/johntheripper/${MY_P}-${MPI}.patch.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+EAPI=1
+IUSE="mmx altivec sse2 custom-cflags -minimal -mpi"
+
+# Seems a bit fussy with other MPI implementations.
+RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7 )
+	mpi? ( sys-cluster/openmpi )"
+DEPEND="${RDEPEND}"
+
+get_target() {
+	if use x86 ; then
+		if use sse2 ; then
+			echo "linux-x86-sse2"
+		elif use mmx ; then
+			echo "linux-x86-mmx"
+		else
+			echo "linux-x86-any"
+		fi
+	elif use alpha ; then
+		echo "linux-alpha"
+	elif use sparc; then
+		echo "linux-sparc"
+	elif use amd64; then
+		echo "linux-x86-64"
+	elif use ppc64; then
+		if use altivec; then
+			echo "linux-ppc32-altivec"
+		else
+			echo "linux-ppc64"
+		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
+			echo "linux-ppc32-altivec"
+		else
+			echo "linux-ppc32"
+		fi
+	else
+		echo "generic"
+	fi
+}
+
+#pkg_setup() {
+#	if use mpi && built_with_use sys-cluster/mpich2 threads; then
+#		die 'cannot work with sys-cluster/mpich2 USE=threads'
+#		#http://bindshell.net/tools/johntheripper/
+#	fi
+#}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	PATCHLIST=""
+	if use mpi ; then
+		epatch "${WORKDIR}"/${MY_P}-${MPI}.patch
+		# avoid the conflict on JOHN_VERSION until a better compromise is made
+		sed -i 's/_mpi"/"/' src/params.h
+	fi
+	if ! use minimal ; then
+		epatch "${WORKDIR}"/${MY_P}-${JUMBO}.diff
+		PATCHLIST=stackdef.S
+	fi
+	PATCHLIST="${PATCHLIST} params.h mkdir-sandbox"
+
+	cd "${S}/src"
+	for p in ${PATCHLIST}; do
+		epatch "${FILESDIR}/${P}-${p}.patch"
+	done
+
+	sed -i "s/LDFLAGS  *=  */override LDFLAGS += /" Makefile
+}
+
+src_compile() {
+	cd "${S}/src"
+
+	use custom-cflags || strip-flags
+	append-flags -fno-PIC -fno-PIE
+	append-ldflags -nopie
+
+	CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC)
+	use mpi && CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
+	emake \
+		CPP=${CPP} CC=${CC} AS=${AS} LD=${LD} \
+		CFLAGS="-c -Wall ${CFLAGS} -DJOHN_SYSTEMWIDE \
+			-DJOHN_SYSTEMWIDE_HOME=\"\\\"/etc/john\\\"\"" \
+		LDFLAGS="${LDFLAGS}" \
+		OPT_NORMAL="" \
+		$(get_target) \
+		|| die "make failed"
+}
+
+src_test() {
+	cd "${S}/run"
+	if  [ -f /etc/john/john.conf -o -f /etc/john/john.ini  ]; then
+		# This requires that MPI is actually 100% online on your system, which might not
+		# be the case, depending on which MPI implementation you are using.
+		#if use mpi ; then
+		#	mpirun -np 2 ./john --test || die 'self test failed'
+		#else
+
+		./john --test || die 'self test failed'
+	else
+		ewarn "selftest requires /etc/john/john.conf or /etc/john/john.ini"
+	fi
+}
+
+src_install() {
+	# 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
+
+	# jumbo-patch additions
+	if ! use minimal ; then
+		dosym john /usr/sbin/undrop
+		# >=all-4
+		#dosbin run/calc_stat
+		#dosbin run/genmkvpwd
+		#dosbin run/mkvcalcproba
+		insinto /etc/john
+		# >=all-4
+		#doins run/genincstats.rb run/stats
+		doins run/netscreen.py run/sap_prepare.pl
+	fi
+
+	#newsbin src/bench john-bench
+
+	# config files
+	insinto /etc/john
+	doins run/john.conf
+	doins run/*.chr run/password.lst
+
+	# documentation
+	dodoc doc/*
+}