Fixed charset.txt issue, thanks to Roger Ward, closes bug#153487

(Portage version: 2.1.1-r1)

5 files changed, 90 insertions, 3 deletions

diff --git a/app-crypt/rainbowcrack/ChangeLog b/app-crypt/rainbowcrack/ChangeLog
index 7becc66b2771..5007247c94b2 100644
--- a/app-crypt/rainbowcrack/ChangeLog
+++ b/app-crypt/rainbowcrack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/rainbowcrack
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/rainbowcrack/ChangeLog,v 1.5 2005/07/29 22:59:06 dragonheart Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/rainbowcrack/ChangeLog,v 1.6 2006/11/01 19:25:57 alonbl Exp $
+
+*rainbowcrack-1.2-r1 (01 Nov 2006)
+
+  01 Nov 2006; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/rainbowcrack-1.2-share.patch, +rainbowcrack-1.2-r1.ebuild:
+  Fixed charset.txt issue, thanks to Roger Ward, closes bug#153487
 
   29 Jul 2005; Daniel Black <dragonheart@gentoo.org>
   rainbowcrack-1.2.ebuild:
diff --git a/app-crypt/rainbowcrack/files/digest-rainbowcrack-1.2 b/app-crypt/rainbowcrack/files/digest-rainbowcrack-1.2
index c504de0eac32..67bd8719ff34 100644
--- a/app-crypt/rainbowcrack/files/digest-rainbowcrack-1.2
+++ b/app-crypt/rainbowcrack/files/digest-rainbowcrack-1.2
@@ -1,2 +1,6 @@
-MD5 e7e8304caff8f7051916ff484c2f0231 rainbowcrack-1.2-src.zip 44742
 MD5 730300958ad17a63610e9b1354dbf6b9 rainbowcrack-1.2-src-algorithmpatch.zip 3029
+RMD160 3293cfcf69677ca6812333dd97952f0e354ce96a rainbowcrack-1.2-src-algorithmpatch.zip 3029
+SHA256 ccc646087692da1e02b1921f97d6c9d2784534153f4570b62de0f122c4c3b322 rainbowcrack-1.2-src-algorithmpatch.zip 3029
+MD5 e7e8304caff8f7051916ff484c2f0231 rainbowcrack-1.2-src.zip 44742
+RMD160 51fdcf84ebfbe8ebb9e5bc6c3d4452f9d158eb79 rainbowcrack-1.2-src.zip 44742
+SHA256 238485eeede5140cfc66b88761ec976b7af8b5557ec5bd4eddbcd98830a34dac rainbowcrack-1.2-src.zip 44742
diff --git a/app-crypt/rainbowcrack/files/digest-rainbowcrack-1.2-r1 b/app-crypt/rainbowcrack/files/digest-rainbowcrack-1.2-r1
new file mode 100644
index 000000000000..67bd8719ff34
--- /dev/null
+++ b/app-crypt/rainbowcrack/files/digest-rainbowcrack-1.2-r1
@@ -0,0 +1,6 @@
+MD5 730300958ad17a63610e9b1354dbf6b9 rainbowcrack-1.2-src-algorithmpatch.zip 3029
+RMD160 3293cfcf69677ca6812333dd97952f0e354ce96a rainbowcrack-1.2-src-algorithmpatch.zip 3029
+SHA256 ccc646087692da1e02b1921f97d6c9d2784534153f4570b62de0f122c4c3b322 rainbowcrack-1.2-src-algorithmpatch.zip 3029
+MD5 e7e8304caff8f7051916ff484c2f0231 rainbowcrack-1.2-src.zip 44742
+RMD160 51fdcf84ebfbe8ebb9e5bc6c3d4452f9d158eb79 rainbowcrack-1.2-src.zip 44742
+SHA256 238485eeede5140cfc66b88761ec976b7af8b5557ec5bd4eddbcd98830a34dac rainbowcrack-1.2-src.zip 44742
diff --git a/app-crypt/rainbowcrack/files/rainbowcrack-1.2-share.patch b/app-crypt/rainbowcrack/files/rainbowcrack-1.2-share.patch
new file mode 100644
index 000000000000..2cf75ca76b71
--- /dev/null
+++ b/app-crypt/rainbowcrack/files/rainbowcrack-1.2-share.patch
@@ -0,0 +1,12 @@
+diff -urNp rainbowcrack-1.2-src.org/src/ChainWalkContext.cpp rainbowcrack-1.2-src/src/ChainWalkContext.cpp
+--- rainbowcrack-1.2-src.org/src/ChainWalkContext.cpp	2003-11-23 00:33:44.000000000 +0200
++++ rainbowcrack-1.2-src/src/ChainWalkContext.cpp	2006-11-01 21:05:13.000000000 +0200
+@@ -58,7 +58,7 @@ bool CChainWalkContext::LoadCharset(stri
+ 	}

+ 

+ 	vector<string> vLine;

+-	if (ReadLinesFromFile("charset.txt", vLine))

++	if (ReadLinesFromFile("charset.txt", vLine) || ReadLinesFromFile("@@SHARE@@/charset.txt", vLine))

+ 	{

+ 		int i;

+ 		for (i = 0; i < vLine.size(); i++)

diff --git a/app-crypt/rainbowcrack/rainbowcrack-1.2-r1.ebuild b/app-crypt/rainbowcrack/rainbowcrack-1.2-r1.ebuild
new file mode 100644
index 000000000000..3bc882969006
--- /dev/null
+++ b/app-crypt/rainbowcrack/rainbowcrack-1.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/rainbowcrack/rainbowcrack-1.2-r1.ebuild,v 1.1 2006/11/01 19:25:57 alonbl Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Hash cracker that precomputes plaintext - ciphertext pairs in advance"
+HOMEPAGE="http://www.antsight.com/zsl/rainbowcrack/"
+
+SRC_URI="http://www.antsight.com/zsl/rainbowcrack/${P}-src.zip
+	http://www.antsight.com/zsl/rainbowcrack/${P}-src-algorithmpatch.zip"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND="dev-libs/openssl"
+DEPEND="${RDEPEND} app-arch/unzip"
+
+MY_P=${P}-src
+S=${WORKDIR}/${MY_P}/src
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+	cd "${S}"
+	mv "${WORKDIR}/${P}"-src-algorithmpatch/Hash* "${S}"
+	epatch "${FILESDIR}/${P}-makefile.patch"
+	epatch "${FILESDIR}/${P}-share.patch"
+	sed -i "s#@@SHARE@@#/usr/share/${P}#g" ChainWalkContext.cpp || die
+}
+
+src_compile() {
+	emake -f makefile.linux CXX=$(tc-getCXX) || die "make failed"
+}
+
+src_test() {
+	einfo "generating rainbow tables (password maps)"
+	./rtgen sha1 loweralpha 7 7  0 1000 160 test
+	einfo "sorting tables"
+	./rtsort *.rt
+	einfo "attempting crack of 7 character random sha1 lowercase passwords"
+	./rcrack ./*.rt -l random_sha1_loweralpha#1-7.hash
+	einfo "I haven't rigged this so it finds anything yet. Submissions welcome bugs.gentoo.org"
+}
+
+src_install() {
+	dobin rtgen rtdump rtsort rcrack
+	insinto "/usr/share/${P}"
+	doins charset.txt
+
+	dodoc *.plain *.hash
+
+	newdoc "${WORKDIR}/${P}-src-algorithmpatch/readme.txt" algorithm_readme.txt
+
+	cd "${WORKDIR}/${MY_P}"
+	dodoc readme.txt readme_src.txt disclaimer.txt
+	dohtml -r doc/
+}