move back to version 1.0 for security/qca and re-add security/qca-tls

(for qca 1.x), so that kdenetwork3 works again

XXX these should be renamed to qca1* after current freeze

10 files changed, 118 insertions, 39 deletions

diff --git a/security/qca-tls/DESCR b/security/qca-tls/DESCR
new file mode 100644
index 00000000000..7389c8bcb16
--- /dev/null
+++ b/security/qca-tls/DESCR
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 00000000000..89a0818b74b
--- /dev/null
+++ b/security/qca-tls/Makefile
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.22 2007/12/20 20:37:24 jdolecek Exp $
+
+DISTNAME=	qca-tls-1.0
+PKGREVISION=	# empty
+CATEGORIES=	security
+MASTER_SITES=	${MASTER_SITE_SOURCEFORCE:=psi/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	jdolecek@NetBSD.org
+HOMEPAGE=	http://delta.affinix.com/qca/
+COMMENT=	Cross-platform crypto API for QT
+
+USE_BUILDLINK3=	yes
+USE_GNU_TOOLS+=	make
+USE_LIBTOOL=	yes
+USE_X11=	yes
+HAS_CONFIGURE=	yes
+
+post-configure:
+	cd ${WRKSRC} && (	\
+		${QTDIR}/bin/qmake qca-tls.pro -o Makefile.orig;	\
+		${SED} -e "s,-rpath .*,-rpath ${QTDIR}/lib," Makefile.orig > Makefile;	\
+	)
+		
+do-install:
+	${INSTALL_DATA_DIR} ${QTDIR}/plugins/crypto
+	cd ${WRKSRC} && \
+	libtool --mode=install ${INSTALL_LIB} libqca-tls.la ${QTDIR}/plugins/crypto
+
+.include "../../security/openssl/buildlink3.mk"
+.include "../../x11/qt3-libs/buildlink3.mk"
+BUILDLINK_DEPMETHOD.qt3-tools=	build
+.include "../../x11/qt3-tools/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/qca-tls/PLIST b/security/qca-tls/PLIST
new file mode 100644
index 00000000000..368372365e4
--- /dev/null
+++ b/security/qca-tls/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.3 2007/12/20 20:37:25 jdolecek Exp $
+qt3/plugins/crypto/libqca-tls.la
+@dirrm qt3/plugins/crypto
diff --git a/security/qca-tls/distinfo b/security/qca-tls/distinfo
new file mode 100644
index 00000000000..1a6928b7331
--- /dev/null
+++ b/security/qca-tls/distinfo
@@ -0,0 +1,4 @@
+$NetBSD: distinfo,v 1.8 2007/12/20 20:37:26 jdolecek Exp $
+
+SHA1 (qca-tls-1.0.tar.bz2) = 775e764c5be342048eba11dae5c5fd3b636d23c5
+Size (qca-tls-1.0.tar.bz2) = 23489 bytes
diff --git a/security/qca-tls/patches/patch-aa b/security/qca-tls/patches/patch-aa
new file mode 100644
index 00000000000..b508b4435b4
--- /dev/null
+++ b/security/qca-tls/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.4 2007/12/20 20:37:27 jdolecek Exp $
+
+--- configure.orig	2004-12-19 09:10:21.000000000 +0000
++++ configure	2004-12-19 09:20:50.000000000 +0000
+@@ -144,8 +144,10 @@
+ 
+ 		s = conf->getenv("QC_WITH_OPENSSL_LIB");
+ 		if(!s.isEmpty()) {
++			/*
+ 			if(!conf->checkLibrary(s, "ssl"))
+ 				return false;
++			*/
+ 			lib = s;
+ 		}
+ 		else {
diff --git a/security/qca-tls/patches/patch-ab b/security/qca-tls/patches/patch-ab
new file mode 100644
index 00000000000..2b53de120ff
--- /dev/null
+++ b/security/qca-tls/patches/patch-ab
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.4 2007/12/20 20:37:27 jdolecek 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;
++#ifdef OSSL_097
++				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)
+ 	{
++#ifdef OSSL_097
++		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;
diff --git a/security/qca/Makefile b/security/qca/Makefile
index 270bda765fe..fe8ed0972e9 100644
--- a/security/qca/Makefile
+++ b/security/qca/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2007/12/19 13:01:36 jdolecek Exp $
+# $NetBSD: Makefile,v 1.15 2007/12/20 20:37:21 jdolecek Exp $
 
-DISTNAME=	qca-2.0.0
+DISTNAME=	qca-1.0
+PKGREVISION=	3
 CATEGORIES=	security
-MASTER_SITES=	http://delta.affinix.com/download/qca/2.0/
+MASTER_SITES=	http://delta.affinix.com/qca/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jdolecek@NetBSD.org
@@ -16,6 +17,7 @@ USE_LANGUAGES=	c++
 
 INSTALLATION_DIRS=	include lib
 
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/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/PLIST b/security/qca/PLIST
index d7b2c0442ca..57d562002fe 100644
--- a/security/qca/PLIST
+++ b/security/qca/PLIST
@@ -1,26 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2007/12/19 13:01:36 jdolecek Exp $
-include/QtCrypto/QtCrypto
-include/QtCrypto/qca.h
-include/QtCrypto/qca_basic.h
-include/QtCrypto/qca_cert.h
-include/QtCrypto/qca_core.h
-include/QtCrypto/qca_export.h
-include/QtCrypto/qca_keystore.h
-include/QtCrypto/qca_publickey.h
-include/QtCrypto/qca_securelayer.h
-include/QtCrypto/qca_securemessage.h
-include/QtCrypto/qca_support.h
-include/QtCrypto/qca_textfilter.h
-include/QtCrypto/qca_tools.h
-include/QtCrypto/qcaprovider.h
-include/QtCrypto/qpipe.h
+@comment $NetBSD: PLIST,v 1.3 2007/12/20 20:37:22 jdolecek Exp $
+include/qca.h
 lib/libqca.la
-lib/libqca.prl
-lib/pkgconfig/qca2.pc
-qt4/mkspecs/features/crypto.prf
-share/man/man1/qcatool2.1
-share/qca/certs/README
-share/qca/certs/rootcerts.pem
-@dirrm share/qca/certs
-@dirrm share/qca
-@dirrm include/QtCrypto
diff --git a/security/qca/buildlink3.mk b/security/qca/buildlink3.mk
index 8d8fab05379..316589f0045 100644
--- a/security/qca/buildlink3.mk
+++ b/security/qca/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/12/19 13:01:36 jdolecek Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2007/12/20 20:37:22 jdolecek Exp $
 #
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 QCA_BUILDLINK3_MK:=	${QCA_BUILDLINK3_MK}+
@@ -12,12 +12,12 @@ BUILDLINK_PACKAGES+=	qca
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qca
 
 .if !empty(QCA_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.qca+=	qca>=2.0.0
-BUILDLINK_ABI_DEPENDS.qca?=	qca>=2.0.0
+BUILDLINK_API_DEPENDS.qca+=	qca>=1.0
+BUILDLINK_ABI_DEPENDS.qca?=	qca>=1.0nb3
 BUILDLINK_PKGSRCDIR.qca?=	../../security/qca
 .endif	# QCA_BUILDLINK3_MK
 
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../x11/qt3-tools/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/qca/distinfo b/security/qca/distinfo
index df6598e2e97..53c8fc4446d 100644
--- a/security/qca/distinfo
+++ b/security/qca/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2007/12/19 13:01:36 jdolecek Exp $
+$NetBSD: distinfo,v 1.4 2007/12/20 20:37:22 jdolecek Exp $
 
-SHA1 (qca-2.0.0.tar.bz2) = 5b896647426637e1974703f2950786746408c70b
-RMD160 (qca-2.0.0.tar.bz2) = 256ca518fea507d03b67c0f5d26ba2ac7b3db517
-Size (qca-2.0.0.tar.bz2) = 5106520 bytes
+SHA1 (qca-1.0.tar.bz2) = b4b166f9dbbe222ebaf5287582a0ba29ddbc1391
+RMD160 (qca-1.0.tar.bz2) = 129d8eeed68fb98e9cba94040b8f75b9f94c8a60
+Size (qca-1.0.tar.bz2) = 30677 bytes