remove qca-tls - it's replaced by qca-ossl in QCA 2.x

7 files changed, 1 insertions, 105 deletions

diff --git a/security/Makefile b/security/Makefile
index 3dab83652c6..61dd6df25cc 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.306 2007/10/29 09:58:43 agc Exp $
+# $NetBSD: Makefile,v 1.307 2007/12/19 13:02:11 jdolecek Exp $
 #
 
 COMMENT=	Security tools
@@ -229,7 +229,6 @@ SUBDIR+=	py-prewikka
 SUBDIR+=	py-tlslite
 SUBDIR+=	pyca
 SUBDIR+=	qca
-SUBDIR+=	qca-tls
 SUBDIR+=	qident
 SUBDIR+=	rainbowcrack
 SUBDIR+=	rats
diff --git a/security/qca-tls/DESCR b/security/qca-tls/DESCR
deleted file mode 100644
index 7389c8bcb16..00000000000
--- a/security/qca-tls/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-Taking a hint from the similarly-named Java Cryptography Architecture,
-QCA aims to provide a straightforward and cross-platform crypto
-API, using Qt datatypes and conventions. QCA separates the API from
-the implementation, using plugins known as Providers. The advantage
-of this model is to allow applications to avoid linking to or
-explicitly depending on any particular cryptographic library. This
-allows one to easily change or upgrade crypto implementations
-without even needing to recompile the application. QCA should work
-everywhere Qt does, including Windows/Unix/MacOSX.
-
-Features:
-* SSL/TLS
-* X509
-* RSA
-* Hashing (SHA1, MD5)
-* Ciphers (Blowfish, 3DES, AES)
diff --git a/security/qca-tls/Makefile b/security/qca-tls/Makefile
deleted file mode 100644
index f0c115cb2a3..00000000000
--- a/security/qca-tls/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2007/02/22 19:27:09 wiz Exp $
-
-DISTNAME=	qca-tls-1.0
-PKGREVISION=	3
-CATEGORIES=	security
-MASTER_SITES=	http://delta.affinix.com/download/qca/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	jdolecek@NetBSD.org
-HOMEPAGE=	http://delta.affinix.com/qca/
-COMMENT=	Cross-platform crypto API for QT - TLS plugin
-
-USE_TOOLS+=	gmake
-USE_LIBTOOL=	yes
-HAS_CONFIGURE=	yes
-USE_LANGUAGES=	c c++
-
-CONFIGURE_ARGS+=	--with-openssl-inc=${SSLBASE}/include
-CONFIGURE_ARGS+=	--with-openssl-lib=${SSLBASE}/lib
-
-.include "../../security/openssl/buildlink3.mk"
-.include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_API_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb6
-.include "../../x11/qt3-tools/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/security/qca-tls/PLIST b/security/qca-tls/PLIST
deleted file mode 100644
index 9b52485a50c..00000000000
--- a/security/qca-tls/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/11/27 20:27:07 jdolecek Exp $
-qt3/plugins/crypto/libqca-tls.la
-@dirrm qt3/plugins/crypto
diff --git a/security/qca-tls/distinfo b/security/qca-tls/distinfo
deleted file mode 100644
index c51aaa0e86d..00000000000
--- a/security/qca-tls/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.6 2006/01/31 09:47:04 joerg Exp $
-
-SHA1 (qca-tls-1.0.tar.bz2) = 775e764c5be342048eba11dae5c5fd3b636d23c5
-RMD160 (qca-tls-1.0.tar.bz2) = c553782e77ab54edde7e4f0676a3caad74dfa910
-Size (qca-tls-1.0.tar.bz2) = 23489 bytes
-SHA1 (patch-aa) = 2c28782e3af7ecffa0b5758f1671c0773bc9af03
-SHA1 (patch-ab) = 3d59570c75a52f0ce9850584326ceeb4bf59f08f
diff --git a/security/qca-tls/patches/patch-aa b/security/qca-tls/patches/patch-aa
deleted file mode 100644
index ce3db04262e..00000000000
--- a/security/qca-tls/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/09/13 04:27:21 dmcmahill Exp $
-
---- configure.orig	2003-12-17 17:54:50.000000000 -0500
-+++ configure
-@@ -144,8 +144,10 @@ public:
- 
- 		s = conf->getenv("QC_WITH_OPENSSL_LIB");
- 		if(!s.isEmpty()) {
-+			/*
- 			if(!conf->checkLibrary(s, "ssl"))
- 				return false;
-+			*/
- 			lib = s;
- 		}
- 		else {
-@@ -168,7 +170,7 @@ public:
- 		if(kb)
- 			ext += QString("-I") + kbdir + ' ';
- 		if(!lib.isEmpty())
--			ext += QString("-L") + lib + " -lssl -lcrypto ";
-+			ext += QString("-L") + lib + " " + QString("-R") + lib + " -lssl -lcrypto ";
- 		int ret;
- 		if(!conf->doCompileAndLink(str, ext, &ret))
- 			return false;
diff --git a/security/qca-tls/patches/patch-ab b/security/qca-tls/patches/patch-ab
deleted file mode 100644
index 06835de5d6b..00000000000
--- a/security/qca-tls/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/01/31 09:47:05 joerg Exp $
-
---- qca-tls.cpp.orig	2005-12-27 22:22:32.000000000 +0000
-+++ qca-tls.cpp
-@@ -454,7 +454,11 @@ public:
- 			if(!r) {
- 				// try this other public function, for whatever reason
- 				p = (void *)in;
-+#if OPENSSL_VERSION_NUMBER >= 0x00908000
-+				r = d2i_RSA_PUBKEY(NULL, (const unsigned char **)&p, len);
-+#else
- 				r = d2i_RSA_PUBKEY(NULL, (unsigned char **)&p, len);
-+#endif
- 			}
- 			if(r) {
- 				if(pub) {
-@@ -798,7 +802,11 @@ public:
- 
- 	bool createFromDER(const char *in, unsigned int len)
- 	{
-+#if OPENSSL_VERSION_NUMBER >= 0x00908000
-+		const unsigned char *p = (const unsigned char *)in;
-+#else
- 		unsigned char *p = (unsigned char *)in;
-+#endif
- 		X509 *t = d2i_X509(NULL, &p, len);
- 		if(!t)
- 			return false;