diff --git a/gsoap-01-sharedlibs.diff b/gsoap-01-sharedlibs.diff index 05a095e..cb02599 100644 --- a/gsoap-01-sharedlibs.diff +++ b/gsoap-01-sharedlibs.diff @@ -10,11 +10,11 @@ build: always use shared libraries gsoap/samples/databinding/Makefile.am | 2 +- 4 files changed, 25 insertions(+), 20 deletions(-) -Index: gsoap-2.8.14/configure.in +Index: gsoap-2.8.17/configure.in =================================================================== ---- gsoap-2.8.14.orig/configure.in -+++ gsoap-2.8.14/configure.in -@@ -16,8 +16,7 @@ AM_PROG_CC_C_O +--- gsoap-2.8.17.orig/configure.in ++++ gsoap-2.8.17/configure.in +@@ -15,8 +15,7 @@ AM_PROG_CC_C_O AM_PROG_LEX AC_PROG_YACC AC_PROG_CPP @@ -24,7 +24,7 @@ Index: gsoap-2.8.14/configure.in AC_PROG_LN_S AC_PROG_AWK AC_PROG_INSTALL -@@ -226,13 +225,13 @@ if test "x$with_openssl" = "xyes"; then +@@ -234,7 +233,7 @@ if test "x$with_openssl" = "xyes"; then WSDL2H_EXTRA_FLAGS="-DWITH_GNUTLS -DWITH_GZIP" WSDL2H_EXTRA_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" @@ -33,14 +33,16 @@ Index: gsoap-2.8.14/configure.in else AC_MSG_RESULT(no) WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP" - WSDL2H_EXTRA_LIBS="-lssl -lcrypto -lz" +@@ -242,7 +241,7 @@ if test "x$with_openssl" = "xyes"; then + # compile with wsdl2h when OPENSSL is available + WSDL2H_EXTRA_LIBS="../plugin/httpda.c ../plugin/md5evp.c -lssl -lcrypto -lz" SAMPLE_SSL_LIBS="-lssl -lcrypto -lz" - WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" + WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la" fi if test -n "$OPENSSL"; then WSDL2H_EXTRA_FLAGS="-I${OPENSSL}/include ${WSDL2H_EXTRA_FLAGS}" -@@ -244,7 +243,7 @@ else +@@ -254,7 +253,7 @@ else WSDL2H_EXTRA_FLAGS= WSDL2H_EXTRA_LIBS= SAMPLE_SSL_LIBS= @@ -49,10 +51,10 @@ Index: gsoap-2.8.14/configure.in fi AC_SUBST(WSDL2H_EXTRA_FLAGS) AC_SUBST(WSDL2H_EXTRA_LIBS) -Index: gsoap-2.8.14/gsoap/Makefile.am +Index: gsoap-2.8.17/gsoap/Makefile.am =================================================================== ---- gsoap-2.8.14.orig/gsoap/Makefile.am -+++ gsoap-2.8.14/gsoap/Makefile.am +--- gsoap-2.8.17.orig/gsoap/Makefile.am ++++ gsoap-2.8.17/gsoap/Makefile.am @@ -34,20 +34,26 @@ stdsoap2_ssl_cpp.cpp: stdsoap2.cpp dom_cpp.cpp: dom.cpp $(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp @@ -93,10 +95,10 @@ Index: gsoap-2.8.14/gsoap/Makefile.am BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES) -Index: gsoap-2.8.14/gsoap/samples/autotest/Makefile.am +Index: gsoap-2.8.17/gsoap/samples/autotest/Makefile.am =================================================================== ---- gsoap-2.8.14.orig/gsoap/samples/autotest/Makefile.am -+++ gsoap-2.8.14/gsoap/samples/autotest/Makefile.am +--- gsoap-2.8.17.orig/gsoap/samples/autotest/Makefile.am ++++ gsoap-2.8.17/gsoap/samples/autotest/Makefile.am @@ -14,7 +14,7 @@ SOAP_FLAGS=-SL -T -I$(top_srcdir)/gsoap/ WSDLINPUT=$(srcdir)/examples.wsdl SOAPHEADER=$(srcdir)/examples.h @@ -106,10 +108,10 @@ Index: gsoap-2.8.14/gsoap/samples/autotest/Makefile.am $(SOAP_CPP_SRC) : $(WSDLINPUT) $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) -Index: gsoap-2.8.14/gsoap/samples/databinding/Makefile.am +Index: gsoap-2.8.17/gsoap/samples/databinding/Makefile.am =================================================================== ---- gsoap-2.8.14.orig/gsoap/samples/databinding/Makefile.am -+++ gsoap-2.8.14/gsoap/samples/databinding/Makefile.am +--- gsoap-2.8.17.orig/gsoap/samples/databinding/Makefile.am ++++ gsoap-2.8.17/gsoap/samples/databinding/Makefile.am @@ -14,7 +14,7 @@ SOAP_FLAGS=-0 -CS -p address -I$(top_src WSDLINPUT=$(srcdir)/address.xsd SOAPHEADER=$(srcdir)/address.h diff --git a/gsoap-04-strerror.diff b/gsoap-04-strerror.diff deleted file mode 100644 index 6825b53..0000000 --- a/gsoap-04-strerror.diff +++ /dev/null @@ -1,29 +0,0 @@ -From: Jan Engelhardt -Date: 2011-11-10 12:19:12.730015880 +0100 -Upstream: tbd - -When GNU_SOURCE is defined -- which happens to be the case in the -default G++ environment -- strerror_r behaves differently: it may -not actually fill in the buffer if there is no need to. The error -string pointer is returned in any case. - ---- - gsoap/stdsoap2.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -Index: gsoap-2.8.4/gsoap/stdsoap2.cpp -=================================================================== ---- gsoap-2.8.4.orig/gsoap/stdsoap2.cpp -+++ gsoap-2.8.4/gsoap/stdsoap2.cpp -@@ -15905,7 +15905,11 @@ soap_strerror(struct soap *soap) - { - #ifndef WIN32 - # ifdef HAVE_STRERROR_R -+# ifdef _GNU_SOURCE -+ return strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); -+# else - strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); -+# endif - # else - return strerror(err); - # endif diff --git a/gsoap-2.8.15.tar.xz b/gsoap-2.8.15.tar.xz deleted file mode 100644 index 14d38f3..0000000 --- a/gsoap-2.8.15.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ac05a0dde1981301885c2bb8d7a8182ad27292434248ced8816442e7deec2e5 -size 5778572 diff --git a/gsoap-2.8.17.tar.xz b/gsoap-2.8.17.tar.xz new file mode 100644 index 0000000..6470bc7 --- /dev/null +++ b/gsoap-2.8.17.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:278b37d87fd368c1104d1b5da61ff9ebb29cf462987f3301600799a70ed42ef2 +size 5793624 diff --git a/gsoap.changes b/gsoap.changes index 0cb2690..a0529b4 100644 --- a/gsoap.changes +++ b/gsoap.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Jan 15 19:35:58 UTC 2014 - jengelh@inai.de + +- Update to new upstream release 2.8.17 +* Improved WCF interop duplex messaging requiring ChannelInstances. +* Fixed complexType restriction of schema types with redefined + attributes in wsdl2h output. +* Fixed wcf/WS/DualHttp example (wrong use of send_X() replaced by X() + for client-side operations X, to allow HTTP keep-alive to be used). +* Fixed use of sprintf's that trigger Valgrind and Fortify warnings. +* Fixed parsing character strings from CDATA sections ending in ']'. +* Fixed DOM output for SOAP_XML_CANONICAL c14n normalization of + xmlns namespace bindings. +* Added WS-RM message queueing option for WS-RM NoDiscard. +* Added wsdl2h option -r for authorized web access and proxy access. +- Remove gsoap-04-strerror.diff (merged upstream) + ------------------------------------------------------------------- Thu Jun 27 06:44:56 UTC 2013 - jengelh@inai.de diff --git a/gsoap.spec b/gsoap.spec index 4012191..b2c9659 100644 --- a/gsoap.spec +++ b/gsoap.spec @@ -1,7 +1,7 @@ # # spec file for package gsoap # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,17 +21,16 @@ Name: gsoap 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++ -Version: 2.8.15 +Version: 2.8.17 Release: 0 Url: http://gsoap2.sf.net/ -#DL-URL: http://downloads.sf.net/gsoap2/gsoap_2.8.15.zip +#DL-URL: http://downloads.sf.net/gsoap2/gsoap_2.8.17.zip Source: gsoap-%version.tar.xz Source2: sanitize_source.sh Patch0: gsoap-automake1_13.diff Patch1: gsoap-01-sharedlibs.diff Patch2: gsoap-02-typepuns.diff -Patch4: gsoap-04-strerror.diff Patch5: gsoap-05-ipv6.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -111,7 +110,7 @@ symlinks for libgsoap. tar -xf "%{S:0}" --use=xz; %setup -DTq %endif -%patch -P 0 -P 1 -P 2 -P 4 -P 5 -p1 +%patch -P 0 -P 1 -P 2 -P 5 -p1 %build # Rebuild configure - fix that utterly long mktime test. diff --git a/sanitize_source.sh b/sanitize_source.sh index 2e65404..c810368 100644 --- a/sanitize_source.sh +++ b/sanitize_source.sh @@ -13,7 +13,7 @@ if ! which fduphl >/dev/null; then exit 1; fi; -version="2.8.15"; +version="2.8.17"; shortver="2.8"; # agh... rm -Rf "gsoap-$shortver" "gsoap-$version";