From 137b34a3dc35709e125dabc0d3207824665bc0507e5b258e41ef580b58d4f190 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 10 Apr 2018 15:00:16 +0000 Subject: [PATCH] - Update to new upstream release 2.8.66 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gsoap?expand=0&rev=133 --- gsconfig.patch | 42 +++++++++++++++++++++--------------------- gsoap-2.8.65.tar.xz | 3 --- gsoap-2.8.66.tar.xz | 3 +++ gsoap.changes | 15 +++++++++++++++ gsoap.spec | 4 ++-- sanitize_source.sh | 2 +- 6 files changed, 42 insertions(+), 27 deletions(-) delete mode 100644 gsoap-2.8.65.tar.xz create mode 100644 gsoap-2.8.66.tar.xz diff --git a/gsconfig.patch b/gsconfig.patch index 24c352c..7f57055 100644 --- a/gsconfig.patch +++ b/gsconfig.patch @@ -4,10 +4,10 @@ gsoap/stdsoap2.h | 38 +++++++++++++++++--------------------- 3 files changed, 45 insertions(+), 37 deletions(-) -Index: gsoap-2.8.65/Makefile.am +Index: gsoap-2.8.66/Makefile.am =================================================================== ---- gsoap-2.8.65.orig/Makefile.am -+++ gsoap-2.8.65/Makefile.am +--- gsoap-2.8.66.orig/Makefile.am ++++ gsoap-2.8.66/Makefile.am @@ -1,9 +1,9 @@ ####### This is the input file for automake, which will generate Makefile.in ########## @@ -29,10 +29,10 @@ Index: gsoap-2.8.65/Makefile.am + +gsoap_config.h: config.h + grep GSOAP_WITH_ $^ >$@ -Index: gsoap-2.8.65/configure.ac +Index: gsoap-2.8.66/configure.ac =================================================================== ---- gsoap-2.8.65.orig/configure.ac -+++ gsoap-2.8.65/configure.ac +--- gsoap-2.8.66.orig/configure.ac ++++ gsoap-2.8.66/configure.ac @@ -92,6 +92,13 @@ esac AC_SUBST(SAMPLE_EXTRA_LIBS) AC_SUBST(platform) @@ -104,14 +104,14 @@ Index: gsoap-2.8.65/configure.ac WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP" # compile with wsdl2h when OPENSSL is available WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz" -Index: gsoap-2.8.65/gsoap/stdsoap2.h +Index: gsoap-2.8.66/gsoap/stdsoap2.h =================================================================== ---- gsoap-2.8.65.orig/gsoap/stdsoap2.h -+++ gsoap-2.8.65/gsoap/stdsoap2.h +--- gsoap-2.8.66.orig/gsoap/stdsoap2.h ++++ gsoap-2.8.66/gsoap/stdsoap2.h @@ -53,6 +53,7 @@ A commercial use license is available fr */ - #define GSOAP_VERSION 20865 + #define GSOAP_VERSION 20866 +#include "gsoap_config.h" #ifdef WITH_SOAPDEFS_H @@ -137,8 +137,8 @@ Index: gsoap-2.8.65/gsoap/stdsoap2.h # include # endif # define SOAP_LOCALE_T locale_t -@@ -889,9 +885,9 @@ extern intmax_t __strtoull(const char*, - # define SOAP_WINSOCKINT size_t +@@ -893,9 +889,9 @@ extern intmax_t __strtoull(const char*, + # undef WITH_SELF_PIPE #endif -#if defined(WITH_IPV6_V6ONLY) || defined(WITH_NO_IPV6_V6ONLY) @@ -150,7 +150,7 @@ Index: gsoap-2.8.65/gsoap/stdsoap2.h # endif #endif -@@ -912,7 +908,7 @@ extern intmax_t __strtoull(const char*, +@@ -916,7 +912,7 @@ extern intmax_t __strtoull(const char*, // # define _WSPIAPI_COUNTOF // DEV NOTE: enble to fix problems with VC6 // # include # include // DEV NOTE: replaces older wspiapi.h above @@ -159,7 +159,7 @@ Index: gsoap-2.8.65/gsoap/stdsoap2.h # define SOAP_GAI_STRERROR gai_strerrorA # endif #else -@@ -938,12 +934,12 @@ extern intmax_t __strtoull(const char*, +@@ -942,12 +938,12 @@ extern intmax_t __strtoull(const char*, # include #endif @@ -174,7 +174,7 @@ Index: gsoap-2.8.65/gsoap/stdsoap2.h # define OPENSSL_NO_KRB5 # include # include -@@ -960,7 +956,7 @@ extern intmax_t __strtoull(const char*, +@@ -964,7 +960,7 @@ extern intmax_t __strtoull(const char*, # endif #endif @@ -183,7 +183,7 @@ Index: gsoap-2.8.65/gsoap/stdsoap2.h # include # include # if GNUTLS_VERSION_NUMBER < 0x020b00 -@@ -978,9 +974,9 @@ extern intmax_t __strtoull(const char*, +@@ -982,9 +978,9 @@ extern intmax_t __strtoull(const char*, # include #endif @@ -196,7 +196,7 @@ Index: gsoap-2.8.65/gsoap/stdsoap2.h # endif #endif -@@ -990,7 +986,7 @@ extern intmax_t __strtoull(const char*, +@@ -994,7 +990,7 @@ extern intmax_t __strtoull(const char*, # define SOAP_STRCMP strcmp /* case sensitive XML element/attribute names */ #endif @@ -205,7 +205,7 @@ Index: gsoap-2.8.65/gsoap/stdsoap2.h # include #endif -@@ -2881,7 +2877,7 @@ struct SOAP_CMAC soap +@@ -2888,7 +2884,7 @@ struct SOAP_CMAC soap } peer; /* set by soap_connect/soap_accept and by UDP recv */ size_t peerlen; #endif @@ -214,7 +214,7 @@ Index: gsoap-2.8.65/gsoap/stdsoap2.h int (*fsslauth)(struct soap*); int (*fsslverify)(int, X509_STORE_CTX*); BIO *bio; -@@ -2890,7 +2886,7 @@ struct SOAP_CMAC soap +@@ -2897,7 +2893,7 @@ struct SOAP_CMAC soap SSL_SESSION *session; const char *dhfile; const char *randfile; @@ -223,7 +223,7 @@ Index: gsoap-2.8.65/gsoap/stdsoap2.h int (*fsslauth)(struct soap*); void *fsslverify; gnutls_certificate_credentials_t xcred; /* cert pointer */ -@@ -2932,7 +2928,7 @@ struct SOAP_CMAC soap +@@ -2939,7 +2935,7 @@ struct SOAP_CMAC soap #else void *c_locale; #endif @@ -232,7 +232,7 @@ Index: gsoap-2.8.65/gsoap/stdsoap2.h z_stream *d_stream; /* decompression stream */ uLong z_crc; /* internal gzip crc */ #else -@@ -3074,7 +3070,7 @@ soap_wchar soap_get1(struct soap*); +@@ -3081,7 +3077,7 @@ soap_wchar soap_get1(struct soap*); SOAP_FMAC1 ULONG64 SOAP_FMAC2 soap_strtoull(const char*, char**, int); #endif diff --git a/gsoap-2.8.65.tar.xz b/gsoap-2.8.65.tar.xz deleted file mode 100644 index d0cf98a..0000000 --- a/gsoap-2.8.65.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e614069333b957133be76dc6cdb40a4b10d6bc076969daccf613da7cd4fe5238 -size 17253876 diff --git a/gsoap-2.8.66.tar.xz b/gsoap-2.8.66.tar.xz new file mode 100644 index 0000000..56edb31 --- /dev/null +++ b/gsoap-2.8.66.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89d8d211a47a69c2bb1cc4678aba1ab2be996de3e89646a3230e95b9c7977c70 +size 17364220 diff --git a/gsoap.changes b/gsoap.changes index 92a41c4..3174f58 100644 --- a/gsoap.changes +++ b/gsoap.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Apr 10 13:57:01 UTC 2018 - jengelh@inai.de + +- Update to new upstream release 2.8.66 + * Added `soap_close_connection()` to close a connection from + another thread. + * Fixed C++ proxy and server class `copy()` and `operator=()` + methods to prevent a possible memory leak which may occur in + certain usage scenarios. + * Fixed an issue in wsdl2h, generating an incorrect simpleType + element name that leads to a soapcpp2 error. The element has + a local simpleType restriction of a simpleType with the same + name as the element type, where this simpleType in turn is a + restriction. + ------------------------------------------------------------------- Sat Mar 10 09:52:44 UTC 2018 - jengelh@inai.de diff --git a/gsoap.spec b/gsoap.spec index 3d877db..452178e 100644 --- a/gsoap.spec +++ b/gsoap.spec @@ -17,8 +17,8 @@ Name: gsoap -%define lname libgsoap-2_8_65 -Version: 2.8.65 +%define lname libgsoap-2_8_66 +Version: 2.8.66 Release: 0 Summary: Toolkit for SOAP/REST-based C/C++ server and client web service applications License: SUSE-GPL-2.0+-with-openssl-exception diff --git a/sanitize_source.sh b/sanitize_source.sh index 7a20092..6dec5c0 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.65" +version="2.8.66" shortver="2.8" # agh... if [ ! -e "gsoap_$version.zip" ]; then wget -c "http://downloads.sf.net/gsoap2/gsoap_$version.zip"