From da27491b158b24a34763d50ba3dc42536fa52b78 Mon Sep 17 00:00:00 2001
From: stacktic <stacktic>
Date: Tue, 30 Dec 2008 15:13:28 +0000
Subject: Fixed build (removed whirlpool) (ok by wiz)

---
 security/qca2-ossl/Makefile         |  4 ++--
 security/qca2-ossl/distinfo         |  3 ++-
 security/qca2-ossl/patches/patch-aa | 29 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 security/qca2-ossl/patches/patch-aa

(limited to 'security/qca2-ossl')

diff --git a/security/qca2-ossl/Makefile b/security/qca2-ossl/Makefile
index 95bc9cb193d..4cbc3f9d74e 100644
--- a/security/qca2-ossl/Makefile
+++ b/security/qca2-ossl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2008/01/18 05:09:41 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2008/12/30 15:13:28 stacktic Exp $
 
 DISTNAME=	qca-ossl-2.0.0-beta3
 PKGNAME=	qca2-ossl-${DISTNAME:S/-beta/beta/:C/.*-//}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://delta.affinix.com/download/qca/2.0/plugins/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/security/qca2-ossl/distinfo b/security/qca2-ossl/distinfo
index d309e537e76..9305d91a2f0 100644
--- a/security/qca2-ossl/distinfo
+++ b/security/qca2-ossl/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/12/20 20:20:17 jdolecek Exp $
+$NetBSD: distinfo,v 1.2 2008/12/30 15:13:28 stacktic Exp $
 
 SHA1 (qca-ossl-2.0.0-beta3.tar.bz2) = dd925e8732ff76f24f9f90f4094abaf2f0ac27bf
 RMD160 (qca-ossl-2.0.0-beta3.tar.bz2) = c979c3c3427eb45e8866e28746f83966e8bcf3c2
 Size (qca-ossl-2.0.0-beta3.tar.bz2) = 49188 bytes
+SHA1 (patch-aa) = 30059ab5aa0a71382da68159fc7779a7a2663c7d
diff --git a/security/qca2-ossl/patches/patch-aa b/security/qca2-ossl/patches/patch-aa
new file mode 100644
index 00000000000..494c5d97954
--- /dev/null
+++ b/security/qca2-ossl/patches/patch-aa
@@ -0,0 +1,29 @@
+$NetBSD: patch-aa,v 1.1 2008/12/30 15:13:28 stacktic Exp $
+
+--- qca-ossl.cpp.orig	2007-12-11 07:34:57.000000000 +0100
++++ qca-ossl.cpp
+@@ -6597,9 +6597,11 @@ static QStringList all_hash_types()
+ #ifdef SHA512_DIGEST_LENGTH
+ 	list += "sha512";
+ #endif
++/*
+ #ifdef OBJ_whirlpool
+ 	list += "whirlpool";
+ #endif
++*/
+ 	return list;
+ }
+ 
+@@ -6810,10 +6812,12 @@ public:
+ 		else if ( type == "sha512" )
+ 			return new opensslHashContext( EVP_sha512(), this, type);
+ #endif
++/*
+ #ifdef OBJ_whirlpool
+ 		else if ( type == "whirlpool" )
+ 			return new opensslHashContext( EVP_whirlpool(), this, type);
+ #endif
++*/
+ 		else if ( type == "pbkdf1(sha1)" )
+ 			return new opensslPbkdf1Context( EVP_sha1(), this, type );
+ 		else if ( type == "pbkdf1(md2)" )
-- 
cgit v1.2.3