[pkgsrc/trunk]: pkgsrc/devel/ptlib gcc6 build fix and deal with an openssl th...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5f986dfaa250
branches:  trunk
changeset: 349805:5f986dfaa250
user:      markd <markd%pkgsrc.org@localhost>
date:      Sat Jul 16 03:23:50 2016 +0000

description:
gcc6 build fix and deal with an openssl that has OPENSSL_NO_SSL3 set

diffstat:

 devel/ptlib/distinfo                             |   4 +++-
 devel/ptlib/patches/patch-src_ptclib_pssl.cxx    |  22 ++++++++++++++++++++++
 devel/ptlib/patches/patch-src_ptclib_pxmlrpc.cxx |  15 +++++++++++++++
 3 files changed, 40 insertions(+), 1 deletions(-)

diffs (63 lines):

diff -r 8fdc13ff4697 -r 5f986dfaa250 devel/ptlib/distinfo
--- a/devel/ptlib/distinfo      Sat Jul 16 03:08:19 2016 +0000
+++ b/devel/ptlib/distinfo      Sat Jul 16 03:23:50 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2015/11/03 03:29:04 agc Exp $
+$NetBSD: distinfo,v 1.21 2016/07/16 03:23:50 markd Exp $
 
 SHA1 (ptlib-2.10.7.tar.xz) = 51077b76aed30ab614e31b2a18cb383848d4332c
 RMD160 (ptlib-2.10.7.tar.xz) = 0c05b57f5435f4646af05278e66718e0e433a10a
@@ -19,6 +19,8 @@
 SHA1 (patch-plugins_vidinput_bsd_vidinput_bsd.h) = dd965232d9645cd12a866e597828bdf8da7cb389
 SHA1 (patch-src-unix-tlibthrd.cxx) = 0617f208b98ffe85730f411fb8494407e8c6324d
 SHA1 (patch-src_ptclib_pldap.cxx) = 791f3a6efeee35efa44d311eb7077bb0bad441f0
+SHA1 (patch-src_ptclib_pssl.cxx) = b8480a23d3ba27afbe966b059183470637a2664a
+SHA1 (patch-src_ptclib_pxmlrpc.cxx) = 11ce9ec39da38ee253b98a5c0d436e5f9704fe9f
 SHA1 (patch-src_ptlib_common_getdate.y) = 5ebd077d0552b8667d4bea3b59ed8daabeecd8a0
 SHA1 (patch-src_ptlib_unix_svcproc.cxx) = 0fbaa6a2bde07625b8b826b7134d6e1a946f686c
 SHA1 (patch-unix-config.cxx) = 6127f91bc04d7f008087ebdb9a2fbd1dbb41fd19
diff -r 8fdc13ff4697 -r 5f986dfaa250 devel/ptlib/patches/patch-src_ptclib_pssl.cxx
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ptlib/patches/patch-src_ptclib_pssl.cxx     Sat Jul 16 03:23:50 2016 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_ptclib_pssl.cxx,v 1.1 2016/07/16 03:23:50 markd Exp $
+
+--- src/ptclib/pssl.cxx.orig   2012-08-23 02:12:41.000000000 +0000
++++ src/ptclib/pssl.cxx
+@@ -805,12 +805,17 @@ void PSSLContext::Construct(Method metho
+   SSL_METHOD * meth;
+ 
+   switch (method) {
++#ifndef OPENSSL_NO_SSL3
+     case SSLv3:
+       meth = SSLv3_method();
+       break;
++#endif
+     case TLSv1:
+       meth = TLSv1_method(); 
+       break;
++#ifdef OPENSSL_NO_SSL3
++    case SSLv3:
++#endif
+     case SSLv23:
+     default:
+       meth = SSLv23_method();
diff -r 8fdc13ff4697 -r 5f986dfaa250 devel/ptlib/patches/patch-src_ptclib_pxmlrpc.cxx
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ptlib/patches/patch-src_ptclib_pxmlrpc.cxx  Sat Jul 16 03:23:50 2016 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_ptclib_pxmlrpc.cxx,v 1.1 2016/07/16 03:23:50 markd Exp $
+
+gcc6 fix
+
+--- src/ptclib/pxmlrpc.cxx.orig        2012-08-23 02:12:41.000000000 +0000
++++ src/ptclib/pxmlrpc.cxx
+@@ -727,7 +727,7 @@ PXMLElement * PXMLRPCBlock::GetParam(PIN
+   }
+ 
+   if (param == NULL)
+-    return PFalse;
++    return NULL;
+ 
+   for (i = 0; i < param->GetSize(); i++) {
+     PXMLObject * parm = param->GetElement(i);