Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 Feb 2006 00:28:10 -0500
From:      Diane Bruce <db@db.net>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        ports@FreeBSD.org
Subject:   [PATCH] devel/pwlib152: [SUMMARIZE CHANGES]
Message-ID:  <E1F9bgY-000NqS-Ch@heceta.db.net>

next in thread | raw e-mail | index | archive | help

>Submitter-Id:	current-users
>Originator:	Diane Bruce
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] devel/pwlib152: [SUMMARIZE CHANGES]
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 4.11-RELEASE-p9 i386
>Environment:
System: FreeBSD heceta.db.net 4.11-RELEASE-p9 FreeBSD 4.11-RELEASE-p9 #4: Tue May 17 16:07:52 EDT 2005
>Description:
[DESCRIBE CHANGES]

This port breaks if ports version of openssl is used due to an API change 
There also now seems to be only one working distribution site.

Added file(s):
- files/patch-src_ptclib_pssl.cxx

Port maintainer (ports@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- pwlib152-1.5.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/pwlib152/Makefile /usr/home/db/pwlib152/Makefile
--- /usr/ports/devel/pwlib152/Makefile	Tue Feb 14 14:42:06 2006
+++ /usr/home/db/pwlib152/Makefile	Thu Feb 16 00:27:02 2006
@@ -8,12 +8,10 @@
 PORTNAME=	pwlib152
 PORTVERSION=	1.5.2
 CATEGORIES=	devel
-MASTER_SITES=	http://www.openh323.org/bin/ \
-		http://www.de.openh323.org/bin/ \
-		http://www.gnomemeeting.org/downloads/0.98.0/sources/
+MASTER_SITES=	http://www.openh323.org/bin/
 DISTNAME=	${NAME}_${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	db@db.net
 COMMENT=	A cross platform C++ library, used by OpenH323
 
 LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2
diff -ruN --exclude=CVS /usr/ports/devel/pwlib152/files/patch-src_ptclib_pssl.cxx /usr/home/db/pwlib152/files/patch-src_ptclib_pssl.cxx
--- /usr/ports/devel/pwlib152/files/patch-src_ptclib_pssl.cxx	Wed Dec 31 19:00:00 1969
+++ /usr/home/db/pwlib152/files/patch-src_ptclib_pssl.cxx	Wed Feb 15 23:55:25 2006
@@ -0,0 +1,58 @@
+--- src/ptclib/pssl.cxx.orig	Wed Apr 16 04:00:19 2003
++++ src/ptclib/pssl.cxx	Wed Feb 15 23:54:42 2006
+@@ -285,14 +285,22 @@
+ 
+ PSSLPrivateKey::PSSLPrivateKey(const BYTE * keyData, PINDEX keySize)
+ {
++#if (OPENSSL_VERSION_NUMBER < 0x0090801f)
+   key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyData, keySize);
++#else
++  key = d2i_AutoPrivateKey(NULL, (const unsigned char **)&keyData, keySize);
++#endif
+ }
+ 
+ 
+ PSSLPrivateKey::PSSLPrivateKey(const PBYTEArray & keyData)
+ {
+   const BYTE * keyPtr = keyData;
++#if (OPENSSL_VERSION_NUMBER < 0x0090801f)
+   key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyPtr, keyData.GetSize());
++#else
++  key = d2i_AutoPrivateKey(NULL, (const unsigned char **)&keyPtr, keyData.GetSize());
++#endif
+ }
+ 
+ 
+@@ -460,14 +468,22 @@
+ 
+ PSSLCertificate::PSSLCertificate(const BYTE * certData, PINDEX certSize)
+ {
++#if (OPENSSL_VERSION_NUMBER < 0x0090801f)
+   certificate = d2i_X509(NULL, (unsigned char **)&certData, certSize);
++#else
++  certificate = d2i_X509(NULL, (const unsigned char **)&certData, certSize);
++#endif
+ }
+ 
+ 
+ PSSLCertificate::PSSLCertificate(const PBYTEArray & certData)
+ {
+   const BYTE * certPtr = certData;
++#if (OPENSSL_VERSION_NUMBER < 0x0090801f)
+   certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize());
++#else
++  certificate = d2i_X509(NULL, (const unsigned char **)&certPtr, certData.GetSize());
++#endif
+ }
+ 
+ 
+@@ -477,7 +493,8 @@
+   PBase64::Decode(certStr, certData);
+   if (certData.GetSize() > 0) {
+     const BYTE * certPtr = certData;
+-    certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize());
++//    certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize());
++    certificate = d2i_X509(NULL, (const unsigned char **)&certPtr, certData.GetSize());
+   }
+   else
+     certificate = NULL;
--- pwlib152-1.5.2.patch ends here ---




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1F9bgY-000NqS-Ch>