From 8f18adc9d874d24199ab874f0ad67b933ca8db03 Mon Sep 17 00:00:00 2001
From: branch-fixup <branch-fixup>
Date: Tue, 30 Dec 2008 15:13:28 +0000
Subject: [PATCH] Add files from parent branch HEAD: 
 security/qca2-ossl/Makefile 	security/qca2-ossl/distinfo 
 security/qca2-ossl/patches/patch-aa

---
 security/qca2-ossl/Makefile         | 26 ++++++++++++++++++++++++++
 security/qca2-ossl/distinfo         |  6 ++++++
 security/qca2-ossl/patches/patch-aa | 29 +++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 security/qca2-ossl/Makefile
 create mode 100644 security/qca2-ossl/distinfo
 create mode 100644 security/qca2-ossl/patches/patch-aa

diff --git a/security/qca2-ossl/Makefile b/security/qca2-ossl/Makefile
new file mode 100644
index 000000000000..4dae82af8602
--- /dev/null
+++ b/security/qca2-ossl/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.3 2008/01/18 05:09:41 tnn Exp $
+
+DISTNAME=	qca-ossl-2.0.0-beta3
+PKGNAME=	qca2-ossl-${DISTNAME:S/-beta/beta/:C/.*-//}
+PKGREVISION=	3
+CATEGORIES=	security
+MASTER_SITES=	http://delta.affinix.com/download/qca/2.0/plugins/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	jdolecek@NetBSD.org
+HOMEPAGE=	http://delta.affinix.com/qca/
+COMMENT=	Cross-platform crypto API for QT - OpenSSL plugin
+
+USE_TOOLS+=	gmake
+USE_LIBTOOL=	yes
+HAS_CONFIGURE=	yes
+USE_LANGUAGES=	c c++
+
+CONFIGURE_ARGS+=	--qtdir=${QTDIR}
+CONFIGURE_ARGS+=	--with-qca=${QTDIR}
+CONFIGURE_ARGS+=	--with-openssl-inc=${SSLBASE}/include
+CONFIGURE_ARGS+=	--with-openssl-lib=${SSLBASE}/lib
+
+.include "../../security/qca2/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/qca2-ossl/distinfo b/security/qca2-ossl/distinfo
new file mode 100644
index 000000000000..84a40b15114f
--- /dev/null
+++ b/security/qca2-ossl/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1.1.1 2007/12/20 20:20:17 jdolecek 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 000000000000..874d8470c38c
--- /dev/null
+++ b/security/qca2-ossl/patches/patch-aa
@@ -0,0 +1,29 @@
+$NetBSD$
+
+--- 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)" )
-- 
2.41.0