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

Package-Manager: portage-2.1.3_rc8

6 files changed, 182 insertions, 12 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/Manifest b/app-crypt/johntheripper/Manifest
index 05e5399449cb..4ffdf0f481e2 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -18,6 +18,10 @@ AUX johntheripper-1.7.2-sha1-memset.patch 388 RMD160 71190df1e84e543eef49e953915
 MD5 5eb08526a004d3bfd5d389e6b7fba0db files/johntheripper-1.7.2-sha1-memset.patch 388
 RMD160 71190df1e84e543eef49e95391596280d01b3601 files/johntheripper-1.7.2-sha1-memset.patch 388
 SHA256 eb5a126c521b34dea476deccf4afe20816ccc861b41910dda7dd5e3625f75028 files/johntheripper-1.7.2-sha1-memset.patch 388
+AUX johntheripper-1.7.2-stackdef-2.S.patch 363 RMD160 dfb0912bcff9ded13a50ccc153448423c0f00831 SHA1 ea3b75eb936adc98ebfe41650f608173b6b272f9 SHA256 9ce4d1e7ee1440208a7b8ed48fd4270c558772df10d3b2bb8ecaffc26152a073
+MD5 8ee8c8533bc70b5ae643e29665b291de files/johntheripper-1.7.2-stackdef-2.S.patch 363
+RMD160 dfb0912bcff9ded13a50ccc153448423c0f00831 files/johntheripper-1.7.2-stackdef-2.S.patch 363
+SHA256 9ce4d1e7ee1440208a7b8ed48fd4270c558772df10d3b2bb8ecaffc26152a073 files/johntheripper-1.7.2-stackdef-2.S.patch 363
 AUX johntheripper-1.7.2-stackdef.S.patch 1845 RMD160 947aa7be3186c13f87b35e2bbd1bd63f28c5e1a9 SHA1 705a85daf7a65b9b0908b638144c4eaae2ee7316 SHA256 952f076de0eef22db086864ca95e84aab16eb5fcb7035cb3d9c23340b3e2311f
 MD5 f16cd90d979617fc93b45bfbacccca6a files/johntheripper-1.7.2-stackdef.S.patch 1845
 RMD160 947aa7be3186c13f87b35e2bbd1bd63f28c5e1a9 files/johntheripper-1.7.2-stackdef.S.patch 1845
@@ -32,6 +36,7 @@ DIST john-1.6.40.tar.gz 797220 RMD160 b54e41eec65a9c185731b2e137fb155ae2eb348b S
 DIST john-1.6.tar.gz 497341 RMD160 5a34e7f57b190313cc0773e996f6eed74f28d160 SHA1 b49d371496b8ba5e439665b83190b1e4d4640bea SHA256 134a45c749190fd0a139edb151cb7b6096c7a3c1a42b89f3bcc2f9187d17a4f5
 DIST john-1.7-all-4.diff.gz 50311 RMD160 eafed1e75d72beef62664b238adf38ec6e6d4c52 SHA1 6050745204b38a7dd9fc41889de2b87866c8b528 SHA256 cb51be6cb03e952a21ea1a85e60253b932c946959b62f8082665ac2c7a792909
 DIST john-1.7.0.2.tar.gz 802354 RMD160 f4e7fead92d0b14ad088c8331d1b5c5ca941b85b SHA1 c1dd6bf2447ca22e016eafa69027e4c01e11f620 SHA256 b53633941ad52083d7143499ea06c60d918881a85d9685cd3f1917de7b0e61df
+DIST john-1.7.2-all-7.diff.gz 64450 RMD160 c0adeb226ee75bbc9a875b93a622b99927fb825f SHA1 a0b25e3f9606b5839a4f1a59f896727f0195ba9a SHA256 fb2f42d12ec94be02ad398ac9e823190e518cefcb096a4197c6a37d83d29124c
 DIST john-1.7.2.tar.gz 809308 RMD160 8ab90216401cf5cda7ba50a8bb88f53678e35eac SHA1 c3c4720c2f1446a3349b0307a0522af574d013e4 SHA256 9a94d2417b13d49cb11aeb11186933fe0e0491904987ca47c88bf5710935c3cb
 DIST john_1.6-17.diff.gz 11451 RMD160 52a13303fdfa35b11095c2f8259ed50e45e0bd27 SHA1 bb2b203296df9912779bbc00a53a515a24627b4e SHA256 d50103a722a44c446abb122d1bf1285ae5474bf21f0fd3b5de3b604873d8971e
 EBUILD johntheripper-1.6-r3.ebuild 3013 RMD160 65baac2c1fc2f5849acf31858183808a7564cc4e SHA1 429a59c3655792008f4b4d3b941d7bc6acb19d91 SHA256 5a6b0e9f9f4719c4448d5a5cdff4ffab84308ba47309a57a03d69ce54b45dc6c
@@ -50,14 +55,18 @@ EBUILD johntheripper-1.7.0.2.ebuild 3446 RMD160 6d352049109a314d235350d6e1462db0
 MD5 8da782f97d3a05ce7ee896686f7f15d6 johntheripper-1.7.0.2.ebuild 3446
 RMD160 6d352049109a314d235350d6e1462db0783c9bc2 johntheripper-1.7.0.2.ebuild 3446
 SHA256 42840ba31b5336c1e9c3ea4b09b0553cc7dfb61e915034537f8cd47d79e5a236 johntheripper-1.7.0.2.ebuild 3446
