diff --git a/gsconfig.patch b/gsconfig.patch index 1f7049d..24c352c 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.64/Makefile.am +Index: gsoap-2.8.65/Makefile.am =================================================================== ---- gsoap-2.8.64.orig/Makefile.am -+++ gsoap-2.8.64/Makefile.am +--- gsoap-2.8.65.orig/Makefile.am ++++ gsoap-2.8.65/Makefile.am @@ -1,9 +1,9 @@ ####### This is the input file for automake, which will generate Makefile.in ########## @@ -29,11 +29,11 @@ Index: gsoap-2.8.64/Makefile.am + +gsoap_config.h: config.h + grep GSOAP_WITH_ $^ >$@ -Index: gsoap-2.8.64/configure.ac +Index: gsoap-2.8.65/configure.ac =================================================================== ---- gsoap-2.8.64.orig/configure.ac -+++ gsoap-2.8.64/configure.ac -@@ -91,6 +91,13 @@ esac +--- gsoap-2.8.65.orig/configure.ac ++++ gsoap-2.8.65/configure.ac +@@ -92,6 +92,13 @@ esac AC_SUBST(SAMPLE_EXTRA_LIBS) AC_SUBST(platform) @@ -47,7 +47,7 @@ Index: gsoap-2.8.64/configure.ac # Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS([arpa/inet.h locale.h xlocale.h errno.h fcntl.h ctype.h limits.h float.h math.h netdb.h netinet/in.h stdlib.h string.h strings.h stdint.h inttypes.h time.h sys/inttypes.h sys/socket.h sys/types.h sys/time.h sys/timeb.h unistd.h poll.h openssl/ssl.h gnutls/gnutls.h zlib.h]) -@@ -190,21 +197,12 @@ else +@@ -191,21 +198,12 @@ else fi AC_SUBST(SOAPCPP2_NONAMESPACES) @@ -74,7 +74,7 @@ Index: gsoap-2.8.64/configure.ac AC_SUBST(SOAPCPP2_INCLUDE_XLOCALE) # the disable-c-locale option adds the -DWITH_NO_C_LOCALE to the -@@ -235,6 +233,10 @@ AC_ARG_ENABLE(ipv6, +@@ -236,6 +234,10 @@ AC_ARG_ENABLE(ipv6, AC_MSG_CHECKING(for enable ipv6 in library) if test "x$with_ipv6" = "xyes"; then AC_MSG_RESULT(yes) @@ -85,7 +85,7 @@ Index: gsoap-2.8.64/configure.ac SOAPCPP2_IPV6="-DWITH_IPV6 -DWITH_NO_IPV6_V6ONLY" ##define to add IPv6 support else AC_MSG_RESULT(no) -@@ -273,6 +275,9 @@ if test "x$with_openssl" = "xyes"; then +@@ -274,6 +276,9 @@ if test "x$with_openssl" = "xyes"; then AC_MSG_CHECKING(for enable gnutls in library) if test "x$with_gnutls" = "xyes"; then AC_MSG_RESULT(yes) @@ -95,7 +95,7 @@ Index: gsoap-2.8.64/configure.ac WSDL2H_EXTRA_FLAGS="-DWITH_GNUTLS -DWITH_GZIP" WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz" SAMPLE_INCLUDES= -@@ -280,6 +285,8 @@ if test "x$with_openssl" = "xyes"; then +@@ -281,6 +286,8 @@ if test "x$with_openssl" = "xyes"; then WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" else AC_MSG_RESULT(no) @@ -104,14 +104,14 @@ Index: gsoap-2.8.64/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.64/gsoap/stdsoap2.h +Index: gsoap-2.8.65/gsoap/stdsoap2.h =================================================================== ---- gsoap-2.8.64.orig/gsoap/stdsoap2.h -+++ gsoap-2.8.64/gsoap/stdsoap2.h +--- gsoap-2.8.65.orig/gsoap/stdsoap2.h ++++ gsoap-2.8.65/gsoap/stdsoap2.h @@ -53,6 +53,7 @@ A commercial use license is available fr */ - #define GSOAP_VERSION 20864 + #define GSOAP_VERSION 20865 +#include "gsoap_config.h" #ifdef WITH_SOAPDEFS_H diff --git a/gsoap-2.8.64.tar.xz b/gsoap-2.8.64.tar.xz deleted file mode 100644 index 9d07b17..0000000 --- a/gsoap-2.8.64.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78f47beeff750bb1cea1534949992f77cacaa6b59f5b9309e7a3b98ce8be6cd1 -size 17247736 diff --git a/gsoap-2.8.65.tar.xz b/gsoap-2.8.65.tar.xz new file mode 100644 index 0000000..d0cf98a --- /dev/null +++ b/gsoap-2.8.65.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e614069333b957133be76dc6cdb40a4b10d6bc076969daccf613da7cd4fe5238 +size 17253876 diff --git a/gsoap.changes b/gsoap.changes index 2d6dd95..92a41c4 100644 --- a/gsoap.changes +++ b/gsoap.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Mar 10 09:52:44 UTC 2018 - jengelh@inai.de + +- Update to new upstream release 2.8.65 + * Corrected an issue in soapcpp2 to parse negative floating range + bounds declared in typedefs. +- Remove linker.patch (merged upstream) + ------------------------------------------------------------------- Mon Mar 5 20:19:50 UTC 2018 - jengelh@inai.de diff --git a/gsoap.spec b/gsoap.spec index 428b095..3d877db 100644 --- a/gsoap.spec +++ b/gsoap.spec @@ -17,8 +17,8 @@ Name: gsoap -%define lname libgsoap-2_8_64 -Version: 2.8.64 +%define lname libgsoap-2_8_65 +Version: 2.8.65 Release: 0 Summary: Toolkit for SOAP/REST-based C/C++ server and client web service applications License: SUSE-GPL-2.0+-with-openssl-exception @@ -28,7 +28,6 @@ Url: http://www.genivia.com/dev.html Source: gsoap-%version.tar.xz Source2: sanitize_source.sh Patch1: gsconfig.patch -Patch2: linker.patch Patch3: gsoap-automake1_13.diff Patch4: gsoap-01-sharedlibs.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -85,7 +84,7 @@ This subpackage contains the documentation for the gSOAP toolkit. %prep %setup -q cmp gsoap/stdsoap2.cpp gsoap/stdsoap2.c -%patch -P 1 -P 2 -P 3 -P 4 -p1 +%patch -P 1 -P 3 -P 4 -p1 ln -fs stdsoap2.cpp gsoap/stdsoap2.c %build diff --git a/linker.patch b/linker.patch deleted file mode 100644 index 4746b68..0000000 --- a/linker.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Jan Engelhardt -Date: 2018-03-06 09:34:40.580751345 +0100 - -Adding source files in LDADD is nonsensical. Linker frontend programs like -"gcc" will nevertheless ingest them, but since automake is not passing CXXFLAGS -(since it is calling the linker, not the compiler!), it is possible for -compilation to fail. - ---- - gsoap/wsdl/Makefile.am | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -Index: gsoap-2.8.64/gsoap/wsdl/Makefile.am -=================================================================== ---- gsoap-2.8.64.orig/gsoap/wsdl/Makefile.am -+++ gsoap-2.8.64/gsoap/wsdl/Makefile.am -@@ -30,9 +30,8 @@ wsdl2h_CXXFLAGS=$(C_DEBUG_FLAGS) $(SOAPC - wsdl2h_CPPFLAGS=$(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform) - wsdl2h_SOURCES=wsdl2h.cpp wsdl.cpp wadl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp wsp.cpp bpel.cpp $(SOAP_CPP_SRC) - if WITH_OPENSSL --wsdl2h_LDADD=$(SOAP_CPP_LIB) $(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c $(top_srcdir)/gsoap/plugin/threads.c $(WSDL2H_EXTRA_LIBS) --else --wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS) -+wsdl2h_SOURCES += $(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c $(top_srcdir)/gsoap/plugin/threads.c - endif -+wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS) - - CLEANFILES= *~ *C.cpp *H.h *Stub.h *.nsmap diff --git a/sanitize_source.sh b/sanitize_source.sh index af82ffb..7a20092 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.64" +version="2.8.65" shortver="2.8" # agh... if [ ! -e "gsoap_$version.zip" ]; then wget -c "http://downloads.sf.net/gsoap2/gsoap_$version.zip"