From a5fe89fa2c6269b20ccb6208fa16e1a73bf2632bf6439eb3690aeca3117d3f66 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 1 Feb 2019 16:51:35 +0000 Subject: [PATCH] - Update to new upstream release 2.8.78 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gsoap?expand=0&rev=152 --- gsconfig.patch | 28 ++++++++++++++-------------- gsoap-2.8.75.tar.xz | 3 --- gsoap-2.8.78.tar.xz | 3 +++ gsoap.changes | 20 ++++++++++++++++++++ gsoap.spec | 4 ++-- sanitize_source.sh | 4 ++-- 6 files changed, 41 insertions(+), 21 deletions(-) delete mode 100644 gsoap-2.8.75.tar.xz create mode 100644 gsoap-2.8.78.tar.xz diff --git a/gsconfig.patch b/gsconfig.patch index 71ed35e..2ef7960 100644 --- a/gsconfig.patch +++ b/gsconfig.patch @@ -4,10 +4,10 @@ gsoap/stdsoap2.h | 40 +++++++++++++++++----------------------- 3 files changed, 44 insertions(+), 39 deletions(-) -Index: gsoap-2.8.75/Makefile.am +Index: gsoap-2.8.78/Makefile.am =================================================================== ---- gsoap-2.8.75.orig/Makefile.am -+++ gsoap-2.8.75/Makefile.am +--- gsoap-2.8.78.orig/Makefile.am ++++ gsoap-2.8.78/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = . gsoap CLEANFILES = *~ @@ -26,10 +26,10 @@ Index: gsoap-2.8.75/Makefile.am + +gsoap_config.h: config.h + grep GSOAP_WITH_ $^ >$@ -Index: gsoap-2.8.75/configure.ac +Index: gsoap-2.8.78/configure.ac =================================================================== ---- gsoap-2.8.75.orig/configure.ac -+++ gsoap-2.8.75/configure.ac +--- gsoap-2.8.78.orig/configure.ac ++++ gsoap-2.8.78/configure.ac @@ -92,6 +92,13 @@ esac AC_SUBST(SAMPLE_EXTRA_LIBS) AC_SUBST(platform) @@ -101,13 +101,13 @@ Index: gsoap-2.8.75/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.75/gsoap/stdsoap2.h +Index: gsoap-2.8.78/gsoap/stdsoap2.h =================================================================== ---- gsoap-2.8.75.orig/gsoap/stdsoap2.h -+++ gsoap-2.8.75/gsoap/stdsoap2.h +--- gsoap-2.8.78.orig/gsoap/stdsoap2.h ++++ gsoap-2.8.78/gsoap/stdsoap2.h @@ -54,6 +54,7 @@ A commercial use license is available fr - #define GSOAP_VERSION 20875 + #define GSOAP_VERSION 20878 +#include "gsoap_config.h" #ifdef WITH_SOAPDEFS_H @@ -204,7 +204,7 @@ Index: gsoap-2.8.75/gsoap/stdsoap2.h # include #endif -@@ -2929,7 +2923,7 @@ struct SOAP_CMAC soap +@@ -2938,7 +2932,7 @@ struct SOAP_CMAC soap } peer; /* set by soap_connect/soap_accept and by UDP recv */ size_t peerlen; #endif @@ -213,7 +213,7 @@ Index: gsoap-2.8.75/gsoap/stdsoap2.h int (*fsslauth)(struct soap*); int (*fsslverify)(int, X509_STORE_CTX*); BIO *bio; -@@ -2938,7 +2932,7 @@ struct SOAP_CMAC soap +@@ -2947,7 +2941,7 @@ struct SOAP_CMAC soap SSL_SESSION *session; const char *dhfile; const char *randfile; @@ -222,7 +222,7 @@ Index: gsoap-2.8.75/gsoap/stdsoap2.h int (*fsslauth)(struct soap*); void *fsslverify; gnutls_certificate_credentials_t xcred; /* cert pointer */ -@@ -2980,7 +2974,7 @@ struct SOAP_CMAC soap +@@ -2989,7 +2983,7 @@ struct SOAP_CMAC soap #else void *c_locale; #endif @@ -231,7 +231,7 @@ Index: gsoap-2.8.75/gsoap/stdsoap2.h z_stream *d_stream; /* decompression stream */ uLong z_crc; /* internal gzip crc */ #else -@@ -3126,7 +3120,7 @@ soap_wchar soap_get1(struct soap*); +@@ -3135,7 +3129,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.75.tar.xz b/gsoap-2.8.75.tar.xz deleted file mode 100644 index 1c903fe..0000000 --- a/gsoap-2.8.75.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:01ab8a5d625c55343b977a7c7ae9c35ff5efed73b9e1c9c1224a3de1245d3afa -size 16054784 diff --git a/gsoap-2.8.78.tar.xz b/gsoap-2.8.78.tar.xz new file mode 100644 index 0000000..8dc6968 --- /dev/null +++ b/gsoap-2.8.78.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfcb9b694478569c6152f8720fd4627b712d5295da3511320f2b5a1ca2831b03 +size 16210908 diff --git a/gsoap.changes b/gsoap.changes index f667da4..cd4a74b 100644 --- a/gsoap.changes +++ b/gsoap.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Feb 1 16:27:44 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 2.8.78 + * wsdl2h: WSDL and schema imports of files on relative paths: + file name without path or file name with path stating with + ../ are considered relative locations with respect to the + current WSDL and schema that is importing, otherwise imported + files are considered relative to the directory in which + wsdl2h is run (the `-I` option can be used to change that + location). + * wsdl2h: to display warnings for invalid complexType and + simpleType extensions/restrictions but generates valid code + in such cases by inference, the update also fixes a valid + extension case. + * Fixed compilation error for soapcpp2 options `-i` and `-j` + caused by special case with empty input arguments to service + operations. + * Added jsoncpp new option `-k`. + ------------------------------------------------------------------- Sat Jan 19 10:11:53 UTC 2019 - Jan Engelhardt diff --git a/gsoap.spec b/gsoap.spec index 9eaa814..314130d 100644 --- a/gsoap.spec +++ b/gsoap.spec @@ -17,8 +17,8 @@ Name: gsoap -%define lname libgsoap-2_8_75 -Version: 2.8.75 +%define lname libgsoap-2_8_78 +Version: 2.8.78 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 d2dea82..6a570c1 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.75" +version="2.8.78" shortver="2.8" # agh... if [ ! -e "gsoap_$version.zip" ]; then wget -c "http://downloads.sf.net/gsoap2/gsoap_$version.zip" @@ -41,5 +41,5 @@ rm -Rf "gsoap-$version/gsoap/VisualStudio2005" hardlink "gsoap-$version" find "gsoap-$version" -print0 | sort -z | \ - tar --no-recur -T- --null --owner=root --group=root --use=xz \ + tar --no-recur --null -T- --owner=root --group=root --use=xz \ -cvf "gsoap-$version.tar.xz"