[pkgsrc/trunk]: pkgsrc/security/qca-tls restore security/qca-tls to state on ...

[jdolecek <jdolecek%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/14978b36d619
branches:  trunk
changeset: 536817:14978b36d619
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sun Dec 23 21:05:51 2007 +0000

description:
restore security/qca-tls to state on pkgsrc-2007Q3-base tag (just before
the removal), rather then revision 1.1 of all files, used for original revival

test compiled on Mac OS X 10.5

diffstat:

 security/qca-tls/Makefile         |  33 ++++++++++++---------------------
 security/qca-tls/distinfo         |   5 ++++-
 security/qca-tls/patches/patch-aa |  17 +++++++++++++----
 security/qca-tls/patches/patch-ab |   6 +++---
 4 files changed, 32 insertions(+), 29 deletions(-)

diffs (118 lines):

diff -r 97c493c17f08 -r 14978b36d619 security/qca-tls/Makefile
--- a/security/qca-tls/Makefile Sun Dec 23 16:02:27 2007 +0000
+++ b/security/qca-tls/Makefile Sun Dec 23 21:05:51 2007 +0000
@@ -1,34 +1,25 @@
-# $NetBSD: Makefile,v 1.22 2007/12/20 20:37:24 jdolecek Exp $
+# $NetBSD: Makefile,v 1.23 2007/12/23 21:05:51 jdolecek Exp $
 
 DISTNAME=      qca-tls-1.0
-PKGREVISION=   # empty
+PKGREVISION=   3
 CATEGORIES=    security
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORCE:=psi/}
+MASTER_SITES=  http://delta.affinix.com/download/qca/
 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
+COMMENT=       Cross-platform crypto API for QT - TLS plugin
 
-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
+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_DEPMETHOD.qt3-tools= build
+BUILDLINK_API_DEPENDS.qt3-tools+=      qt3-tools>=3.3.5nb6
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 97c493c17f08 -r 14978b36d619 security/qca-tls/distinfo
--- a/security/qca-tls/distinfo Sun Dec 23 16:02:27 2007 +0000
+++ b/security/qca-tls/distinfo Sun Dec 23 21:05:51 2007 +0000
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.8 2007/12/20 20:37:26 jdolecek Exp $
+$NetBSD: distinfo,v 1.9 2007/12/23 21:05:51 jdolecek 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 -r 97c493c17f08 -r 14978b36d619 security/qca-tls/patches/patch-aa
--- a/security/qca-tls/patches/patch-aa Sun Dec 23 16:02:27 2007 +0000
+++ b/security/qca-tls/patches/patch-aa Sun Dec 23 21:05:51 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2007/12/20 20:37:27 jdolecek Exp $
+$NetBSD: patch-aa,v 1.5 2007/12/23 21:05:51 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 @@
+--- 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()) {
@@ -13,3 +13,12 @@
                        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 -r 97c493c17f08 -r 14978b36d619 security/qca-tls/patches/patch-ab
--- a/security/qca-tls/patches/patch-ab Sun Dec 23 16:02:27 2007 +0000
+++ b/security/qca-tls/patches/patch-ab Sun Dec 23 21:05:51 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2007/12/20 20:37:27 jdolecek Exp $
+$NetBSD: patch-ab,v 1.5 2007/12/23 21:05:51 jdolecek Exp $
 
 --- qca-tls.cpp.orig   2005-12-27 22:22:32.000000000 +0000
 +++ qca-tls.cpp
@@ -6,7 +6,7 @@
                        if(!r) {
                                // try this other public function, for whatever reason
                                p = (void *)in;
-+#ifdef OSSL_097
++#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);
@@ -18,7 +18,7 @@
  
        bool createFromDER(const char *in, unsigned int len)
        {
-+#ifdef OSSL_097
++#if OPENSSL_VERSION_NUMBER >= 0x00908000
 +              const unsigned char *p = (const unsigned char *)in;
 +#else
                unsigned char *p = (unsigned char *)in;