From 05c43bb52777b81a778eae95c634196f988998071366e432e66aa410e9b1d73b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 13 Nov 2018 00:15:12 +0000 Subject: [PATCH] Go back to 2.8.70 due to regression [https://sourceforge.net/p/gsoap2/bugs/1224/] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gsoap?expand=0&rev=144 --- ai_default.diff | 22 ---------- gsconfig.patch | 72 +++++++++++++++--------------- gsoap-01-sharedlibs.diff | 94 ++++++++++++++++++++-------------------- gsoap-2.8.70.tar.xz | 3 ++ gsoap-2.8.71.tar.xz | 3 -- gsoap.changes | 15 ------- gsoap.spec | 9 ++-- sanitize_source.sh | 2 +- 8 files changed, 91 insertions(+), 129 deletions(-) delete mode 100644 ai_default.diff create mode 100644 gsoap-2.8.70.tar.xz delete mode 100644 gsoap-2.8.71.tar.xz diff --git a/ai_default.diff b/ai_default.diff deleted file mode 100644 index f6afdc9..0000000 --- a/ai_default.diff +++ /dev/null @@ -1,22 +0,0 @@ -From: Jan Engelhardt -Date: 2018-11-13 00:49:28.201279291 +0100 -References: https://sourceforge.net/p/gsoap2/bugs/1223/ - -There is no such thing as AI_DEFAULT. ---- - gsoap/stdsoap2.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: gsoap-2.8.71/gsoap/stdsoap2.c -=================================================================== ---- gsoap-2.8.71.orig/gsoap/stdsoap2.cpp -+++ gsoap-2.8.71/gsoap/stdsoap2.cpp -@@ -6697,7 +6697,7 @@ soap_accept(struct soap *soap) - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = PF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; -- hints.ai_flags = AI_DEFAULT | AI_NUMERICHOST | AI_NUMERICSERV; -+ hints.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV; - getnameinfo(&soap->peer.addr, n, soap->host, sizeof(soap->host), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV); - soap->ip = 0; - soap->ip6[0] = 0; diff --git a/gsconfig.patch b/gsconfig.patch index b140c01..647dc82 100644 --- a/gsconfig.patch +++ b/gsconfig.patch @@ -1,13 +1,13 @@ --- Makefile.am | 9 +++++++-- - configure.ac | 36 +++++++++++++++++++++--------------- + configure.ac | 35 +++++++++++++++++++++-------------- gsoap/stdsoap2.h | 38 +++++++++++++++++--------------------- - 3 files changed, 45 insertions(+), 38 deletions(-) + 3 files changed, 45 insertions(+), 37 deletions(-) -Index: gsoap-2.8.71/Makefile.am +Index: gsoap-2.8.68/Makefile.am =================================================================== ---- gsoap-2.8.71.orig/Makefile.am -+++ gsoap-2.8.71/Makefile.am +--- gsoap-2.8.68.orig/Makefile.am ++++ gsoap-2.8.68/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.71/Makefile.am + +gsoap_config.h: config.h + grep GSOAP_WITH_ $^ >$@ -Index: gsoap-2.8.71/configure.ac +Index: gsoap-2.8.68/configure.ac =================================================================== ---- gsoap-2.8.71.orig/configure.ac -+++ gsoap-2.8.71/configure.ac +--- gsoap-2.8.68.orig/configure.ac ++++ gsoap-2.8.68/configure.ac @@ -92,6 +92,13 @@ esac AC_SUBST(SAMPLE_EXTRA_LIBS) AC_SUBST(platform) @@ -47,7 +47,7 @@ Index: gsoap-2.8.71/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]) -@@ -191,21 +198,11 @@ else +@@ -191,21 +198,12 @@ else fi AC_SUBST(SOAPCPP2_NONAMESPACES) @@ -56,25 +56,25 @@ Index: gsoap-2.8.71/configure.ac -AC_ARG_ENABLE(xlocale, - [AC_HELP_STRING([--enable-xlocale], - [compile library with forced inclusion of xlocale.h])], -- [with_xlocale="$enable_xlocale"], +- [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) -- SOAPCPP2_INCLUDE_XLOCALE="-DWITH_INCLUDE_XLOCALE_H" -else - AC_MSG_RESULT(no) +- SOAPCPP2_INCLUDE_XLOCALE="-DWITH_INCLUDE_XLOCALE_H" -fi -+AS_IF([test "x$ac_cv_header_xlocale_h" = xyes], [ -+ AC_DEFINE([GSOAP_WITH_XLOCALE], [1]) + 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 -@@ -236,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) @@ -82,10 +82,10 @@ Index: gsoap-2.8.71/configure.ac + 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" ##define to add IPv6 support + SOAPCPP2_IPV6="-DWITH_IPV6 -DWITH_NO_IPV6_V6ONLY" ##define to add IPv6 support else AC_MSG_RESULT(no) -@@ -291,6 +292,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.71/configure.ac WSDL2H_EXTRA_FLAGS="-DWITH_GNUTLS -DWITH_GZIP" WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz" SAMPLE_INCLUDES= -@@ -298,6 +302,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,19 +104,19 @@ Index: gsoap-2.8.71/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.71/gsoap/stdsoap2.h +Index: gsoap-2.8.68/gsoap/stdsoap2.h =================================================================== ---- gsoap-2.8.71.orig/gsoap/stdsoap2.h -+++ gsoap-2.8.71/gsoap/stdsoap2.h +--- gsoap-2.8.68.orig/gsoap/stdsoap2.h ++++ gsoap-2.8.68/gsoap/stdsoap2.h @@ -54,6 +54,7 @@ A commercial use license is available fr - #define GSOAP_VERSION 20871 + #define GSOAP_VERSION 20870 +#include "gsoap_config.h" #ifdef WITH_SOAPDEFS_H # include "soapdefs.h" /* include user-defined stuff in soapdefs.h */ #endif -@@ -702,11 +703,6 @@ extern intmax_t __strtoull(const char*, +@@ -720,11 +721,6 @@ extern intmax_t __strtoull(const char*, # endif #endif @@ -128,7 +128,7 @@ Index: gsoap-2.8.71/gsoap/stdsoap2.h #ifdef WITH_C_LOCALE # include # if defined(WIN32) && !defined(CYGWIN) -@@ -714,7 +710,7 @@ extern intmax_t __strtoull(const char*, +@@ -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 @@ -137,20 +137,20 @@ Index: gsoap-2.8.71/gsoap/stdsoap2.h # include # endif # define SOAP_LOCALE_T locale_t -@@ -871,9 +867,9 @@ extern intmax_t __strtoull(const char*, +@@ -893,9 +889,9 @@ extern intmax_t __strtoull(const char*, # undef WITH_SELF_PIPE #endif --#if defined(WITH_IPV6_V6ONLY) +-#if defined(WITH_IPV6_V6ONLY) || defined(WITH_NO_IPV6_V6ONLY) -# ifndef WITH_IPV6 -# define WITH_IPV6 -+#if defined(GSOAP_WITH_IPV6_V6ONLY) ++#if defined(GSOAP_WITH_IPV6_V6ONLY) || defined(GSOAP_WITH_NO_IPV6_V6ONLY) +# ifndef GSOAP_WITH_IPV6 +# define GSOAP_WITH_IPV6 # endif #endif -@@ -894,7 +890,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.71/gsoap/stdsoap2.h # define SOAP_GAI_STRERROR gai_strerrorA # endif #else -@@ -918,12 +914,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.71/gsoap/stdsoap2.h # define OPENSSL_NO_KRB5 # include # include -@@ -940,7 +936,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.71/gsoap/stdsoap2.h # include # include # if GNUTLS_VERSION_NUMBER < 0x020b00 -@@ -958,9 +954,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.71/gsoap/stdsoap2.h # endif #endif -@@ -970,7 +966,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.71/gsoap/stdsoap2.h # include #endif -@@ -2926,7 +2922,7 @@ struct SOAP_CMAC soap +@@ -2878,7 +2874,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.71/gsoap/stdsoap2.h int (*fsslauth)(struct soap*); int (*fsslverify)(int, X509_STORE_CTX*); BIO *bio; -@@ -2935,7 +2931,7 @@ struct SOAP_CMAC soap +@@ -2887,7 +2883,7 @@ struct SOAP_CMAC soap SSL_SESSION *session; const char *dhfile; const char *randfile; @@ -223,7 +223,7 @@ Index: gsoap-2.8.71/gsoap/stdsoap2.h int (*fsslauth)(struct soap*); void *fsslverify; gnutls_certificate_credentials_t xcred; /* cert pointer */ -@@ -2977,7 +2973,7 @@ struct SOAP_CMAC soap +@@ -2929,7 +2925,7 @@ struct SOAP_CMAC soap #else void *c_locale; #endif @@ -232,7 +232,7 @@ Index: gsoap-2.8.71/gsoap/stdsoap2.h z_stream *d_stream; /* decompression stream */ uLong z_crc; /* internal gzip crc */ #else -@@ -3123,7 +3119,7 @@ soap_wchar soap_get1(struct soap*); +@@ -3071,7 +3067,7 @@ soap_wchar soap_get1(struct soap*); SOAP_FMAC1 ULONG64 SOAP_FMAC2 soap_strtoull(const char*, char**, int); #endif diff --git a/gsoap-01-sharedlibs.diff b/gsoap-01-sharedlibs.diff index 9e37289..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.71/configure.ac +Index: gsoap-2.8.64/configure.ac =================================================================== ---- gsoap-2.8.71.orig/configure.ac -+++ gsoap-2.8.71/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.71/configure.ac AC_PROG_LN_S AC_PROG_AWK AC_PROG_INSTALL -@@ -298,7 +298,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" @@ -40,7 +40,7 @@ Index: gsoap-2.8.71/configure.ac else AC_MSG_RESULT(no) AC_DEFINE([GSOAP_WITH_OPENSSL], [1]) -@@ -308,7 +308,7 @@ if test "x$with_openssl" = "xyes"; then +@@ -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.71/configure.ac fi if test -n "$ZLIB"; then WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}" -@@ -327,7 +327,7 @@ else +@@ -311,7 +311,7 @@ else WSDL2H_EXTRA_FLAGS= SAMPLE_SSL_LIBS= SAMPLE_INCLUDES= @@ -58,10 +58,10 @@ Index: gsoap-2.8.71/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.71/gsoap/Makefile.am +Index: gsoap-2.8.64/gsoap/Makefile.am =================================================================== ---- gsoap-2.8.71.orig/gsoap/Makefile.am -+++ gsoap-2.8.71/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 @@ -70,91 +70,91 @@ Index: gsoap-2.8.71/gsoap/Makefile.am +lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la -libgsoap_a_SOURCES = stdsoap2.c dom.c --libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) +-libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) -libgsoap___a_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp --libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) +-libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) -libgsoapck_a_SOURCES = stdsoap2_ck.c dom.c --libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) -DWITH_COOKIES +-libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES -libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp --libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) -DWITH_COOKIES +-libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES -libgsoapssl_a_SOURCES = stdsoap2_ssl.c dom.c --libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES +-libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES -libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp --libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES +-libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES +libgsoap_la_SOURCES = stdsoap2.c dom.c -+libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) -+libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp -+libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) -+libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c -+libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) -DWITH_COOKIES -+libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp -+libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) -DWITH_COOKIES -+libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c -+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES -+libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp -+libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES ++libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) +libgsoap_la_LDFLAGS = -release ${PACKAGE_VERSION} -Wl,--version-script=gsoap.sym ++EXTRA_libgsoap_la_DEPENDENCIES = gsoap.sym ++libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp ++libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) +libgsoap___la_LDFLAGS = -release ${PACKAGE_VERSION} -Wl,--version-script=gsoap++.sym ++EXTRA_libgsoap___la_DEPENDENCIES = gsoap++.sym ++libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c ++libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES +libgsoapck_la_LDFLAGS = -release ${PACKAGE_VERSION} -Wl,--version-script=gsoapck.sym ++EXTRA_libgsoapck_la_DEPENDENCIES = gsoapck.sym ++libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp ++libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES +libgsoapck___la_LDFLAGS = -release ${PACKAGE_VERSION} -Wl,--version-script=gsoapck++.sym ++EXTRA_libgsoapck___la_DEPENDENCIES = gsoapck++.sym ++libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c ++libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES +libgsoapssl_la_LDFLAGS = -release ${PACKAGE_VERSION} -Wl,--version-script=gsoapssl.sym +libgsoapssl_la_LIBADD = ${SAMPLE_SSL_LIBS} ++EXTRA_libgsoapssl_la_DEPENDENCIES = gsoapssl.sym ++libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp ++libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES +libgsoapssl___la_LDFLAGS = -release ${PACKAGE_VERSION} -Wl,--version-script=gsoapssl++.sym +libgsoapssl___la_LIBADD = ${libgsoapssl_la_LIBADD} -+EXTRA_libgsoap_la_DEPENDENCIES = gsoap.sym -+EXTRA_libgsoap___la_DEPENDENCIES = gsoap++.sym -+EXTRA_libgsoapck_la_DEPENDENCIES = gsoapck.sym -+EXTRA_libgsoapck___la_DEPENDENCIES = gsoapck++.sym -+EXTRA_libgsoapssl_la_DEPENDENCIES = gsoapssl.sym +EXTRA_libgsoapssl___la_DEPENDENCIES = gsoapssl++.sym 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.71/gsoap/gsoap++.sym +Index: gsoap-2.8.64/gsoap/gsoap++.sym =================================================================== --- /dev/null -+++ gsoap-2.8.71/gsoap/gsoap++.sym ++++ gsoap-2.8.64/gsoap/gsoap++.sym @@ -0,0 +1 @@ +GSOAPXX { global: *; }; -Index: gsoap-2.8.71/gsoap/gsoap.sym +Index: gsoap-2.8.64/gsoap/gsoap.sym =================================================================== --- /dev/null -+++ gsoap-2.8.71/gsoap/gsoap.sym ++++ gsoap-2.8.64/gsoap/gsoap.sym @@ -0,0 +1 @@ +GSOAP { global: *; }; -Index: gsoap-2.8.71/gsoap/gsoapck++.sym +Index: gsoap-2.8.64/gsoap/gsoapck++.sym =================================================================== --- /dev/null -+++ gsoap-2.8.71/gsoap/gsoapck++.sym ++++ gsoap-2.8.64/gsoap/gsoapck++.sym @@ -0,0 +1 @@ +GSOAPCKXX { global: *; }; -Index: gsoap-2.8.71/gsoap/gsoapck.sym +Index: gsoap-2.8.64/gsoap/gsoapck.sym =================================================================== --- /dev/null -+++ gsoap-2.8.71/gsoap/gsoapck.sym ++++ gsoap-2.8.64/gsoap/gsoapck.sym @@ -0,0 +1 @@ +GSOAPCK { global: *; }; -Index: gsoap-2.8.71/gsoap/gsoapckssl++.sym +Index: gsoap-2.8.64/gsoap/gsoapckssl++.sym =================================================================== --- /dev/null -+++ gsoap-2.8.71/gsoap/gsoapckssl++.sym ++++ gsoap-2.8.64/gsoap/gsoapckssl++.sym @@ -0,0 +1 @@ +GSOAPCKSSLXX { global: *; }; -Index: gsoap-2.8.71/gsoap/gsoapckssl.sym +Index: gsoap-2.8.64/gsoap/gsoapckssl.sym =================================================================== --- /dev/null -+++ gsoap-2.8.71/gsoap/gsoapckssl.sym ++++ gsoap-2.8.64/gsoap/gsoapckssl.sym @@ -0,0 +1 @@ +GSOAPCKSSL { global: *; }; -Index: gsoap-2.8.71/gsoap/gsoapssl++.sym +Index: gsoap-2.8.64/gsoap/gsoapssl++.sym =================================================================== --- /dev/null -+++ gsoap-2.8.71/gsoap/gsoapssl++.sym ++++ gsoap-2.8.64/gsoap/gsoapssl++.sym @@ -0,0 +1 @@ +GSOAPSSLXX { global: *; }; -Index: gsoap-2.8.71/gsoap/gsoapssl.sym +Index: gsoap-2.8.64/gsoap/gsoapssl.sym =================================================================== --- /dev/null -+++ gsoap-2.8.71/gsoap/gsoapssl.sym ++++ gsoap-2.8.64/gsoap/gsoapssl.sym @@ -0,0 +1 @@ +GSOAPSSL { global: *; }; diff --git a/gsoap-2.8.70.tar.xz b/gsoap-2.8.70.tar.xz new file mode 100644 index 0000000..c2edf8f --- /dev/null +++ b/gsoap-2.8.70.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:281f87dc559c0abac1773c85a0702c8327d1b8256b2f4df243462abab35ce220 +size 17012552 diff --git a/gsoap-2.8.71.tar.xz b/gsoap-2.8.71.tar.xz deleted file mode 100644 index 4d98ad5..0000000 --- a/gsoap-2.8.71.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb23ea3213f73195644fd4a5876088f0cd3d166bf736af0b470b2409dab63905 -size 16034580 diff --git a/gsoap.changes b/gsoap.changes index 2e37731..6b8d13f 100644 --- a/gsoap.changes +++ b/gsoap.changes @@ -1,18 +1,3 @@ -------------------------------------------------------------------- -Mon Nov 12 23:25:33 UTC 2018 - Jan Engelhardt - -- Update to new upstream release 2.8.71 - * Added TLSv1.3 support with OpenSSL 1.1.1. - * Added HTTP PATCH support. - * Updated SSL/TLS options for `soap_ssl_client_context` and - `soap_ssl_server_context` to allow combinations of - `SOAP_TLSv1_0`, `SOAP_TLSv1_1`, `SOAP_TLSv1_2`, - `SOAP_TLSv1_3` protocols (v1.3 only available with OpenSSL - 1.1.1 and greater), a change from the single TLS protocol - flag. - * Fixed soapcpp2 code generation issue for single- and - multi-dimensional fixed-size arrays. - ------------------------------------------------------------------- Tue Sep 11 11:26:23 UTC 2018 - Jan Engelhardt diff --git a/gsoap.spec b/gsoap.spec index ded477d..34e61ad 100644 --- a/gsoap.spec +++ b/gsoap.spec @@ -12,13 +12,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: gsoap -%define lname libgsoap-2_8_71 -Version: 2.8.71 +%define lname libgsoap-2_8_70 +Version: 2.8.70 Release: 0 Summary: Toolkit for SOAP/REST-based C/C++ server and client web service applications License: SUSE-GPL-2.0+-with-openssl-exception @@ -30,7 +30,6 @@ Source2: sanitize_source.sh Patch1: gsconfig.patch Patch3: gsoap-automake1_13.diff Patch4: gsoap-01-sharedlibs.diff -Patch5: ai_default.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -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 3 -P 4 -P 5 -p1 +%patch -P 1 -P 3 -P 4 -p1 ln -fs stdsoap2.cpp gsoap/stdsoap2.c %build diff --git a/sanitize_source.sh b/sanitize_source.sh index 4517c40..1ea9e49 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.71" +version="2.8.70" shortver="2.8" # agh... if [ ! -e "gsoap_$version.zip" ]; then wget -c "http://downloads.sf.net/gsoap2/gsoap_$version.zip"