Fix building with OpenSSL >= 1.0.0 wrt #327373 by Diego E. Pettenò.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 64 insertions, 6 deletions

diff --git a/app-crypt/rainbowcrack/ChangeLog b/app-crypt/rainbowcrack/ChangeLog
index 67518d504888..4ef3533b075b 100644
--- a/app-crypt/rainbowcrack/ChangeLog
+++ b/app-crypt/rainbowcrack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/rainbowcrack
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/rainbowcrack/ChangeLog,v 1.14 2009/03/29 13:46:35 patrick Exp $
+# 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 $
+
+  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ò.
 
   29 Mar 2009; Patrick Lauer <patrick@gentoo.org>
   rainbowcrack-1.2-r1.ebuild:
diff --git a/app-crypt/rainbowcrack/files/rainbowcrack-1.2-openssl-1.patch b/app-crypt/rainbowcrack/files/rainbowcrack-1.2-openssl-1.patch
new file mode 100644
index 000000000000..e694e456e57f
--- /dev/null
+++ b/app-crypt/rainbowcrack/files/rainbowcrack-1.2-openssl-1.patch
@@ -0,0 +1,51 @@
+http://bugs.gentoo.org/327373
+
+--- src/HashAlgorithm.cpp
++++ src/HashAlgorithm.cpp
+@@ -9,7 +9,9 @@
+ #include "Public.h"

+ 

+ #include <openssl/des.h>

++#ifndef no_md2_h

+ #include <openssl/md2.h>

++#endif

+ #include <openssl/md4.h>

+ #include <openssl/md5.h>

+ #include <openssl/sha.h>

+@@ -66,10 +68,12 @@
+ 	MD4(UnicodePlain, nPlainLen * 2, pHash);

+ }

+ 

++#ifndef no_md2_h

+ void HashMD2(unsigned char* pPlain, int nPlainLen, unsigned char* pHash)

+ {

+ 	MD2(pPlain, nPlainLen, pHash);

+ }

++#endif

+ 

+ void HashMD4(unsigned char* pPlain, int nPlainLen, unsigned char* pHash)

+ {

+--- src/HashAlgorithm.h
++++ src/HashAlgorithm.h
+@@ -10,7 +10,9 @@
+ void HashLM(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);

+ void HashNTLM(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);

+ 

++#ifndef no_md2_h

+ void HashMD2(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);

++#endif

+ void HashMD4(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);

+ void HashMD5(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);

+ 

+--- src/HashRoutine.cpp
++++ src/HashRoutine.cpp
+@@ -19,7 +19,9 @@
+ 

+ 	AddHashRoutine("lm",   HashLM,   8);

+ 	AddHashRoutine("ntlm", HashNTLM, 16);

++	#ifndef no_md2_h

+ 	AddHashRoutine("md2",  HashMD2,  16);

++	#endif

+ 	AddHashRoutine("md4",  HashMD4,  16);

+ 	AddHashRoutine("md5",  HashMD5,  16);

+ 	AddHashRoutine("sha1", HashSHA1, 20);

diff --git a/app-crypt/rainbowcrack/rainbowcrack-1.2-r1.ebuild b/app-crypt/rainbowcrack/rainbowcrack-1.2-r1.ebuild
index 02ff1c8e7aae..7b8f461fa0bb 100644
--- a/app-crypt/rainbowcrack/rainbowcrack-1.2-r1.ebuild
+++ b/app-crypt/rainbowcrack/rainbowcrack-1.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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-r1.ebuild,v 1.8 2009/03/29 13:46:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/rainbowcrack/rainbowcrack-1.2-r1.ebuild,v 1.9 2010/07/11 06:58:44 ssuominen Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="Hash cracker that precomputes plaintext - ciphertext pairs in advance"
 HOMEPAGE="http://project-rainbowcrack.com/"
@@ -30,11 +30,14 @@ src_unpack() {
 		"${FILESDIR}/${P}-share.patch" \
 		"${FILESDIR}/${P}-types.patch" \
 		"${FILESDIR}/${P}+gcc-4.3.patch" \
-		"${FILESDIR}/${P}-asneeded.patch"
+		"${FILESDIR}/${P}-asneeded.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"
 }