From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Feb 16 05:30:07 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A96A16A420 for ; Thu, 16 Feb 2006 05:30:07 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9D3243D45 for ; Thu, 16 Feb 2006 05:30:06 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k1G5U6qZ005931 for ; Thu, 16 Feb 2006 05:30:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k1G5U6Ws005930; Thu, 16 Feb 2006 05:30:06 GMT (envelope-from gnats) Resent-Date: Thu, 16 Feb 2006 05:30:06 GMT Resent-Message-Id: <200602160530.k1G5U6Ws005930@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Diane Bruce Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF8A716A420; Thu, 16 Feb 2006 05:28:11 +0000 (GMT) (envelope-from db@db.net) Received: from heceta.db.net (heceta.db.net [142.46.199.182]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BD9C43D45; Thu, 16 Feb 2006 05:28:11 +0000 (GMT) (envelope-from db@db.net) Received: from db by heceta.db.net with local (Exim 4.24; FreeBSD 4.8) id 1F9bgY-000NqS-Ch; Thu, 16 Feb 2006 00:28:10 -0500 Message-Id: Date: Thu, 16 Feb 2006 00:28:10 -0500 From: Diane Bruce To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: ports@FreeBSD.org Subject: ports/93418: [PATCH] devel/pwlib152: [SUMMARIZE CHANGES] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Feb 2006 05:30:07 -0000 >Number: 93418 >Category: ports >Synopsis: [PATCH] devel/pwlib152: [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Feb 16 05:30:06 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Diane Bruce >Release: FreeBSD 4.11-RELEASE-p9 i386 >Organization: >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 --- >Release-Note: >Audit-Trail: >Unformatted: