diff --git a/gsconfig.patch b/gsconfig.patch new file mode 100644 index 0000000..1f7049d --- /dev/null +++ b/gsconfig.patch @@ -0,0 +1,243 @@ +--- + Makefile.am | 9 +++++++-- + configure.ac | 35 +++++++++++++++++++++-------------- + gsoap/stdsoap2.h | 38 +++++++++++++++++--------------------- + 3 files changed, 45 insertions(+), 37 deletions(-) + +Index: gsoap-2.8.64/Makefile.am +=================================================================== +--- gsoap-2.8.64.orig/Makefile.am ++++ gsoap-2.8.64/Makefile.am +@@ -1,9 +1,9 @@ + ####### This is the input file for automake, which will generate Makefile.in ########## + +-SUBDIRS = gsoap ++SUBDIRS = . gsoap + CLEANFILES = *~ + VERYVERYCLEANFILES = *~ configure Makefile.in compile config.guess config.sub config.log autoscan.log \ +-depcomp install-sh missing mkinstalldirs stamp-h.in config.h.in \ ++depcomp install-sh missing mkinstalldirs stamp-h.in config.h.in gsoap_config.h \ + aclocal.m4 *.cache Makefile + + ## not a GNU package. You can remove this line, if +@@ -52,3 +52,8 @@ backup: + cd $$BACKUPDIR && \ + ls -l $$CURRENTDIR.tgz + ++BUILT_SOURCES = gsoap_config.h ++nodist_include_HEADERS = gsoap_config.h ++ ++gsoap_config.h: config.h ++ grep GSOAP_WITH_ $^ >$@ +Index: gsoap-2.8.64/configure.ac +=================================================================== +--- gsoap-2.8.64.orig/configure.ac ++++ gsoap-2.8.64/configure.ac +@@ -91,6 +91,13 @@ esac + AC_SUBST(SAMPLE_EXTRA_LIBS) + AC_SUBST(platform) + ++AH_TEMPLATE([GSOAP_WITH_GNUTLS], [gsoap API uses gnutls]) ++AH_TEMPLATE([GSOAP_WITH_GZIP], [gsoap API uses gzip/zlib]) ++AH_TEMPLATE([GSOAP_WITH_IPV6], [gsoap API uses IPv6]) ++AH_TEMPLATE([GSOAP_WITH_NO_IPV6_V6ONLY], [gsoap API uses IPv6/v6only]) ++AH_TEMPLATE([GSOAP_WITH_OPENSSL], [gsoap API uses openssl]) ++AH_TEMPLATE([GSOAP_WITH_XLOCALE], [gsoap API uses xlocale.h]) ++ + # 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 + fi + AC_SUBST(SOAPCPP2_NONAMESPACES) + +-# the enable-xlocale option adds the -DWITH_INCLUDE_XLOCALE_H to the +-# library compilation thus forcing the inclusion of xlocale.h +-AC_ARG_ENABLE(xlocale, +- [AC_HELP_STRING([--enable-xlocale], +- [compile library with forced inclusion of xlocale.h])], +- [with_xlocale="$enable_xl"], +- [with_xlocale="no"]) ++AS_IF([test "x$ac_cv_header_xlocale_h" = xyes], [ ++ AC_DEFINE([GSOAP_WITH_XLOCALE], [1]) + +-AC_MSG_CHECKING(for enable xlocale usage in library) +-if test "x$with_xlocale" = "xyes"; then +- AC_MSG_RESULT(yes) +-else +- AC_MSG_RESULT(no) +- SOAPCPP2_INCLUDE_XLOCALE="-DWITH_INCLUDE_XLOCALE_H" +-fi ++ dnl Could get rid of this, since it's defined through gsoap_config.h. ++ SOAPCPP2_INCLUDE_XLOCALE="-DWITH_INCLUDE_XLOCALE_H" ++]) + 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, + AC_MSG_CHECKING(for enable ipv6 in library) + if test "x$with_ipv6" = "xyes"; then + AC_MSG_RESULT(yes) ++ AC_DEFINE([GSOAP_WITH_IPV6], [1]) ++ AC_DEFINE([GSOAP_WITH_NO_IPV6_V6ONLY], [1]) ++ dnl You could just get rid of SOAPCPP2_IPV6 entirely because it's all ++ dnl available through gsoap_config.h now. + 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 + AC_MSG_CHECKING(for enable gnutls in library) + if test "x$with_gnutls" = "xyes"; then + AC_MSG_RESULT(yes) ++ AC_DEFINE([GSOAP_WITH_GNUTLS], [1]) ++ AC_DEFINE([GSOAP_WITH_GZIP], [1]) ++ dnl Could get rid of WSDL2H_EXTRA_FLAGS, since GSOAP_WITH_* is already set by gsoap_config.h + 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 + WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" + else + AC_MSG_RESULT(no) ++ AC_DEFINE([GSOAP_WITH_OPENSSL], [1]) ++ AC_DEFINE([GSOAP_WITH_GZIP], [1]) + 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 +=================================================================== +--- gsoap-2.8.64.orig/gsoap/stdsoap2.h ++++ gsoap-2.8.64/gsoap/stdsoap2.h +@@ -53,6 +53,7 @@ A commercial use license is available fr + */ + + #define GSOAP_VERSION 20864 ++#include "gsoap_config.h" + + #ifdef WITH_SOAPDEFS_H + # include "soapdefs.h" /* include user-defined stuff in soapdefs.h */ +@@ -720,11 +721,6 @@ extern intmax_t __strtoull(const char*, + # endif + #endif + +-/* force inclusion of xlocale.h */ +-#if defined(WITH_INCLUDE_XLOCALE_H) && !defined(HAVE_XLOCALE_H) +-# define HAVE_XLOCALE_H +-#endif +- + #ifdef WITH_C_LOCALE + # include + # if defined(WIN32) && !defined(CYGWIN) +@@ -732,7 +728,7 @@ extern intmax_t __strtoull(const char*, + # define SOAP_LOCALE(soap) ((soap)->c_locale ? (soap)->c_locale : ((soap)->c_locale = _create_locale(LC_ALL, "C"))) + # define SOAP_FREELOCALE(soap) (void)((soap)->c_locale && (_free_locale((soap)->c_locale), ((soap)->c_locale = NULL))) + # else +-# if defined(HAVE_XLOCALE_H) ++# if defined(GSOAP_WITH_XLOCALE) + # include + # endif + # define SOAP_LOCALE_T locale_t +@@ -889,9 +885,9 @@ extern intmax_t __strtoull(const char*, + # define SOAP_WINSOCKINT size_t + #endif + +-#if defined(WITH_IPV6_V6ONLY) || defined(WITH_NO_IPV6_V6ONLY) +-# ifndef WITH_IPV6 +-# define WITH_IPV6 ++#if defined(GSOAP_WITH_IPV6_V6ONLY) || defined(GSOAP_WITH_NO_IPV6_V6ONLY) ++# ifndef GSOAP_WITH_IPV6 ++# define GSOAP_WITH_IPV6 + # endif + #endif + +@@ -912,7 +908,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 +-# ifdef WITH_IPV6 ++# ifdef GSOAP_WITH_IPV6 + # define SOAP_GAI_STRERROR gai_strerrorA + # endif + #else +@@ -938,12 +934,12 @@ extern intmax_t __strtoull(const char*, + # include + #endif + +-#ifdef WITH_OPENSSL ++#ifdef GSOAP_WITH_OPENSSL + # ifdef __VMS + # pragma names save + # pragma names uppercase + # endif +-# undef WITH_GNUTLS ++# undef GSOAP_WITH_GNUTLS + # define OPENSSL_NO_KRB5 + # include + # include +@@ -960,7 +956,7 @@ extern intmax_t __strtoull(const char*, + # endif + #endif + +-#ifdef WITH_GNUTLS ++#ifdef GSOAP_WITH_GNUTLS + # include + # include + # if GNUTLS_VERSION_NUMBER < 0x020b00 +@@ -978,9 +974,9 @@ extern intmax_t __strtoull(const char*, + # include + #endif + +-#ifdef WITH_GZIP +-# ifndef WITH_ZLIB +-# define WITH_ZLIB ++#ifdef GSOAP_WITH_GZIP ++# ifndef GSOAP_WITH_ZLIB ++# define GSOAP_WITH_ZLIB + # endif + #endif + +@@ -990,7 +986,7 @@ extern intmax_t __strtoull(const char*, + # define SOAP_STRCMP strcmp /* case sensitive XML element/attribute names */ + #endif + +-#ifdef WITH_ZLIB ++#ifdef GSOAP_WITH_ZLIB + # include + #endif + +@@ -2881,7 +2877,7 @@ struct SOAP_CMAC soap + } peer; /* set by soap_connect/soap_accept and by UDP recv */ + size_t peerlen; + #endif +-#if defined(WITH_OPENSSL) /* OpenSSL */ ++#if defined(GSOAP_WITH_OPENSSL) /* OpenSSL */ + int (*fsslauth)(struct soap*); + int (*fsslverify)(int, X509_STORE_CTX*); + BIO *bio; +@@ -2890,7 +2886,7 @@ struct SOAP_CMAC soap + SSL_SESSION *session; + const char *dhfile; + const char *randfile; +-#elif defined(WITH_GNUTLS) /* GNUTLS */ ++#elif defined(GSOAP_WITH_GNUTLS) /* GNUTLS */ + int (*fsslauth)(struct soap*); + void *fsslverify; + gnutls_certificate_credentials_t xcred; /* cert pointer */ +@@ -2932,7 +2928,7 @@ struct SOAP_CMAC soap + #else + void *c_locale; + #endif +-#ifdef WITH_ZLIB ++#ifdef GSOAP_WITH_ZLIB + z_stream *d_stream; /* decompression stream */ + uLong z_crc; /* internal gzip crc */ + #else +@@ -3074,7 +3070,7 @@ soap_wchar soap_get1(struct soap*); + SOAP_FMAC1 ULONG64 SOAP_FMAC2 soap_strtoull(const char*, char**, int); + #endif + +-#if defined(WITH_OPENSSL) ++#if defined(GSOAP_WITH_OPENSSL) + # define soap_random soap_rand() + SOAP_FMAC1 int SOAP_FMAC2 soap_rand(void); + #elif defined(UNDER_CE) diff --git a/gsoap-01-sharedlibs.diff b/gsoap-01-sharedlibs.diff index 1f659e7..a25b22e 100644 --- a/gsoap-01-sharedlibs.diff +++ b/gsoap-01-sharedlibs.diff @@ -16,10 +16,10 @@ build: always use shared libraries gsoap/gsoapssl.sym | 1 + 10 files changed, 40 insertions(+), 18 deletions(-) -Index: gsoap-2.8.57/configure.ac +Index: gsoap-2.8.64/configure.ac =================================================================== ---- gsoap-2.8.57.orig/configure.ac -+++ gsoap-2.8.57/configure.ac +--- gsoap-2.8.64.orig/configure.ac ++++ gsoap-2.8.64/configure.ac @@ -15,8 +15,8 @@ AM_PROG_CC_C_O AM_PROG_LEX AC_PROG_YACC @@ -31,7 +31,7 @@ Index: gsoap-2.8.57/configure.ac AC_PROG_LN_S AC_PROG_AWK AC_PROG_INSTALL -@@ -258,7 +258,7 @@ if test "x$with_openssl" = "xyes"; then +@@ -282,7 +282,7 @@ if test "x$with_openssl" = "xyes"; then WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz" SAMPLE_INCLUDES= SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" @@ -39,8 +39,8 @@ Index: gsoap-2.8.57/configure.ac + WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la" else AC_MSG_RESULT(no) - WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP" -@@ -266,7 +266,7 @@ if test "x$with_openssl" = "xyes"; then + AC_DEFINE([GSOAP_WITH_OPENSSL], [1]) +@@ -292,7 +292,7 @@ if test "x$with_openssl" = "xyes"; then WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz" SAMPLE_INCLUDES= SAMPLE_SSL_LIBS="-lssl -lcrypto -lz" @@ -49,7 +49,7 @@ Index: gsoap-2.8.57/configure.ac fi if test -n "$ZLIB"; then WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}" -@@ -285,7 +285,7 @@ else +@@ -311,7 +311,7 @@ else WSDL2H_EXTRA_FLAGS= SAMPLE_SSL_LIBS= SAMPLE_INCLUDES= @@ -58,10 +58,10 @@ Index: gsoap-2.8.57/configure.ac fi AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes") AC_SUBST(WITH_OPENSSL) -Index: gsoap-2.8.57/gsoap/Makefile.am +Index: gsoap-2.8.64/gsoap/Makefile.am =================================================================== ---- gsoap-2.8.57.orig/gsoap/Makefile.am -+++ gsoap-2.8.57/gsoap/Makefile.am +--- gsoap-2.8.64.orig/gsoap/Makefile.am ++++ gsoap-2.8.64/gsoap/Makefile.am @@ -34,20 +34,34 @@ stdsoap2_ssl_cpp.cpp: stdsoap2.cpp dom_cpp.cpp: dom.cpp $(LN_S) -f $(top_srcdir)/gsoap/dom.cpp dom_cpp.cpp @@ -110,51 +110,51 @@ Index: gsoap-2.8.57/gsoap/Makefile.am BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp -Index: gsoap-2.8.57/gsoap/gsoap++.sym +Index: gsoap-2.8.64/gsoap/gsoap++.sym =================================================================== --- /dev/null -+++ gsoap-2.8.57/gsoap/gsoap++.sym ++++ gsoap-2.8.64/gsoap/gsoap++.sym @@ -0,0 +1 @@ +GSOAPXX { global: *; }; -Index: gsoap-2.8.57/gsoap/gsoap.sym +Index: gsoap-2.8.64/gsoap/gsoap.sym =================================================================== --- /dev/null -+++ gsoap-2.8.57/gsoap/gsoap.sym ++++ gsoap-2.8.64/gsoap/gsoap.sym @@ -0,0 +1 @@ +GSOAP { global: *; }; -Index: gsoap-2.8.57/gsoap/gsoapck++.sym +Index: gsoap-2.8.64/gsoap/gsoapck++.sym =================================================================== --- /dev/null -+++ gsoap-2.8.57/gsoap/gsoapck++.sym ++++ gsoap-2.8.64/gsoap/gsoapck++.sym @@ -0,0 +1 @@ +GSOAPCKXX { global: *; }; -Index: gsoap-2.8.57/gsoap/gsoapck.sym +Index: gsoap-2.8.64/gsoap/gsoapck.sym =================================================================== --- /dev/null -+++ gsoap-2.8.57/gsoap/gsoapck.sym ++++ gsoap-2.8.64/gsoap/gsoapck.sym @@ -0,0 +1 @@ +GSOAPCK { global: *; }; -Index: gsoap-2.8.57/gsoap/gsoapckssl++.sym +Index: gsoap-2.8.64/gsoap/gsoapckssl++.sym =================================================================== --- /dev/null -+++ gsoap-2.8.57/gsoap/gsoapckssl++.sym ++++ gsoap-2.8.64/gsoap/gsoapckssl++.sym @@ -0,0 +1 @@ +GSOAPCKSSLXX { global: *; }; -Index: gsoap-2.8.57/gsoap/gsoapckssl.sym +Index: gsoap-2.8.64/gsoap/gsoapckssl.sym =================================================================== --- /dev/null -+++ gsoap-2.8.57/gsoap/gsoapckssl.sym ++++ gsoap-2.8.64/gsoap/gsoapckssl.sym @@ -0,0 +1 @@ +GSOAPCKSSL { global: *; }; -Index: gsoap-2.8.57/gsoap/gsoapssl++.sym +Index: gsoap-2.8.64/gsoap/gsoapssl++.sym =================================================================== --- /dev/null -+++ gsoap-2.8.57/gsoap/gsoapssl++.sym ++++ gsoap-2.8.64/gsoap/gsoapssl++.sym @@ -0,0 +1 @@ +GSOAPSSLXX { global: *; }; -Index: gsoap-2.8.57/gsoap/gsoapssl.sym +Index: gsoap-2.8.64/gsoap/gsoapssl.sym =================================================================== --- /dev/null -+++ gsoap-2.8.57/gsoap/gsoapssl.sym ++++ gsoap-2.8.64/gsoap/gsoapssl.sym @@ -0,0 +1 @@ +GSOAPSSL { global: *; }; diff --git a/gsoap-2.8.63.tar.xz b/gsoap-2.8.63.tar.xz deleted file mode 100644 index 65b6450..0000000 --- a/gsoap-2.8.63.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d862b5682c79e787069b4db770984f3c2cefd04d3b13a04c5a77a5dd54d34aa -size 17453404 diff --git a/gsoap-2.8.64.tar.xz b/gsoap-2.8.64.tar.xz new file mode 100644 index 0000000..9d07b17 --- /dev/null +++ b/gsoap-2.8.64.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78f47beeff750bb1cea1534949992f77cacaa6b59f5b9309e7a3b98ce8be6cd1 +size 17247736 diff --git a/gsoap.changes b/gsoap.changes index 3372d97..2d6dd95 100644 --- a/gsoap.changes +++ b/gsoap.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Mar 5 20:19:50 UTC 2018 - jengelh@inai.de + +- Update to new upstream release 2.8.64 + * Upgraded TLS/SSL engine to support GNUTLS 3.3.0 and greater. + * Improved Test Messenger with new options `-d num` and `-u`, + where `-dnum` specifies the number of iterations to hit a + server with test messages, and `-u` includes Unicode + characters in randomized content. Other usability + improvements and a bug fix. + * Improved WSSE WS-Security plugin and added documentation + section with clarifications on how the plugin defends against + signature wrapping attacks when you perform signature + verification function calls. +- Remove xlocale.diff +- Add gsconfig.patch, linker.patch + ------------------------------------------------------------------- Mon Feb 26 11:54:21 UTC 2018 - jengelh@inai.de diff --git a/gsoap.spec b/gsoap.spec index 4bdd301..428b095 100644 --- a/gsoap.spec +++ b/gsoap.spec @@ -17,8 +17,8 @@ Name: gsoap -%define lname libgsoap-2_8_63 -Version: 2.8.63 +%define lname libgsoap-2_8_64 +Version: 2.8.64 Release: 0 Summary: Toolkit for SOAP/REST-based C/C++ server and client web service applications License: SUSE-GPL-2.0+-with-openssl-exception @@ -27,9 +27,10 @@ Url: http://www.genivia.com/dev.html Source: gsoap-%version.tar.xz Source2: sanitize_source.sh -Patch1: gsoap-automake1_13.diff -Patch2: gsoap-01-sharedlibs.diff -Patch3: xlocale.diff +Patch1: gsconfig.patch +Patch2: linker.patch +Patch3: gsoap-automake1_13.diff +Patch4: gsoap-01-sharedlibs.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -84,7 +85,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 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -p1 ln -fs stdsoap2.cpp gsoap/stdsoap2.c %build @@ -95,9 +96,6 @@ perl -i -lpe 's{AC_INIT\(gsoap, 2.8\)}{AC_INIT([gsoap], [%version])}' \ # Rebuild configure - fix that utterly long mktime test. # Also needed because Makefile.am and configure.ac are touched. autoreconf -fi - -export CXXFLAGS="-O0 -ggdb3" -export CFLAGS="-O0 -ggdb3" %configure --enable-ipv6 --disable-static pushd gsoap/src/ # build prerequisites for parallel build first diff --git a/linker.patch b/linker.patch new file mode 100644 index 0000000..4746b68 --- /dev/null +++ b/linker.patch @@ -0,0 +1,28 @@ +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 d323830..af82ffb 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.63" +version="2.8.64" shortver="2.8" # agh... if [ ! -e "gsoap_$version.zip" ]; then wget -c "http://downloads.sf.net/gsoap2/gsoap_$version.zip" diff --git a/xlocale.diff b/xlocale.diff deleted file mode 100644 index b0a5010..0000000 --- a/xlocale.diff +++ /dev/null @@ -1,17 +0,0 @@ -Kill this again. There just IS NOT ANY xlocale.h in glibc-2.26. ---- - gsoap/stdsoap2.h | 1 - - 1 file changed, 1 deletion(-) - -Index: gsoap-2.8.62/gsoap/stdsoap2.h -=================================================================== ---- gsoap-2.8.62.orig/gsoap/stdsoap2.h -+++ gsoap-2.8.62/gsoap/stdsoap2.h -@@ -464,7 +464,6 @@ extern intmax_t __strtoull(const char*, - # define HAVE_STRTOD_L - # define HAVE_SSCANF_L - # define HAVE_LOCALE_H --# define HAVE_XLOCALE_H - # endif - # elif defined(TRU64) - # define HAVE_SNPRINTF