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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 67 insertions, 8 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/Manifest b/app-crypt/rainbowcrack/Manifest
index 5dd74bc286d5..c8a1be444093 100644
--- a/app-crypt/rainbowcrack/Manifest
+++ b/app-crypt/rainbowcrack/Manifest
@@ -1,10 +1,11 @@
 AUX rainbowcrack-1.2+gcc-4.3.patch 2614 RMD160 85f1a03f1a949d73a201dd5c8e950024092332be SHA1 9679029c5a8fe1a7e3ad51d8a8d1aaaab70ea173 SHA256 6746563b8c89e3e09d9e303f39c6d2f7dbe84c2c91422b7d0add3753a0c92fa0
 AUX rainbowcrack-1.2-asneeded.patch 1211 RMD160 4e54024bd065ed65fca7f713528327bd9826ca59 SHA1 a7307793f63127dc715e0f911237314b63694b2b SHA256 20124049250cffcabb6760be6eced24f1fd19fb05b402fc872224ce3192e9c7e
 AUX rainbowcrack-1.2-makefile.patch 1134 RMD160 d485f338a7d420ceb3e4d7fceb3c61c78621c011 SHA1 f34e13a62791609de36be670362aecc8fae2ef01 SHA256 ba9f6240c37b48d2dc1d9bd8c705590818766f8b69355394d690c7be15b61f5c
+AUX rainbowcrack-1.2-openssl-1.patch 1409 RMD160 a5a31333358deb01360eeb58c8cda584598a25cf SHA1 71af69c1cb7a1758fefa147d7ea1b258865626cb SHA256 3eb3455f2908dae4e2d642cf175799d5fce3351adc449f448a41801d7cb275e9
 AUX rainbowcrack-1.2-share.patch 579 RMD160 5831f6872c8fa2affca87741ef03de8e05376e27 SHA1 2b38810045004c9732e93dcb30ddc13fb6e4aa26 SHA256 63d2da05ca27c79e758c87cef42c877a1bf57daa0ae81493b6693cfaf02574e8
 AUX rainbowcrack-1.2-types.patch 299 RMD160 bd0d5e48244c55741398da3b63241515c6e68730 SHA1 54535cd8fc91c6eae4275515bc6aa0010b67200d SHA256 56a99d1593c55484aefe253ed3014a2c3eaca9d62cb6fbc2a550171dc36f0ef2
 DIST rainbowcrack-1.2-src-algorithmpatch.zip 3029 RMD160 3293cfcf69677ca6812333dd97952f0e354ce96a SHA1 22697cc8bbeeded21a1863329a2666e9a6fb1268 SHA256 ccc646087692da1e02b1921f97d6c9d2784534153f4570b62de0f122c4c3b322
 DIST rainbowcrack-1.2-src.zip 44742 RMD160 51fdcf84ebfbe8ebb9e5bc6c3d4452f9d158eb79 SHA1 b077a654133cd108a3c619d66482e1796d56b0dc SHA256 238485eeede5140cfc66b88761ec976b7af8b5557ec5bd4eddbcd98830a34dac
-EBUILD rainbowcrack-1.2-r1.ebuild 1838 RMD160 6cff91892dade4da93ed8fb8f5727ff3850a8de5 SHA1 f6d3e46aecf55597503bf8afa2d7099d98301694 SHA256 6980ba71f67957febfe422c5c7748633e7bb76160bbba4d78881cb2acf720b36
-MISC ChangeLog 2207 RMD160 0d73cc49ce2f220dce071ec6036810cafa589d68 SHA1 b20de6139f9a6ef47db2162d1d2379ff29e1df35 SHA256 02727b1898cfe22ce3802c3d276bca71c5c49e826b2d4ffc013e52988bf0dbb0
+EBUILD rainbowcrack-1.2-r1.ebuild 2034 RMD160 5a229d6e3c3e8b40f43583c64230d58369ea1332 SHA1 a7b34d2af390b92f9bf94fb663c833e3ffd45b39 SHA256 9237d2d671c871959d7f96d778269ba4098902a503aefcdc0bb08bec1eacc1cb
+MISC ChangeLog 2406 RMD160 50a5bdf80f68b6343bd7719c7063386f5e96254f SHA1 f7e0d961848148dd1a80ac4bd4fae920698dee45 SHA256 7023c4263e9cb3a385e92cfdb58127120740536c57a84b7cf619a94eb426d25d
 MISC metadata.xml 988 RMD160 183293dd3ff7a2a9fa4e6d4bf96992a65373a3c6 SHA1 07dc36220f7b4bdd6f6ebbdff3c9c89f358f1de5 SHA256 3a19812834671dc4d343f678fe3c609acd169519d511d01eca82c56e9b0ba041
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"
 }