8 files changed, 150 insertions, 3 deletions

diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile
index 529f19b89ce6..c5ea81625615 100644
--- a/devel/gsoap/Makefile
+++ b/devel/gsoap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gsoap
-PORTVERSION=	2.8.8
+PORTVERSION=	2.8.10
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}2/gSOAP 
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/devel/gsoap/distinfo b/devel/gsoap/distinfo
index 0bd9471ef47c..f1e0a1ded65a 100644
--- a/devel/gsoap/distinfo
+++ b/devel/gsoap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gsoap_2.8.8.zip) = 8b1ad1cbd521bd5f85ff4c038bfd5a17a2530610c1ce8bf7318725bc568465cc
-SIZE (gsoap_2.8.8.zip) = 13782549
+SHA256 (gsoap_2.8.10.zip) = fddfd59ba9b0236daa59d1ced9149cb827d446e0a24b85395ed23c10858cabfb
+SIZE (gsoap_2.8.10.zip) = 19156778
diff --git a/devel/gsoap/files/patch-gsoap-stdsoap2.c b/devel/gsoap/files/patch-gsoap-stdsoap2.c
new file mode 100644
index 000000000000..b638c91bd6fb
--- /dev/null
+++ b/devel/gsoap/files/patch-gsoap-stdsoap2.c
@@ -0,0 +1,39 @@
+--- gsoap/stdsoap2.c.orig
++++ gsoap/stdsoap2.c
+@@ -809,7 +809,7 @@ soap_flush_raw(struct soap *soap, const char *s, size_t n)
+ #ifndef WITH_LEANER
+   if ((soap->mode & SOAP_IO) == SOAP_IO_CHUNK)
+   { char t[16];
+-    sprintf(t, "\r\n%lX\r\n" + (soap->chunksize ? 0 : 2), (unsigned long)n);
++    sprintf(t, &"\r\n%lX\r\n"[soap->chunksize ? 0 : 2], (unsigned long)n);
+     DBGMSG(SENT, t, strlen(t));
+     if ((soap->error = soap->fsend(soap, t, strlen(t))))
+       return soap->error;
+@@ -9534,7 +9534,8 @@ soap_element_start_end_out(struct soap *soap, const char *tag)
+     }
+     for (np = soap->nlist; np; np = np->next)
+     { if (np->index == 1 && np->ns)
+-      { sprintf(soap->tmpbuf, *(np->id) ? "xmlns:%s" : "xmlns", np->id);
++      {
++        sprintf(soap->tmpbuf, *(np->id) ? "xmlns:%s" : "xmlns%s", *(np->id) ? np->id : "");
+         DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Enabling utilized binding (level=%u) %s='%s'\n", np->level, soap->tmpbuf, np->ns));
+         soap_set_attr(soap, soap->tmpbuf, np->ns, 1);
+         np->index = 2;
+@@ -11635,7 +11636,7 @@ SOAP_FMAC1
+ const char*
+ SOAP_FMAC2
+ soap_LONG642s(struct soap *soap, LONG64 n)
+-{ sprintf(soap->tmpbuf, SOAP_LONG_FORMAT, n);
++{ sprintf(soap->tmpbuf, SOAP_LONG_FORMAT, (long long) (n));
+   return soap->tmpbuf;
+ }
+ #endif
+@@ -12453,7 +12454,7 @@ SOAP_FMAC1
+ const char*
+ SOAP_FMAC2
+ soap_ULONG642s(struct soap *soap, ULONG64 n)
+-{ sprintf(soap->tmpbuf, SOAP_ULONG_FORMAT, n);
++{ sprintf(soap->tmpbuf, SOAP_ULONG_FORMAT, (unsigned long long) (n));
+   return soap->tmpbuf;
+ }
+ #endif
diff --git a/devel/gsoap/files/patch-gsoap-stdsoap2.cpp b/devel/gsoap/files/patch-gsoap-stdsoap2.cpp
new file mode 100644
index 000000000000..e9e919a872df
--- /dev/null
+++ b/devel/gsoap/files/patch-gsoap-stdsoap2.cpp
@@ -0,0 +1,39 @@
+--- gsoap/stdsoap2.cpp.orig
++++ gsoap/stdsoap2.cpp
+@@ -809,7 +809,7 @@ soap_flush_raw(struct soap *soap, const char *s, size_t n)
+ #ifndef WITH_LEANER
+   if ((soap->mode & SOAP_IO) == SOAP_IO_CHUNK)
+   { char t[16];
+-    sprintf(t, "\r\n%lX\r\n" + (soap->chunksize ? 0 : 2), (unsigned long)n);
++    sprintf(t, &"\r\n%lX\r\n"[soap->chunksize ? 0 : 2], (unsigned long)n);
+     DBGMSG(SENT, t, strlen(t));
+     if ((soap->error = soap->fsend(soap, t, strlen(t))))
+       return soap->error;
+@@ -9534,7 +9534,8 @@ soap_element_start_end_out(struct soap *soap, const char *tag)
+     }
+     for (np = soap->nlist; np; np = np->next)
+     { if (np->index == 1 && np->ns)
+-      { sprintf(soap->tmpbuf, *(np->id) ? "xmlns:%s" : "xmlns", np->id);
++      {
++        sprintf(soap->tmpbuf, *(np->id) ? "xmlns:%s" : "xmlns%s", *(np->id) ? np->id : "");
+         DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Enabling utilized binding (level=%u) %s='%s'\n", np->level, soap->tmpbuf, np->ns));
+         soap_set_attr(soap, soap->tmpbuf, np->ns, 1);
+         np->index = 2;
+@@ -11635,7 +11636,7 @@ SOAP_FMAC1
+ const char*
+ SOAP_FMAC2
+ soap_LONG642s(struct soap *soap, LONG64 n)
+-{ sprintf(soap->tmpbuf, SOAP_LONG_FORMAT, n);
++{ sprintf(soap->tmpbuf, SOAP_LONG_FORMAT, (long long) (n));
+   return soap->tmpbuf;
+ }
+ #endif
+@@ -12453,7 +12454,7 @@ SOAP_FMAC1
+ const char*
+ SOAP_FMAC2
+ soap_ULONG642s(struct soap *soap, ULONG64 n)
+-{ sprintf(soap->tmpbuf, SOAP_ULONG_FORMAT, n);
++{ sprintf(soap->tmpbuf, SOAP_ULONG_FORMAT, (unsigned long long) (n));
+   return soap->tmpbuf;
+ }
+ #endif
diff --git a/devel/gsoap/files/patch-gsoap-wsdl-service.cpp b/devel/gsoap/files/patch-gsoap-wsdl-service.cpp
new file mode 100644
index 000000000000..a6462a83de51
--- /dev/null
+++ b/devel/gsoap/files/patch-gsoap-wsdl-service.cpp
@@ -0,0 +1,11 @@
+--- gsoap/wsdl/service.cpp.orig
++++ gsoap/wsdl/service.cpp
+@@ -2281,7 +2281,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 "WSDL2H_VERSION" from ", outfile?outfile:"");
++  fprintf(stream, "/* %s\n   Generated by wsdl2h " WSDL2H_VERSION " from ", outfile?outfile:"");
+   if (infiles)
+   { for (i = 0; i < infiles; i++)
+       fprintf(stream, "%s ", infile[i]);
diff --git a/devel/gsoap/files/patch-gsoap-wsdl-types.cpp b/devel/gsoap/files/patch-gsoap-wsdl-types.cpp
new file mode 100644
index 000000000000..aa5ee6ea0d77
--- /dev/null
+++ b/devel/gsoap/files/patch-gsoap-wsdl-types.cpp
@@ -0,0 +1,29 @@
+--- gsoap/wsdl/types.cpp.orig
++++ gsoap/wsdl/types.cpp
+@@ -1206,7 +1206,7 @@ void Types::gen(const char *URI, const char *name, const xs__simpleType& simpleT
+               && simpleType.restriction->minExclusive
+               && simpleType.restriction->minExclusive->value
+               && is_integer(simpleType.restriction->minExclusive->value))
+-          fprintf(stream, " "SOAP_LONG_FORMAT, to_integer(simpleType.restriction->minExclusive->value)+1);
++          fprintf(stream, " " SOAP_LONG_FORMAT, (long long) to_integer(simpleType.restriction->minExclusive->value)+1);
+         if (!anonymous
+          && simpleType.restriction->maxLength
+          && simpleType.restriction->maxLength->value)
+@@ -1228,7 +1228,7 @@ void Types::gen(const char *URI, const char *name, const xs__simpleType& simpleT
+               && simpleType.restriction->maxExclusive
+               && simpleType.restriction->maxExclusive->value
+               && is_integer(simpleType.restriction->maxExclusive->value))
+-          fprintf(stream, ":"SOAP_LONG_FORMAT, to_integer(simpleType.restriction->maxExclusive->value)-1);
++          fprintf(stream, ":" SOAP_LONG_FORMAT, (long long) to_integer(simpleType.restriction->maxExclusive->value)-1);
+         if (!anonymous)
+         { fprintf(stream, ";\n");
+           if (pflag && simpleType.name)
+@@ -2974,7 +2974,7 @@ static const char *utf8(char *t, const char *s)
+             if (c < 0xFC)
+               c = ((c & 0x03) << 24) | (c1 << 18) | (c2 << 12) | (c3 << 6) | c4;
+             else
+-              c = ((c & 0x01) << 30) | (c1 << 24) | (c2 << 18) | (c3 << 12) | (c4 << 6) | *++s & 0x3F;
++              c = ((c & 0x01) << 30) | (c1 << 24) | (c2 << 18) | (c3 << 12) | (c4 << 6) | (*++s & 0x3F);
+           }
+         }
+       }
diff --git a/devel/gsoap/files/patch-gsoap-wsdl-wsdl2h.cpp b/devel/gsoap/files/patch-gsoap-wsdl-wsdl2h.cpp
new file mode 100644
index 000000000000..2e024c09e586
--- /dev/null
+++ b/devel/gsoap/files/patch-gsoap-wsdl-wsdl2h.cpp
@@ -0,0 +1,20 @@
+--- gsoap/wsdl/wsdl2h.cpp.orig
++++ gsoap/wsdl/wsdl2h.cpp
+@@ -85,7 +85,7 @@ char *infile[MAXINFILES],
+      *proxy_host = NULL,
+      *proxy_userid = NULL,
+      *proxy_passwd = NULL;
+-extern const char
++const char
+      *mapfile = WSDL_TYPEMAP_FILE,
+      *import_path = WSDL2H_IMPORT_PATH,
+      *cwd_path = NULL,
+@@ -118,7 +118,7 @@ const char serviceformat[]             = "//gsoap %-4s service %s:\t%s %s\n";
+ 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 "WSDL2H_VERSION"\n**  Copyright (C) 2000-2012 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 details.\n\n";
++const char copyrightnotice[] = "\n**  The gSOAP WSDL/Schema processor for C and C++, wsdl2h release " WSDL2H_VERSION "\n**  Copyright (C) 2000-2012 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 details.\n\n";
+ 
+ const char licensenotice[]   = "\
+ --------------------------------------------------------------------------------\n\
diff --git a/devel/gsoap/pkg-plist b/devel/gsoap/pkg-plist
index 5e10128580c3..4668c76c1db0 100644
--- a/devel/gsoap/pkg-plist
+++ b/devel/gsoap/pkg-plist
@@ -27,7 +27,10 @@ libdata/pkgconfig/gsoapssl.pc
 %%DATADIR%%/WS/WS-ReliableMessaging.wsdl
 %%DATADIR%%/WS/WS-ReliableMessaging.xsd
 %%DATADIR%%/WS/WS-Routing.xsd
+%%DATADIR%%/WS/WS-SecureConversation.xsd
 %%DATADIR%%/WS/WS-SecurityPolicy.xsd
+%%DATADIR%%/WS/WS-Trust.wsdl
+%%DATADIR%%/WS/WS-Trust.xsd
 %%DATADIR%%/WS/WS-typemap.dat
 %%DATADIR%%/WS/discovery.xsd
 %%DATADIR%%/WS/ds.xsd
@@ -64,6 +67,7 @@ libdata/pkgconfig/gsoapssl.pc
 %%DATADIR%%/import/ds.h
 %%DATADIR%%/import/ds2.h
 %%DATADIR%%/import/ref.h
+%%DATADIR%%/import/ser.h
 %%DATADIR%%/import/soap12.h
 %%DATADIR%%/import/stdstring.h
 %%DATADIR%%/import/stl.h
@@ -75,17 +79,22 @@ libdata/pkgconfig/gsoapssl.pc
 %%DATADIR%%/import/wsa3.h
 %%DATADIR%%/import/wsa4.h
 %%DATADIR%%/import/wsa5.h
+%%DATADIR%%/import/wsc.h
 %%DATADIR%%/import/wsdd.h
 %%DATADIR%%/import/wsdd10.h
 %%DATADIR%%/import/wsdx.h
 %%DATADIR%%/import/wsp.h
 %%DATADIR%%/import/wsrm.h
 %%DATADIR%%/import/wsrm4.h
+%%DATADIR%%/import/wsrm5.h
 %%DATADIR%%/import/wsrp.h
 %%DATADIR%%/import/wsrx.h
+%%DATADIR%%/import/wsrx5.h
 %%DATADIR%%/import/wsse.h
 %%DATADIR%%/import/wsse11.h
 %%DATADIR%%/import/wsse2.h
+%%DATADIR%%/import/wst.h
+%%DATADIR%%/import/wstx.h
 %%DATADIR%%/import/wsu.h
 %%DATADIR%%/import/xenc.h
 %%DATADIR%%/import/xlink.h