app-crypt/johntheripper remove altivec use flag wrt bug 353969. Mark ppc/ppc64 stable. Drop old version/patches.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux i686

5 files changed, 45 insertions, 235 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 39027c605c4e..38d93c055a42 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.130 2011/02/08 15:12:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.131 2011/02/09 18:44:09 c1pher Exp $
+
+  09 Feb 2011; Dane Smith <c1pher@gentoo.org>
+  -files/johntheripper-1.7.3.1-cflags.patch, -johntheripper-1.7.3.4.ebuild,
+  johntheripper-1.7.6-r1.ebuild:
+  *Remove altivec use flag wrt bug 353969.
+  *Mark ppc/ppc64 as stable in 1.7.6-r1 with permission from ssuominen now
+  that
+  the altivec issues are resolved.
+  *Drop old version and old patch.
 
   08 Feb 2011; Jeroen Roovers <jer@gentoo.org> johntheripper-1.7.6-r1.ebuild:
   Stable for HPPA (bug #350730).
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index bd70a013c1a9..d01984aa4723 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,11 +1,27 @@
-AUX johntheripper-1.7.3.1-cflags.patch 2215 RMD160 86e02a71dad29cdb59190b3e5fa6bdb8aa476a72 SHA1 9e346f2e7886ea405e937185bb897096d7c98308 SHA256 b734db5141aed15574c8e2f8e9b476cb17fd2f7753c7cf7d6695b8d4b7cb10e0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX johntheripper-1.7.3.1-mkdir-sandbox.patch 562 RMD160 10fa90b61b07aa902bd88d14eed38be2b66573bf SHA1 1f4520d3e339b853dc480cd6e3a4956aa878a15f SHA256 9bf9577ed74048b4df82bc6fcf546469e07c93d27de438dd3aa36b5b360b27f0
 AUX johntheripper-1.7.6-cflags.patch 2927 RMD160 4dc1565b43af8bca1afa4c711f855df274124554 SHA1 78dda9b2bd97e7171bfd1f6d5e9aedbac8236b55 SHA256 3c4438ec4dcc3e8c81f1180544cd005f561a013b25ea51ad36189ced8a29f36f
-DIST john-1.7.3.4-jumbo-1.diff.gz 124346 RMD160 6876511de35b0743df6b9ce23529b2e3e8269ee7 SHA1 05a31bee24685da89bde5d0d13981bb6d1dcd5ca SHA256 580e2db04338fe5a8841943bd588640ba9c80884e1d8a21bb44be7fec581e178
-DIST john-1.7.3.4.tar.gz 816259 RMD160 975116059a26e7030cdd573109dae36812160543 SHA1 9fd327416188c405d4927a32f1a8e756b4a259e1 SHA256 017936a2a98e0a4bcec56c53177e4ee8f515ebd5e39fd97e55b1962076eb5d16
 DIST john-1.7.6-jumbo-4.diff.gz 206601 RMD160 53ac2218ca33d458eb7250bce18a9e9af5a881d6 SHA1 ccef570680a8496618d359a42a101b331d40aeb7 SHA256 12760c528c3eabe0e429954745f016107c08ce936ed4be2e63d2a75c64717f3a
 DIST john-1.7.6.tar.gz 832790 RMD160 294fa9a381b45df6fda6e537bc920e74c1d966b0 SHA1 da0b6298e6e045606d48880df045096e8bc87fcb SHA256 77e44d068d317648c41d3ac61b8ea1df18d5c7401083e7a4f6681816900c1a73
-EBUILD johntheripper-1.7.3.4.ebuild 3725 RMD160 e2e85decaa7011571fa7efe895652b8c6503948c SHA1 412bbe56a70d3670490b8132916710adb5102eab SHA256 2cab00e06a9a9f19e1d18e3650681d471b46ec44d8a7deadcaf17bb113bcb93f
-EBUILD johntheripper-1.7.6-r1.ebuild 4174 RMD160 66a9a9dd159d22e79a8c4b59edb79ca439479718 SHA1 9047d8f6dd0222f68c46c40d7395d143aa7b0922 SHA256 845034d1bcdd01c884740b168f8c308a0d5404e4ae4ddad4c814f8a5a36bcbdf
-MISC ChangeLog 21295 RMD160 9147ac4941aa59fa8bb15ac851f45b8f3e097c5a SHA1 3e90ff9ae3d12244ba6673c43cde7c7001ea42f8 SHA256 87386ddddb7f4f05907ead3b76e411eb040e341cb457a1020a479d1b111879da
+EBUILD johntheripper-1.7.6-r1.ebuild 4289 RMD160 c0691e5396d90bf39044b0db6acb0f644dd4a2c7 SHA1 ee6e6a26f907316550bb8ee3e4dbca1be95a87b2 SHA256 27cb3b118e52d3379c453c7fe49c8a406e7fd53524f97998b81d1f3309dc5ef8
+MISC ChangeLog 21649 RMD160 f7c1d6e43fdc825ce464239768b55e7d42c53b18 SHA1 08ecfbaa23890886c27d74fdd609f3753691b49c SHA256 3b11f669a54de2922a1528e240042a9740465b2979460fba11a2d2c5f3da3d1e
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNUuAiAAoJEEsurZwMLhUxCKAP/R6ItH89gMoIiriewf0sHSvh
+omO40D3MpfjupiZ1CKf4Oy/jfw0OFUCb6b/hNQ+dU8Z4mhhE3tJ3xcj2+4RoJwg6
+rmeDW6MtcVLInVsvxYUseaRwbc79Dj8oKGxKirRhicRoCJV7QqlE9BuOUi723j8y
+wLX7Ek4/hlOhGvtrx3W9ABr4Eiw/g6rX/5wqrKMp5WkvMVUWtBr/Sgl1wAoJMSNr
+USvjx25KZVQO8kEgI1PJ4G3BMsbf2jdZyGbsx+jnYvnXzq2G9lz2bjEuCuQ6s5Xt
+d0+W6wXV7mufyIUHQ07kw1mNUmCbYBnTIbIot0X1013ymzoQrMHcNccAb78vUXXM
+foVhzP1SBOe6vmVZh0DxPZC+c3IFuDsS+KvCNjL10zlzPi07T4773Fj0mYly4Y/4
+KLkrkHXbMOuVQaOOWuBMLpmvr1hF8AQtzAcHdN/mexio0UAhjl283jwonZHaCVZa
+ZA4KvfFa4JfHwlpoA5LF2Lk1HVs1cMXI9nCg3og2JvNFkOk1tU2y8F/yKt3yuzzK
+90s7XlD/vEX2Q/W8gJI3eq3yJoiKxMnvLdp366pTSBEx0FzJBX9FssYaW8jdZp72
+m9ILWmvXOIBOu/Xggb/jay4b8dnzuSHUandDgQdiaz0pvdMDjRT0E562+a1ey+lK
+3sruYpL65MNLFKPl20SN
+=u6Zw
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-cflags.patch b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-cflags.patch
deleted file mode 100644
index 8c3bc0f49128..000000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-cflags.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-* this is an incomplete patch, adding CFLAGS to some targets that we use
-  without this patch, one can't configure john via defines
-
---- src/Makefile
-+++ src/Makefile
-@@ -597,7 +597,7 @@
- 	$(LN) ppc32.h arch.h
- 	$(MAKE) $(PROJ) \
- 		CC=cc \
--		CFLAGS="-c -qunroll=2 -qarch=ppc -qchars=signed" \
-+		CFLAGS="$(CFLAGS) -c -qunroll=2 -qarch=ppc -qchars=signed" \
- 		LDFLAGS="-s -lbsd" \
- 		OPT_NORMAL="-O2" \
- 		OPT_INLINE="-O3 -Q=99 -w"
-@@ -626,7 +626,7 @@
- 	$(LN) ppc32alt.h arch.h
- 	$(MAKE) $(PROJ) \
- 		JOHN_OBJS="$(JOHN_OBJS) ppc-alti-macosx.o" \
--		CFLAGS="-c -Wall -fomit-frame-pointer" \
-+		CFLAGS="$(CFLAGS) -c -Wall -fomit-frame-pointer" \
- 		OPT_NORMAL="-fast -mcpu=7450" \
- 		OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000"
- 
-@@ -637,7 +637,7 @@
- 	$(LN) ppc32.h arch.h
- 	$(MAKE) $(PROJ) \
- 		CC=cc \
--		CFLAGS="-c -traditional-cpp" \
-+		CFLAGS="$(CFLAGS) -c -traditional-cpp" \
- 		OPT_NORMAL="-O2" \
- 		OPT_INLINE="-O3"
- 
-@@ -646,7 +646,7 @@
- 	$(LN) ppc32.h arch.h
- 	$(MAKE) $(PROJ) \
- 		ASFLAGS="$(ASFLAGS) -arch ppc" \
--		CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
-+		CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
- 		LDFLAGS="$(LDFLAGS) -arch ppc" \
- 		OPT_NORMAL="-O2" \
- 		OPT_INLINE="-O3 -finline-limit=4000"
-@@ -656,7 +656,7 @@
- 	$(LN) ppc64alt.h arch.h
- 	$(MAKE) $(PROJ) \
- 		JOHN_OBJS="$(JOHN_OBJS) ppc-alti-macosx.o" \
--		CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \
-+		CFLAGS="$(CFLAGS) -c -m64 -Wall -fomit-frame-pointer" \
- 		LDFLAGS="$(LDFLAGS) -m64" \
- 		OPT_NORMAL="-fast" \
- 		OPT_INLINE="-fast -finline-limit=4000"
-@@ -664,7 +664,7 @@
- macosx-ppc64:
- 	$(LN) ppc64.h arch.h
- 	$(MAKE) $(PROJ) \
--		CFLAGS="-c -Wall -fomit-frame-pointer -m64" \
-+		CFLAGS="$(CFLAGS) -c -Wall -fomit-frame-pointer -m64" \
- 		LDFLAGS="$(LDFLAGS) -m64" \
- 		OPT_NORMAL="-fast" \
- 		OPT_INLINE="-fast -finline-limit=4000"
-@@ -698,7 +698,7 @@
- 	$(MAKE) $(PROJ) \
- 		JOHN_OBJS="$(JOHN_OBJS) ppc-alti-macosx.o" \
- 		ASFLAGS="$(ASFLAGS) -arch ppc" \
--		CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
-+		CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
- 		LDFLAGS="$(LDFLAGS) -arch ppc" \
- 		OPT_NORMAL="-fast -mcpu=7450" \
- 		OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000"
diff --git a/app-crypt/johntheripper/johntheripper-1.7.3.4.ebuild b/app-crypt/johntheripper/johntheripper-1.7.3.4.ebuild
deleted file mode 100644
index 6ca6c01b2dac..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.3.4.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2011 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.4.ebuild,v 1.9 2011/01/05 19:13:54 ssuominen Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-1"
-#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? ( ftp://ftp.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 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} cflags mkdir-sandbox"
-
-	cd src
-	for p in ${PATCHLIST}; do
-		epatch "${FILESDIR}/${PN}-1.7.3.1-${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
-	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} -DJOHN_SYSTEMWIDE -DJOHN_SYSTEMWIDE_HOME=\"\\\"/etc/john\\\"\" -DJOHN_SYSTEMWIDE_EXEC=\"\\\"/usr/libexec/john\\\"\"" \
-		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/*
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild
index 24f7a7fe804a..68d221353135 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-r1.ebuild,v 1.10 2011/02/08 15:12:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild,v 1.11 2011/02/09 18:44:09 c1pher Exp $
 
 EAPI="2"
 
@@ -22,8 +22,10 @@ SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 # This package can't be marked stable for ppc or ppc64 before bug 327211 is closed.
-KEYWORDS="alpha amd64 hppa ~mips ~ppc ~ppc64 sparc x86"
-IUSE="altivec custom-cflags -minimal mmx openmp sse2"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+IUSE="custom-cflags -minimal mmx openmp sse2"
+#Remove AltiVec USE flag. Appears to be an upstream issue.
+#IUSE="altivec custom-cflags -minimal mmx openmp sse2"
 #IUSE="altivec custom-cflags -minimal mmx -mpi sse2"
 
 # Seems a bit fussy with other MPI implementations.
@@ -50,19 +52,19 @@ get_target() {
 	elif use amd64; then
 		echo "linux-x86-64"
 	elif use ppc64; then
-		if use altivec; then
-			echo "linux-ppc32-altivec"
-		else
+		#if use altivec; then
+		#	echo "linux-ppc32-altivec"
+		#else
 			echo "linux-ppc64"
-		fi
+		#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
+		#if use altivec; then
+		#	echo "linux-ppc32-altivec"
+		#else
 			echo "linux-ppc32"
-		fi
+		#fi
 	else
 		echo "generic"
 	fi