Revision bump for rainbowcrack wrt bug 331877.

(Portage version: 2.1.8.3/cvs/Linux i686)

3 files changed, 105 insertions, 4 deletions

diff --git a/app-crypt/rainbowcrack/ChangeLog b/app-crypt/rainbowcrack/ChangeLog
index 4ef3533b075b..536707dd69b2 100644
--- a/app-crypt/rainbowcrack/ChangeLog
+++ b/app-crypt/rainbowcrack/ChangeLog
@@ -1,10 +1,17 @@
 # ChangeLog for app-crypt/rainbowcrack
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/rainbowcrack/ChangeLog,v 1.15 2010/07/11 06:58:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/rainbowcrack/ChangeLog,v 1.16 2010/10/13 13:32:09 c1pher Exp $
+
+*rainbowcrack-1.2-r2 (13 Oct 2010)
+
+  13 Oct 2010; Dane Smith <c1pher@gentoo.org> +rainbowcrack-1.2-r2.ebuild,
+  +files/rainbowcrack-1.2-makefile-asneeded.patch:
+  Revision bump for rainbowcrack. Addresses lack of LDFLAGS respect wrt bug
+  #331877.
 
   11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
   rainbowcrack-1.2-r1.ebuild, +files/rainbowcrack-1.2-openssl-1.patch:
-  Fix building with OpenSSL >= 1.0.0 wrt #327373 by Diego E. Pettenò.
+  Fix building with OpenSSL >= 1.0.0 wrt #327373 by Diego E. Pettenò.
 
   29 Mar 2009; Patrick Lauer <patrick@gentoo.org>
   rainbowcrack-1.2-r1.ebuild:
@@ -14,7 +21,7 @@
   +files/rainbowcrack-1.2-asneeded.patch, rainbowcrack-1.2-r1.ebuild:
   QA: Fixed compilation with forced --as-needed (bug 246871)
 
-  14 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+  14 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   +files/rainbowcrack-1.2+gcc-4.3.patch, rainbowcrack-1.2-r1.ebuild:
   Add patch to build with GCC 4.3, thanks to Bert Karwatzki in bug #250623.
 
@@ -33,7 +40,7 @@
   11 Nov 2007; Samuli Suominen <drac@gentoo.org> rainbowcrack-1.2-r1.ebuild:
   amd64 stable wrt #198673
 
-  11 Nov 2007; Dawid Węgliński <cla@gentoo.org> ChangeLog:
+  11 Nov 2007; Dawid Węgliński <cla@gentoo.org> ChangeLog:
   Stable on x86 (bug #198673)
 
 *rainbowcrack-1.2-r1 (01 Nov 2006)
diff --git a/app-crypt/rainbowcrack/files/rainbowcrack-1.2-makefile-asneeded.patch b/app-crypt/rainbowcrack/files/rainbowcrack-1.2-makefile-asneeded.patch
new file mode 100644
index 000000000000..d8073297f6a5
--- /dev/null
+++ b/app-crypt/rainbowcrack/files/rainbowcrack-1.2-makefile-asneeded.patch
@@ -0,0 +1,29 @@
+--- makefile.linux	2003-11-16 22:38:20.000000000 -0500
++++ Makefile	2010-08-09 13:10:59.000000000 -0400
+@@ -1,14 +1,18 @@
++OBJS = Public.o ChainWalkContext.o ChainWalkSet.o CrackEngine.o HashAlgorithm.o HashSet.o HashRoutine.o MemoryPool.o RainbowCrack.o RainbowTableDump.o RainbowTableGenerate.o RainbowTableSort.o
+ 
+ all: rtgen rtdump rtsort rcrack
+ 
+-rtgen:
+-	g++ Public.cpp ChainWalkContext.cpp HashAlgorithm.cpp HashRoutine.cpp RainbowTableGenerate.cpp -lssl -O3 -o rtgen
++rtgen: $(OBJS)
++	$(CXX) $(LDFLAGS) Public.o ChainWalkContext.o HashAlgorithm.o HashRoutine.o RainbowTableGenerate.o -lssl -lcrypto -o rtgen
+ 
+-rtdump:
+-	g++ Public.cpp ChainWalkContext.cpp HashAlgorithm.cpp HashRoutine.cpp RainbowTableDump.cpp -lssl -o rtdump
++rtdump: $(OBJS)
++	$(CXX) $(LDFLAGS) Public.o ChainWalkContext.o HashAlgorithm.o HashRoutine.o RainbowTableDump.o -lssl -lcrypto -o rtdump
+ 
+-rtsort:
+-	g++ Public.cpp RainbowTableSort.cpp -o rtsort
++rtsort: $(OBJS)
++	$(CXX) $(LDFLAGS) Public.o RainbowTableSort.o -o rtsort
+ 
+-rcrack:
+-	g++ Public.cpp ChainWalkContext.cpp HashAlgorithm.cpp HashRoutine.cpp HashSet.cpp MemoryPool.cpp ChainWalkSet.cpp CrackEngine.cpp RainbowCrack.cpp -lssl -O3 -o rcrack
++rcrack: $(OBJS)
++	$(CXX) $(LDFLAGS) Public.o ChainWalkContext.o HashAlgorithm.o HashRoutine.o HashSet.o MemoryPool.o ChainWalkSet.o CrackEngine.o RainbowCrack.o -lssl -lcrypto -o rcrack
++
++clean:
++	rm -f $(OBJS) rtgen rtdump rtsort rcrack
diff --git a/app-crypt/rainbowcrack/rainbowcrack-1.2-r2.ebuild b/app-crypt/rainbowcrack/rainbowcrack-1.2-r2.ebuild
new file mode 100644
index 000000000000..69deff17a7d9
--- /dev/null
+++ b/app-crypt/rainbowcrack/rainbowcrack-1.2-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/rainbowcrack/rainbowcrack-1.2-r2.ebuild,v 1.1 2010/10/13 13:32:09 c1pher Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Hash cracker that precomputes plaintext - ciphertext pairs in advance"
+HOMEPAGE="http://project-rainbowcrack.com/"
+
+SRC_URI="http://project-rainbowcrack.com/${P}-src.zip
+	http://http://project-rainbowcrack.com/${P}-src-algorithmpatch.zip"
+
+LICENSE="as-is"
+SLOT="0"
+# contains ix86 ASM
+KEYWORDS="-* ~amd64 ~x86"
+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-asneeded.patch" \
+		"${FILESDIR}/${P}-share.patch" \
+		"${FILESDIR}/${P}-types.patch" \
+		"${FILESDIR}/${P}+gcc-4.3.patch" \
+		"${FILESDIR}/${P}-openssl-1.patch"
+	sed -i "s#@@SHARE@@#/usr/share/${P}#g" ChainWalkContext.cpp || die
+}
+
+src_compile() {
+	# No ./configure script so we assume md2.h is missing if OpenSSL >= 1.0.0
+	has_version ">=dev-libs/openssl-1.0.0" && append-flags -Dno_md2_h
+	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 || die "dobin failed"
+	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/
+}