[pkgsrc/trunk]: pkgsrc/security/qca-tls Improve previous patch to still build...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d5f7e4a0f5ef
branches:  trunk
changeset: 542721:d5f7e4a0f5ef
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun May 25 21:50:45 2008 +0000

description:
Improve previous patch to still build on NetBSD 4.0 branch.
Addresses PR 38744.

diffstat:

 security/qca-tls/distinfo         |   4 ++--
 security/qca-tls/patches/patch-ab |  11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diffs (43 lines):

diff -r 8118399f8a10 -r d5f7e4a0f5ef security/qca-tls/distinfo
--- a/security/qca-tls/distinfo Sun May 25 21:42:20 2008 +0000
+++ b/security/qca-tls/distinfo Sun May 25 21:50:45 2008 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2008/05/15 11:06:05 wiz Exp $
+$NetBSD: distinfo,v 1.11 2008/05/25 21:50:45 wiz 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) = 27db22ca8bd5b0678a077b41f5505669311956b0
+SHA1 (patch-ab) = 6f17140b26669208b30e1e829816c6ffe9d98b0c
diff -r 8118399f8a10 -r d5f7e4a0f5ef security/qca-tls/patches/patch-ab
--- a/security/qca-tls/patches/patch-ab Sun May 25 21:42:20 2008 +0000
+++ b/security/qca-tls/patches/patch-ab Sun May 25 21:50:45 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2008/05/15 11:06:05 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2008/05/25 21:50:45 wiz Exp $
 
---- qca-tls.cpp.orig   2003-12-10 16:53:57.000000000 +0000
+--- qca-tls.cpp.orig   2003-12-10 17:53:57.000000000 +0100
 +++ qca-tls.cpp
 @@ -454,7 +454,11 @@ public:
                        if(!r) {
@@ -26,12 +26,15 @@
                X509 *t = d2i_X509(NULL, &p, len);
                if(!t)
                        return false;
-@@ -945,7 +953,7 @@ public:
+@@ -945,7 +953,11 @@ public:
        RSAKeyContext *key;
  
        SSL *ssl;
--      SSL_METHOD *method;
++#if OPENSSL_VERSION_NUMBER < 0x00909000L
+       SSL_METHOD *method;
++#else
 +      const SSL_METHOD *method;
++#endif
        SSL_CTX *context;
        BIO *rbio, *wbio;
        CertContext cc;