pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security move back to version 1.0 for security/qca and...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f0187d7183e1
branches: trunk
changeset: 536705:f0187d7183e1
user: jdolecek <jdolecek%pkgsrc.org@localhost>
date: Thu Dec 20 20:37:21 2007 +0000
description:
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
diffstat:
security/qca-tls/DESCR | 16 ++++++++++++++++
security/qca-tls/Makefile | 34 ++++++++++++++++++++++++++++++++++
security/qca-tls/PLIST | 3 +++
security/qca-tls/distinfo | 4 ++++
security/qca-tls/patches/patch-aa | 15 +++++++++++++++
security/qca-tls/patches/patch-ab | 28 ++++++++++++++++++++++++++++
security/qca/Makefile | 12 +++++++-----
security/qca/PLIST | 27 ++-------------------------
security/qca/buildlink3.mk | 10 +++++-----
security/qca/distinfo | 8 ++++----
10 files changed, 118 insertions(+), 39 deletions(-)
diffs (221 lines):
diff -r 8e008f352b4e -r f0187d7183e1 security/qca-tls/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/qca-tls/DESCR Thu Dec 20 20:37:21 2007 +0000
@@ -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 -r 8e008f352b4e -r f0187d7183e1 security/qca-tls/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/qca-tls/Makefile Thu Dec 20 20:37:21 2007 +0000
@@ -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@localhost
+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 -r 8e008f352b4e -r f0187d7183e1 security/qca-tls/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/qca-tls/PLIST Thu Dec 20 20:37:21 2007 +0000
@@ -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 -r 8e008f352b4e -r f0187d7183e1 security/qca-tls/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/qca-tls/distinfo Thu Dec 20 20:37:21 2007 +0000
@@ -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 -r 8e008f352b4e -r f0187d7183e1 security/qca-tls/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/qca-tls/patches/patch-aa Thu Dec 20 20:37:21 2007 +0000
@@ -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 -r 8e008f352b4e -r f0187d7183e1 security/qca-tls/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/qca-tls/patches/patch-ab Thu Dec 20 20:37:21 2007 +0000
@@ -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 -r 8e008f352b4e -r f0187d7183e1 security/qca/Makefile
--- a/security/qca/Makefile Thu Dec 20 20:35:49 2007 +0000
+++ b/security/qca/Makefile Thu Dec 20 20:37:21 2007 +0000
@@ -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@localhost
@@ -16,6 +17,7 @@
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 -r 8e008f352b4e -r f0187d7183e1 security/qca/PLIST
--- a/security/qca/PLIST Thu Dec 20 20:35:49 2007 +0000
+++ b/security/qca/PLIST Thu Dec 20 20:37:21 2007 +0000
@@ -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 -r 8e008f352b4e -r f0187d7183e1 security/qca/buildlink3.mk
--- a/security/qca/buildlink3.mk Thu Dec 20 20:35:49 2007 +0000
+++ b/security/qca/buildlink3.mk Thu Dec 20 20:37:21 2007 +0000
@@ -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_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 -r 8e008f352b4e -r f0187d7183e1 security/qca/distinfo
--- a/security/qca/distinfo Thu Dec 20 20:35:49 2007 +0000
+++ b/security/qca/distinfo Thu Dec 20 20:37:21 2007 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index