From 6224b669ebf3647c6eb74c24366550e41c63550dddb120540e5e995055d9c9f8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 4 Apr 2016 07:55:56 +0000 Subject: [PATCH] - Update to new upstream release 2.8.30 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gsoap?expand=0&rev=58 --- gsoap-00-builtsource.diff | 24 -------------------- gsoap-02-typepuns.diff | 37 ------------------------------ gsoap-2.8.29.tar.xz | 3 --- gsoap-2.8.30.tar.xz | 3 +++ gsoap.changes | 48 +++++++++++++++++++++++++++++++++++++++ gsoap.spec | 14 +++++------- sanitize_source.sh | 2 +- 7 files changed, 58 insertions(+), 73 deletions(-) delete mode 100644 gsoap-00-builtsource.diff delete mode 100644 gsoap-02-typepuns.diff delete mode 100644 gsoap-2.8.29.tar.xz create mode 100644 gsoap-2.8.30.tar.xz diff --git a/gsoap-00-builtsource.diff b/gsoap-00-builtsource.diff deleted file mode 100644 index 9a40b76..0000000 --- a/gsoap-00-builtsource.diff +++ /dev/null @@ -1,24 +0,0 @@ -From: Jan Engelhardt -Date: 2016-01-28 19:30:10.973606466 +0100 -References: http://sf.net/p/gsoap2/patches/156/ - -Every .c/.cpp file which is updated/created needs to be in -BUILT_SOURCES. - ---- - gsoap/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: gsoap-2.8.29/gsoap/Makefile.am -=================================================================== ---- gsoap-2.8.29.orig/gsoap/Makefile.am -+++ gsoap-2.8.29/gsoap/Makefile.am -@@ -49,7 +49,7 @@ libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) - libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp - libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES - --BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp $(lib_LIBRARIES) -+BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp - - include_HEADERS = stdsoap2.h - diff --git a/gsoap-02-typepuns.diff b/gsoap-02-typepuns.diff deleted file mode 100644 index a807506..0000000 --- a/gsoap-02-typepuns.diff +++ /dev/null @@ -1,37 +0,0 @@ -References: https://sf.net/p/gsoap2/patches/124/ - ---- - gsoap/plugin/wsaapi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: gsoap-2.8.22/gsoap/plugin/wsaapi.c -=================================================================== ---- gsoap-2.8.22.orig/gsoap/plugin/wsaapi.c -+++ gsoap-2.8.22/gsoap/plugin/wsaapi.c -@@ -599,7 +599,7 @@ soap_wsa_rand_uuid(struct soap *soap) - k += 0x7FFFFFFF; - r2 = k; - k &= 0x8FFFFFFF; -- r2 += *(int*)soap->buf; -+ r2 += soap->buf[0] << 24 + soap->buf[1] << 16 + soap->buf[2] << 8 + soap->buf[3]; - #endif - r3 = soap_random; - r4 = soap_random; -diff -ur gsoap-2.8.orig/gsoap/stdsoap2.cpp gsoap-2.8/gsoap/stdsoap2.cpp ---- gsoap-2.8.orig/gsoap/stdsoap2.cpp 2015-04-14 08:46:36.000000000 +0200 -+++ gsoap-2.8/gsoap/stdsoap2.cpp 2015-05-05 09:01:31.633153838 +0200 -@@ -3105,11 +3105,11 @@ - int - SOAP_FMAC2 - soap_rand() --{ unsigned char buf[4]; -+{ int buf; - if (!soap_ssl_init_done) - soap_ssl_init(); -- RAND_pseudo_bytes(buf, 4); -- return *(int*)buf; -+ RAND_pseudo_bytes((unsigned char*)&buf, sizeof(int)); -+ return buf; - } - #endif - #endif diff --git a/gsoap-2.8.29.tar.xz b/gsoap-2.8.29.tar.xz deleted file mode 100644 index d93022d..0000000 --- a/gsoap-2.8.29.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9931e7f90a11ce348f69744860d58383c2407d38831184d799d1a57d7e022aae -size 8086964 diff --git a/gsoap-2.8.30.tar.xz b/gsoap-2.8.30.tar.xz new file mode 100644 index 0000000..f88b31a --- /dev/null +++ b/gsoap-2.8.30.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7672c98794de125a11db897b9d8342e2ed782d0b749518ab78922733dbe79c4a +size 8129420 diff --git a/gsoap.changes b/gsoap.changes index d9d95a3..94efd1b 100644 --- a/gsoap.changes +++ b/gsoap.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Mon Apr 4 07:49:55 UTC 2016 - jengelh@inai.de + +- Update to new upstream release 2.8.30 +* Added backtick XML tag name syntax to interface files for + soapcpp2, which allows for the overriding of the translated tag + names of struct/class members and service operation parameters, + see the [Data Bindings + documentation](http://www.genivia.com/doc/databinding/html#toxsd9-5). + Older gSOAP versions do not support the backtick tag in the + generated WSDL and schemas (messages are OK). +* Added macro `SOAP_MAXLEVEL` to trigger `SOAP_LEVEL` error when + XML nesting level of inbound XML exceeds the value of + `SOAP_MAXLEVEL`. Default value is 10000. Redefine `SOAP_MAXLEVEL` + as needed, with lower values to restrict XML nesting depth for + receivers to accept. +* Added macro `SOAP_MAXLENGTH` to trigger `SOAP_LENGTH` content + length error when string content in inbound XML exceeds the value + of `SOAP_MAXLENGTH`. Applies to strings that are potentially + unbounded, i.e. that are not already constrained by XML + validation maxLength constaints (which could be larger than + `SOAP_MAXLENGTH`). Default value is zero (0) which means that + string length is unconstrained if XML validation maxLength is not + given. Redefine `SOAP_MAXLENGTH` as needed, with lower values to + restrict string lengths for receivers to accept. +* Added macro `SOAP_MAXOCCURS` to trigger `SOAP_OCCURS` content + error when array and container lengths exceed the value of + `SOAP_MAXOCCURS`. Must be greater than zero (0). Default value is + 100000. Redefine `SOAP_MAXOCCURS` as needed, with lower values to + restrict array and container lengths for receivers to accept. +* Updated wsdl2h WS-Policy processing to include WS-RM protocol + versioning. +* Improved soapcpp2 generation of WSDL and XSD for unqualified + C/C++ types or when mixing qualified and unqualified C/C++ types + and type names. +* Changed soapcpp2 default behavior for generating WSDL and XSD + files with *`elementFormDefault="unqualified"`* from the old + default behavior with *`elementFormDefault="qualified"`* +* Fixed soapcpp2 crash with enum constants > 255 due to libc + `isalpha` crashing on some Linux systems. +* Fixed `import/wsp.h` soapcpp2 compilation error. +* Fixed soapcpp2 option `-w` that may cause a message response + element tag name inconsistency with SOAP doc/lit style. +* Fixed deserialization issue with dynamic arrays of STL + containers/smart-pointers (i.e. a pointer to an array of + containers/smart-pointers, which is an unlikely combination to + use, but should work). + ------------------------------------------------------------------- Tue Mar 22 09:38:28 UTC 2016 - jengelh@inai.de diff --git a/gsoap.spec b/gsoap.spec index 1ba78b7..6e813a9 100644 --- a/gsoap.spec +++ b/gsoap.spec @@ -17,21 +17,19 @@ Name: gsoap -%define lname libgsoap-2_8_29 -Version: 2.8.29 +%define lname libgsoap-2_8_30 +Version: 2.8.30 Release: 0 Summary: Toolkit for C/C++ server and client web service applications License: SUSE-GPL-2.0+-with-openssl-exception Group: Development/Libraries/C and C++ Url: http://www.genivia.com/dev.html -#DL-URL: http://downloads.sf.net/gsoap2/gsoap_2.8.29.zip +#DL-URL: http://downloads.sf.net/gsoap2/gsoap_2.8.30.zip Source: gsoap-%version.tar.xz Source2: sanitize_source.sh -Patch6: gsoap-automake1_13.diff -Patch7: gsoap-00-builtsource.diff -Patch8: gsoap-01-sharedlibs.diff -Patch9: gsoap-02-typepuns.diff +Patch0: gsoap-automake1_13.diff +Patch1: gsoap-01-sharedlibs.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -85,7 +83,7 @@ available or under development. %prep %setup -q cmp gsoap/stdsoap2.cpp gsoap/stdsoap2.c -%patch -P 6 -P 7 -P 8 -P 9 -p1 +%patch -P 0 -P 1 -p1 ln -fs stdsoap2.cpp gsoap/stdsoap2.c %build diff --git a/sanitize_source.sh b/sanitize_source.sh index d8ad065..e017fec 100644 --- a/sanitize_source.sh +++ b/sanitize_source.sh @@ -13,7 +13,7 @@ if ! which hardlink >/dev/null; then exit 1; fi; -version="2.8.29" +version="2.8.30" shortver="2.8" # agh... rm -Rf "gsoap-$shortver" "gsoap-$version"