CVS commit: pkgsrc/devel/ptlib

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Jul 16 03:23:51 UTC 2016

Modified Files:
        pkgsrc/devel/ptlib: distinfo
Added Files:
        pkgsrc/devel/ptlib/patches: patch-src_ptclib_pssl.cxx
            patch-src_ptclib_pxmlrpc.cxx

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


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/ptlib/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ptlib/patches/patch-src_ptclib_pssl.cxx \
    pkgsrc/devel/ptlib/patches/patch-src_ptclib_pxmlrpc.cxx

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ptlib/distinfo
diff -u pkgsrc/devel/ptlib/distinfo:1.20 pkgsrc/devel/ptlib/distinfo:1.21
--- pkgsrc/devel/ptlib/distinfo:1.20    Tue Nov  3 03:29:04 2015
+++ pkgsrc/devel/ptlib/distinfo Sat Jul 16 03:23:50 2016
@@ -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_sound_oss_sound_oss.
 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

Added files:

Index: pkgsrc/devel/ptlib/patches/patch-src_ptclib_pssl.cxx
diff -u /dev/null pkgsrc/devel/ptlib/patches/patch-src_ptclib_pssl.cxx:1.1
--- /dev/null   Sat Jul 16 03:23:51 2016
+++ pkgsrc/devel/ptlib/patches/patch-src_ptclib_pssl.cxx        Sat Jul 16 03:23:50 2016
@@ -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();
Index: pkgsrc/devel/ptlib/patches/patch-src_ptclib_pxmlrpc.cxx
diff -u /dev/null pkgsrc/devel/ptlib/patches/patch-src_ptclib_pxmlrpc.cxx:1.1
--- /dev/null   Sat Jul 16 03:23:51 2016
+++ pkgsrc/devel/ptlib/patches/patch-src_ptclib_pxmlrpc.cxx     Sat Jul 16 03:23:50 2016
@@ -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);