-EBUILD johntheripper-1.7.2.ebuild 3389 RMD160 ac923b57bb5a7365014d1a8b404d345e9cec23b5 SHA1 55570165d4a78ee3c9b300f792c73869f45b83c6 SHA256 2292bb9d3f6cc07e7d817b882c9326578c8b0f344f32561f2d402cd78e0e3e9c
-MD5 fa81705ae4851bceb24120f160afd08c johntheripper-1.7.2.ebuild 3389
-RMD160 ac923b57bb5a7365014d1a8b404d345e9cec23b5 johntheripper-1.7.2.ebuild 3389
-SHA256 2292bb9d3f6cc07e7d817b882c9326578c8b0f344f32561f2d402cd78e0e3e9c johntheripper-1.7.2.ebuild 3389
-MISC ChangeLog 9923 RMD160 38c95de5a421addcb6506b75a5b8cdd5634b4b21 SHA1 4ae7bebffaa1d5ddb13e5fedcae01818973d3259 SHA256 ff74f460c3898006a8a1a22a820fa1ba7780e0c75433a68516686a01ddecb5ed
-MD5 cc1f9bc910acba9e2b2209a17e122329 ChangeLog 9923
-RMD160 38c95de5a421addcb6506b75a5b8cdd5634b4b21 ChangeLog 9923
-SHA256 ff74f460c3898006a8a1a22a820fa1ba7780e0c75433a68516686a01ddecb5ed ChangeLog 9923
+EBUILD johntheripper-1.7.2-r1.ebuild 3490 RMD160 cc20706bfe038c606e4510c24b8114ffebf71f50 SHA1 436c057004a90832e524d987f306616a10c7d073 SHA256 d5168fadb3f0047f49b233554df9d4b613add06121779c3110732568611bd3c9
+MD5 49c16fe65c9da94f5971c090ce086d6c johntheripper-1.7.2-r1.ebuild 3490
+RMD160 cc20706bfe038c606e4510c24b8114ffebf71f50 johntheripper-1.7.2-r1.ebuild 3490
+SHA256 d5168fadb3f0047f49b233554df9d4b613add06121779c3110732568611bd3c9 johntheripper-1.7.2-r1.ebuild 3490
+EBUILD johntheripper-1.7.2.ebuild 3450 RMD160 1645e563b9ad2fb6ded7c74be5fe837f93f956be SHA1 fbcb80c962759491b57f8762e4c4a46d6c45c46d SHA256 a2d9fc20407e7e1b40fc904b07b503b05fccfbe7b3fb2e4bf7be124a981f8750
+MD5 6fc9ea37ab7434784b13035bf1182356 johntheripper-1.7.2.ebuild 3450
+RMD160 1645e563b9ad2fb6ded7c74be5fe837f93f956be johntheripper-1.7.2.ebuild 3450
+SHA256 a2d9fc20407e7e1b40fc904b07b503b05fccfbe7b3fb2e4bf7be124a981f8750 johntheripper-1.7.2.ebuild 3450
+MISC ChangeLog 10203 RMD160 2591a4f9d81f5a2eb778333c203e6f667a0a3e8d SHA1 d40d087ccbd32de03423aed6ac9dbcad856e77cb SHA256 2bd2f2c92bce76debf1b3093e5ac146b431a3cf80a9d87818056a1abace69cb8
+MD5 cf4fe6b72fdeb3d1c626706934125162 ChangeLog 10203
+RMD160 2591a4f9d81f5a2eb778333c203e6f667a0a3e8d ChangeLog 10203
+SHA256 2bd2f2c92bce76debf1b3093e5ac146b431a3cf80a9d87818056a1abace69cb8 ChangeLog 10203
 MISC metadata.xml 254 RMD160 d0d828a0efad42b4889e61fe5bd1c4abb3f8e0b0 SHA1 5d59fd95cef5bc44213823f07599ab4a3040e659 SHA256 6844bcc162ce000092403ef2e322fe3d20e02b2adc449149babfcc06353265e6
 MD5 873a096e13940bcb1684c3d5f4bdb30b metadata.xml 254
 RMD160 d0d828a0efad42b4889e61fe5bd1c4abb3f8e0b0 metadata.xml 254
@@ -77,3 +86,6 @@ SHA256 a4e635dae315e600b36dd82af86b89a770ccfae1b02000891307ccff33598fdb files/di
 MD5 fa3d5f08df3d277ee771715466395974 files/digest-johntheripper-1.7.2 476
 RMD160 e159515fd92bd054565f086b4749eaacd71b5473 files/digest-johntheripper-1.7.2 476
 SHA256 1f98f59d509b03c8a18445cdf030bb234507f090938041a3e6c7433b8cb80149 files/digest-johntheripper-1.7.2 476
+MD5 753fa3810f699a8a2221c89aa00af2eb files/digest-johntheripper-1.7.2-r1 482
+RMD160 540e941b341418e1a102eb85c53562d26087349c files/digest-johntheripper-1.7.2-r1 482
+SHA256 c1673181f0b25641de64a51a599c2a6e766ffd58c05a56173fbe70dcfe8faa70 files/digest-johntheripper-1.7.2-r1 482
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}|" \