Version bump for johntheripper.

(Portage version: 2.1.8.3/cvs/Linux i686)

3 files changed, 242 insertions, 1 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 52a2be1cc3cd..b8b939831e13 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.116 2010/10/08 22:08:43 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.117 2010/10/13 13:09:07 c1pher Exp $
+
+*johntheripper-1.7.6 (13 Oct 2010)
+
+  13 Oct 2010; Dane Smith <c1pher@gentoo.org> +johntheripper-1.7.6.ebuild,
+  +files/johntheripper-1.7.6-cflags.patch:
+  Version bump for johntheripper wrt bug #327383. Includes a new patch.
 
   08 Oct 2010; Dane Smith <c1pher@gentoo.org>
   -files/johntheripper-1.7.2-params.h.patch,
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch b/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch
new file mode 100644
index 000000000000..a5ff2ad8d0bd
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch
@@ -0,0 +1,83 @@
+--- Makefile	2010-07-18 15:27:51.000000000 -0400
++++ Makefile.mine	2010-07-18 15:30:09.000000000 -0400
+@@ -629,7 +629,7 @@
+ macosx-ppc32-altivec:
+ 	$(LN) ppc32alt.h arch.h
+ 	$(MAKE) $(PROJ) \
+-		CFLAGS="-c -Wall -fomit-frame-pointer" \
++		CFLAGS="$(CLFAGS) -c -Wall -fomit-frame-pointer" \
+ 		OPT_NORMAL="-fast -mcpu=7450" \
+ 		OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec"
+ 
+@@ -638,7 +638,7 @@
+ 	$(LN) ppc32alt.h arch.h
+ 	$(MAKE) $(PROJ) \
+ 		ASFLAGS="$(ASFLAGS) -arch ppc" \
+-		CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
++		CFLAGS="$(CLFAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
+ 		LDFLAGS="$(LDFLAGS) -arch ppc" \
+ 		OPT_NORMAL="-fast -mcpu=7450" \
+ 		OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec"
+@@ -650,7 +650,7 @@
+ 	$(LN) ppc32.h arch.h
+ 	$(MAKE) $(PROJ) \
+ 		CC=cc \
+-		CFLAGS="-c -traditional-cpp" \
++		CFLAGS="$(CLFAGS) -c -traditional-cpp" \
+ 		OPT_NORMAL="-O2" \
+ 		OPT_INLINE="-O3"
+ 
+@@ -658,7 +658,7 @@
+ 	$(LN) ppc32.h arch.h
+ 	$(MAKE) $(PROJ) \
+ 		ASFLAGS="$(ASFLAGS) -arch ppc" \
+-		CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
++		CFLAGS="$(CLFAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
+ 		LDFLAGS="$(LDFLAGS) -arch ppc" \
+ 		OPT_NORMAL="-O2" \
+ 		OPT_INLINE="-O3 -finline-limit=4000"
+@@ -667,7 +667,7 @@
+ macosx-ppc64-altivec:
+ 	$(LN) ppc64alt.h arch.h
+ 	$(MAKE) $(PROJ) \
+-		CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \
++		CFLAGS="$(CLFAGS) -c -m64 -Wall -fomit-frame-pointer" \
+ 		LDFLAGS="$(LDFLAGS) -m64" \
+ 		OPT_NORMAL="-fast" \
+ 		OPT_INLINE="-fast -finline-limit=4000 -faltivec -maltivec"
+@@ -676,7 +676,7 @@
+ 	$(LN) ppc64alt.h arch.h
+ 	$(MAKE) $(PROJ) \
+ 		ASFLAGS="$(ASFLAGS) -arch ppc" \
+-		CFLAGS="-c -arch ppc -m64 -Wall -fomit-frame-pointer" \
++		CFLAGS="$(CLFAGS) -c -arch ppc -m64 -Wall -fomit-frame-pointer" \
+ 		LDFLAGS="$(LDFLAGS) -arch ppc -m64" \
+ 		OPT_NORMAL="-fast" \
+ 		OPT_INLINE="-fast -finline-limit=4000 -faltivec -maltivec"
+@@ -684,7 +684,7 @@
+ macosx-ppc64:
+ 	$(LN) ppc64.h arch.h
+ 	$(MAKE) $(PROJ) \
+-		CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \
++		CFLAGS="$(CLFAGS) -c -m64 -Wall -fomit-frame-pointer" \
+ 		LDFLAGS="$(LDFLAGS) -m64" \
+ 		OPT_NORMAL="-fast" \
+ 		OPT_INLINE="-fast -finline-limit=4000"
+@@ -693,7 +693,7 @@
+ 	$(LN) ppc64.h arch.h
+ 	$(MAKE) $(PROJ) \
+ 		ASFLAGS="$(ASFLAGS) -arch ppc" \
+-		CFLAGS="-c -arch ppc -m64 -Wall -fomit-frame-pointer" \
++		CFLAGS="$(CLFAGS) -c -arch ppc -m64 -Wall -fomit-frame-pointer" \
+ 		LDFLAGS="$(LDFLAGS) -arch ppc -m64" \
+ 		OPT_NORMAL="-fast" \
+ 		OPT_INLINE="-fast -finline-limit=4000"
+@@ -723,7 +723,7 @@
+ 	$(LN) ppc32alt.h arch.h
+ 	$(MAKE) $(PROJ) \
+ 		ASFLAGS="$(ASFLAGS) -arch ppc" \
+-		CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
++		CFLAGS="$(CLFAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
+ 		LDFLAGS="$(LDFLAGS) -arch ppc" \
+ 		OPT_NORMAL="-fast -mcpu=7450" \
+ 		OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec"
diff --git a/app-crypt/johntheripper/johntheripper-1.7.6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.6.ebuild
new file mode 100644
index 000000000000..7a6aef5e9d85
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.6.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.6.ebuild,v 1.1 2010/10/13 13:09:07 c1pher Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs pax-utils
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+JUMBO="jumbo-4"
+#MPI="mpi10"
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+
+SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.gz
+	!minimal? ( http://www.openwall.com/john/contrib/${MY_P}-${JUMBO}.diff.gz )"
+#	mpi? ( ftp://ftp.openwall.com/john/contrib/mpi/2009-bindshell/${MY_P}-${MPI}.patch.gz )
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="altivec custom-cflags -minimal mmx sse2"
+#IUSE="altivec custom-cflags -minimal mmx -mpi sse2"
+
+# Seems a bit fussy with other MPI implementations.
+RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7 )"
+#	mpi? ( sys-cluster/openmpi )
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+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
+}
+
+src_prepare() {
+#	if use mpi; then
+#		epatch "${WORKDIR}/${MY_P}-${MPI}.patch"
+#	fi
+	if ! use minimal; then
+		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
+	fi
+	local PATCHLIST="${PATCHLIST} 1.7.6-cflags 1.7.3.1-mkdir-sandbox"
+
+	cd src
+	for p in ${PATCHLIST}; do
+		epatch "${FILESDIR}/${PN}-${p}.patch"
+	done
+
+	if ! use minimal; then
+		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
+			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
+			-i Makefile || die "sed Makefile failed"
+	fi
+}
+
+src_compile() {
+	use custom-cflags || strip-flags
+	append-flags -fPIC -fPIE \
+		'-DJOHN_SYSTEMWIDE' \
+		'-DJOHN_SYSTEMWIDE_HOME=\\\"/etc/john\\\"' \
+		'-DJOHN_SYSTEMWIDE_EXEC=\\\"/usr/libexec/john\\\"'
+	gcc-specs-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 -C src/\
+		CPP=${CPP} CC=${CC} AS=${AS} LD=${LD} \
+		CFLAGS="-c -Wall ${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		OPT_NORMAL="" \
+		$(get_target) || die "emake failed"
+}
+
+src_test() {
+	cd run
+	if [[ -f "/etc/john/john.conf" || -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
+		dosbin run/calc_stat
+		dosbin run/genmkvpwd
+		dosbin run/mkvcalcproba
+		insinto /etc/john
+		doins run/genincstats.rb run/stats
+		doins run/netscreen.py run/sap_prepare.pl
+	fi
+
+	# config files
+	insinto /etc/john
+	doins run/john.conf
+	doins run/*.chr run/password.lst
+
+	# documentation
+	dodoc doc/*
+}