Fix build with C++11 and OpenSSL 1.1.

4 files changed, 62 insertions, 3 deletions

diff --git a/devel/gsoap/distinfo b/devel/gsoap/distinfo
index 23e3a253df0..9f7365a383e 100644
--- a/devel/gsoap/distinfo
+++ b/devel/gsoap/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 03:27:30 agc Exp $
+$NetBSD: distinfo,v 1.9 2020/03/27 20:53:32 joerg Exp $
 
 SHA1 (gsoap_2.7.17.zip) = 573a08ab7d8ca2d970158911482c308484fdd5ed
 RMD160 (gsoap_2.7.17.zip) = 3f947cbc5e1656dd82b8c6425816cfaf08063c19
 SHA512 (gsoap_2.7.17.zip) = efb5332e90cbed6013ac2f16b940404cc4de9e84bc85e671cb3588bc6620cd86c8db646a4f3cd77bb3b866dfcc8a793186736ab2241bb8cbaca8d313345d14ac
 Size (gsoap_2.7.17.zip) = 10224444 bytes
 SHA1 (patch-aa) = 096b71371dee851940e906c5c9b58ad29a4fe4f1
-SHA1 (patch-ab) = e8e5353420a5bd7e804441013865348b7bf2e3b4
+SHA1 (patch-ab) = 69c30693ad5df34cbaa4dbcfed23d56d843fbceb
 SHA1 (patch-ac) = 13a03522d0f5166cc24b87510216297174c17ff0
+SHA1 (patch-gsoap_wsdl_service.cpp) = 7ec4990a92282cc4e0bb6b7f5902eca910d18342
+SHA1 (patch-gsoap_wsdl_wsdl2h.cpp) = d9a738dd884ca6cd6e054619ecde81180ddec7e1
diff --git a/devel/gsoap/patches/patch-ab b/devel/gsoap/patches/patch-ab
index b153617b112..10675ac255f 100644
--- a/devel/gsoap/patches/patch-ab
+++ b/devel/gsoap/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2013/08/31 14:46:48 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2020/03/27 20:53:32 joerg Exp $
 
 DragonFly support.
 
@@ -22,3 +22,34 @@ DragonFly support.
    host = gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &soap->errnum);
  #elif defined(VXWORKS)
    /* If the DNS resolver library resolvLib has been configured in the vxWorks
+@@ -3865,10 +3865,10 @@ again:
+               int j;
+               if (!meth)
+                 break;
+-              data = ext->value->data;
++              data = X509_EXTENSION_get_data(ext)->data;
+ #if (OPENSSL_VERSION_NUMBER > 0x00907000L)
+               if (meth->it) 
+-                ext_data = ASN1_item_d2i(NULL, &data, ext->value->length, ASN1_ITEM_ptr(meth->it));
++                ext_data = ASN1_item_d2i(NULL, &data, X509_EXTENSION_get_data(ext)->length, ASN1_ITEM_ptr(meth->it));
+               else
+               { /* OpenSSL not perfectly portable at this point (?):
+                    Some compilers appear to prefer
+@@ -3876,7 +3876,7 @@ again:
+                    and others prefer
+                      meth->d2i(NULL, &data, ext->value->length);
+                 */
+-                ext_data = meth->d2i(NULL, &data, ext->value->length);
++                ext_data = meth->d2i(NULL, &data, X509_EXTENSION_get_data(ext)->length);
+               }
+ #else
+               ext_data = meth->d2i(NULL, &data, ext->value->length);
+@@ -3916,7 +3916,7 @@ again:
+               break;
+             name = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(subj, i));
+             if (name)
+-            { if (!soap_tag_cmp(host, (const char*)M_ASN1_STRING_data(name)))
++            { if (!soap_tag_cmp(host, (const char*)ASN1_STRING_data(name)))
+                 ok = 1;
+               else
+               { unsigned char *tmp = NULL;
diff --git a/devel/gsoap/patches/patch-gsoap_wsdl_service.cpp b/devel/gsoap/patches/patch-gsoap_wsdl_service.cpp
new file mode 100644
index 00000000000..f4ca1d837da
--- /dev/null
+++ b/devel/gsoap/patches/patch-gsoap_wsdl_service.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-gsoap_wsdl_service.cpp,v 1.1 2020/03/27 20:53:32 joerg Exp $
+
+--- gsoap/wsdl/service.cpp.orig	2020-03-27 20:15:35.783223754 +0000
++++ gsoap/wsdl/service.cpp
+@@ -1834,7 +1834,7 @@ static void ident()
+   char tmp[256];
+   int i;
+   strftime(tmp, 256, "%Y-%m-%d %H:%M:%S GMT", gmtime(p));
+-  fprintf(stream, "/* %s\n   Generated by wsdl2h "VERSION" from ", outfile?outfile:"");
++  fprintf(stream, "/* %s\n   Generated by wsdl2h " VERSION " from ", outfile?outfile:"");
+   if (infiles)
+   { for (i = 0; i < infiles; i++)
+       fprintf(stream, "%s ", infile[i]);
diff --git a/devel/gsoap/patches/patch-gsoap_wsdl_wsdl2h.cpp b/devel/gsoap/patches/patch-gsoap_wsdl_wsdl2h.cpp
new file mode 100644
index 00000000000..737ab552284
--- /dev/null
+++ b/devel/gsoap/patches/patch-gsoap_wsdl_wsdl2h.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-gsoap_wsdl_wsdl2h.cpp,v 1.1 2020/03/27 20:53:32 joerg Exp $
+
+--- gsoap/wsdl/wsdl2h.cpp.orig	2020-03-27 20:14:53.062513186 +0000
++++ gsoap/wsdl/wsdl2h.cpp
+@@ -115,7 +115,7 @@ const char serviceformat[]       = "//gs
+ const char paraformat[]          = "    %-35s%s%s%s";
+ const char anonformat[]          = "    %-35s%s_%s%s";
+ 
+-const char copyrightnotice[] = "\n**  The gSOAP WSDL/Schema processor for C and C++, wsdl2h release "VERSION"\n**  Copyright (C) 2000-2010 Robert van Engelen, Genivia Inc.\n**  All Rights Reserved. This product is provided \"as is\", without any warranty.\n**  The wsdl2h tool is released under one of the following two licenses:\n**  GPL or the commercial license by Genivia Inc. Use option -l for more info.\n\n";
++const char copyrightnotice[] = "\n**  The gSOAP WSDL/Schema processor for C and C++, wsdl2h release " VERSION "\n**  Copyright (C) 2000-2010 Robert van Engelen, Genivia Inc.\n**  All Rights Reserved. This product is provided \"as is\", without any warranty.\n**  The wsdl2h tool is released under one of the following two licenses:\n**  GPL or the commercial license by Genivia Inc. Use option -l for more info.\n\n";
+ 
+ const char licensenotice[]   = "\
+ --------------------------------------------------------------------------------\n\