Try to fix compilation for older OpenSSL and NetBSD -current.

Remove BROKEN_IN.

3 files changed, 30 insertions, 11 deletions

diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 0864d7af82f..8c5e8fb830c 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2006/03/09 21:04:42 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2006/03/13 21:20:24 joerg Exp $
 
 DISTNAME=	pwlib-v1_8_3-src
 PKGNAME=	pwlib-1.8.3
@@ -11,8 +11,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/openh323/
 COMMENT=	Portable Windows Libary
 
-BROKEN_IN=	pkgsrc-2005Q4
-
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
 WRKSRC=			${WRKDIR}/pwlib
diff --git a/devel/pwlib/distinfo b/devel/pwlib/distinfo
index 0e3bdbb887d..6ebf834bdaf 100644
--- a/devel/pwlib/distinfo
+++ b/devel/pwlib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2006/01/08 04:57:55 joerg Exp $
+$NetBSD: distinfo,v 1.17 2006/03/13 21:20:24 joerg Exp $
 
 SHA1 (pwlib-v1_8_3-src-tar.gz) = d3a6eff571ebfd37889e75cbaef75983e6119d2e
 RMD160 (pwlib-v1_8_3-src-tar.gz) = 1ce2544ef631c8344543e62988f97022c998bb05
@@ -26,6 +26,6 @@ SHA1 (patch-at) = 87bbff9a5426c18c3e8407406b244eef2413cdbd
 SHA1 (patch-au) = 4947ee29e91c84f39a370ebc128c1e67737234d1
 SHA1 (patch-av) = 2bb533f6a29f10d357aed1b12c0bfc43af8a4f3b
 SHA1 (patch-aw) = 236cb19fc7f0b78055b0634b3821c099318abb9f
-SHA1 (patch-ba) = de2f2b6267a561e59951b4787d683c346953fe26
+SHA1 (patch-ba) = 3abd3cc7f323e428843c574e9729ae0005bd5fa2
 SHA1 (patch-bb) = 03345fade582539c3b7332f14f1956686ad15289
 SHA1 (patch-bd) = 2d2fb1c6772a1e015cc1bceeb27fda39f57f5acc
diff --git a/devel/pwlib/patches/patch-ba b/devel/pwlib/patches/patch-ba
index 4c3b2bebfbc..7f26f842401 100644
--- a/devel/pwlib/patches/patch-ba
+++ b/devel/pwlib/patches/patch-ba
@@ -1,56 +1,77 @@
-$NetBSD: patch-ba,v 1.3 2006/01/08 04:57:55 joerg Exp $
+$NetBSD: patch-ba,v 1.4 2006/03/13 21:20:24 joerg Exp $
 
 --- src/ptclib/pssl.cxx.orig	2004-10-09 13:31:30.000000000 +0200
 +++ src/ptclib/pssl.cxx	2004-10-09 13:33:39.000000000 +0200
-@@ -297,14 +297,14 @@ PSSLPrivateKey::PSSLPrivateKey(const PFi
+@@ -297,14 +297,22 @@ PSSLPrivateKey::PSSLPrivateKey(const PFi
  
  PSSLPrivateKey::PSSLPrivateKey(const BYTE * keyData, PINDEX keySize)
  {
 -  key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyData, keySize);
++#if OPENSSL_VERSION_NUMBER >= 0x00908000L
 +  key = d2i_AutoPrivateKey(NULL, &keyData, keySize);
++#else
++  key = d2i_AutoPrivateKey(NULL, (BYE **)&keyData, keySize);
++#endif
  }
  
  
  PSSLPrivateKey::PSSLPrivateKey(const PBYTEArray & keyData)
  {
++#if OPENSSL_VERSION_NUMBER >= 0x00908000L
    const BYTE * keyPtr = keyData;
 -  key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyPtr, keyData.GetSize());
++#else
++  BYTE * keyPtr = (BYTE *)keyData;
++#endif
 +  key = d2i_AutoPrivateKey(NULL, &keyPtr, keyData.GetSize());
  }
  
  
-@@ -472,14 +472,14 @@ PSSLCertificate::PSSLCertificate(const P
+@@ -472,14 +480,22 @@ PSSLCertificate::PSSLCertificate(const P
  
  PSSLCertificate::PSSLCertificate(const BYTE * certData, PINDEX certSize)
  {
 -  certificate = d2i_X509(NULL, (unsigned char **)&certData, certSize);
++#if OPENSSL_VERSION_NUMBER >= 0x00908000L
 +  certificate = d2i_X509(NULL, &certData, certSize);
++#else
++  certificate = d2i_X509(NULL, (BYTE **)&certData, certSize);
++#endif
  }
  
  
  PSSLCertificate::PSSLCertificate(const PBYTEArray & certData)
  {
++#if OPENSSL_VERSION_NUMBER >= 0x00908000L
    const BYTE * certPtr = certData;
 -  certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize());
++#else
++  BYTE * certPtr = (BYTE *)certData;
++#endif
 +  certificate = d2i_X509(NULL, &certPtr, certData.GetSize());
  }
  
  
-@@ -489,7 +489,7 @@ PSSLCertificate::PSSLCertificate(const P
+@@ -488,8 +504,12 @@ PSSLCertificate::PSSLCertificate(const P
+   PBYTEArray certData;
    PBase64::Decode(certStr, certData);
    if (certData.GetSize() > 0) {
++#if OPENSSL_VERSION_NUMBER >= 0x00908000L
      const BYTE * certPtr = certData;
 -    certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize());
++#else
++    BYTE * certPtr = (BYTE **)certData;
++#endif
 +    certificate = d2i_X509(NULL, &certPtr, certData.GetSize());
    }
    else
      certificate = NULL;
-@@ -743,7 +743,7 @@ PSSLDiffieHellman::~PSSLDiffieHellman()
+@@ -743,7 +763,7 @@ PSSLDiffieHellman::~PSSLDiffieHellman()
      DH_free(dh);
  }
  
 -#ifdef __BEOS__
-+#if defined(__BEOS__) || defined(__NetBSD__)
++#if defined(__BEOS__) || (defined(__NetBSD__) && OPENSSL_VERSION_NUMBER < 0x00908000L)
  // 2/21/04 Yuri Kiryanov - fix for compiler choke on BeOS for usage of
  // SSL function d2i_DHparams_bio below in PSSLDiffieHellman::Load
  #undef  d2i_DHparams_bio