diff --git a/gsoap-01-sharedlibs.diff b/gsoap-01-sharedlibs.diff index 74d795d..1ce3314 100644 --- a/gsoap-01-sharedlibs.diff +++ b/gsoap-01-sharedlibs.diff @@ -16,12 +16,12 @@ build: always use shared libraries gsoap/gsoapssl.sym | 1 + 10 files changed, 40 insertions(+), 18 deletions(-) -Index: gsoap-2.8.102/configure.ac +Index: gsoap-2.8.121/configure.ac =================================================================== ---- gsoap-2.8.102.orig/configure.ac -+++ gsoap-2.8.102/configure.ac +--- gsoap-2.8.121.orig/configure.ac ++++ gsoap-2.8.121/configure.ac @@ -15,8 +15,8 @@ AM_PROG_CC_C_O - AM_PROG_LEX + AM_PROG_LEX([noyywrap]) AC_PROG_YACC AC_PROG_CPP -AC_PROG_RANLIB @@ -31,7 +31,7 @@ Index: gsoap-2.8.102/configure.ac AC_PROG_LN_S AC_PROG_AWK AC_PROG_INSTALL -@@ -306,7 +306,7 @@ if test "x$with_openssl" = "xyes"; then +@@ -303,7 +303,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.102/configure.ac else AC_MSG_RESULT(no) WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP" -@@ -314,7 +314,7 @@ if test "x$with_openssl" = "xyes"; then +@@ -311,7 +311,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.102/configure.ac fi if test -n "$ZLIB"; then WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}" -@@ -333,7 +333,7 @@ else +@@ -330,7 +330,7 @@ else WSDL2H_EXTRA_FLAGS= SAMPLE_SSL_LIBS= SAMPLE_INCLUDES= @@ -58,10 +58,10 @@ Index: gsoap-2.8.102/configure.ac fi AM_CONDITIONAL([WITH_OPENSSL], [test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes"]) AC_SUBST(WSDL2H_EXTRA_FLAGS) -Index: gsoap-2.8.102/gsoap/Makefile.am +Index: gsoap-2.8.121/gsoap/Makefile.am =================================================================== ---- gsoap-2.8.102.orig/gsoap/Makefile.am -+++ gsoap-2.8.102/gsoap/Makefile.am +--- gsoap-2.8.121.orig/gsoap/Makefile.am ++++ gsoap-2.8.121/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.102/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.102/gsoap/gsoap++.sym +Index: gsoap-2.8.121/gsoap/gsoap++.sym =================================================================== --- /dev/null -+++ gsoap-2.8.102/gsoap/gsoap++.sym ++++ gsoap-2.8.121/gsoap/gsoap++.sym @@ -0,0 +1 @@ +GSOAPXX { global: *; }; -Index: gsoap-2.8.102/gsoap/gsoap.sym +Index: gsoap-2.8.121/gsoap/gsoap.sym =================================================================== --- /dev/null -+++ gsoap-2.8.102/gsoap/gsoap.sym ++++ gsoap-2.8.121/gsoap/gsoap.sym @@ -0,0 +1 @@ +GSOAP { global: *; }; -Index: gsoap-2.8.102/gsoap/gsoapck++.sym +Index: gsoap-2.8.121/gsoap/gsoapck++.sym =================================================================== --- /dev/null -+++ gsoap-2.8.102/gsoap/gsoapck++.sym ++++ gsoap-2.8.121/gsoap/gsoapck++.sym @@ -0,0 +1 @@ +GSOAPCKXX { global: *; }; -Index: gsoap-2.8.102/gsoap/gsoapck.sym +Index: gsoap-2.8.121/gsoap/gsoapck.sym =================================================================== --- /dev/null -+++ gsoap-2.8.102/gsoap/gsoapck.sym ++++ gsoap-2.8.121/gsoap/gsoapck.sym @@ -0,0 +1 @@ +GSOAPCK { global: *; }; -Index: gsoap-2.8.102/gsoap/gsoapckssl++.sym +Index: gsoap-2.8.121/gsoap/gsoapckssl++.sym =================================================================== --- /dev/null -+++ gsoap-2.8.102/gsoap/gsoapckssl++.sym ++++ gsoap-2.8.121/gsoap/gsoapckssl++.sym @@ -0,0 +1 @@ +GSOAPCKSSLXX { global: *; }; -Index: gsoap-2.8.102/gsoap/gsoapckssl.sym +Index: gsoap-2.8.121/gsoap/gsoapckssl.sym =================================================================== --- /dev/null -+++ gsoap-2.8.102/gsoap/gsoapckssl.sym ++++ gsoap-2.8.121/gsoap/gsoapckssl.sym @@ -0,0 +1 @@ +GSOAPCKSSL { global: *; }; -Index: gsoap-2.8.102/gsoap/gsoapssl++.sym +Index: gsoap-2.8.121/gsoap/gsoapssl++.sym =================================================================== --- /dev/null -+++ gsoap-2.8.102/gsoap/gsoapssl++.sym ++++ gsoap-2.8.121/gsoap/gsoapssl++.sym @@ -0,0 +1 @@ +GSOAPSSLXX { global: *; }; -Index: gsoap-2.8.102/gsoap/gsoapssl.sym +Index: gsoap-2.8.121/gsoap/gsoapssl.sym =================================================================== --- /dev/null -+++ gsoap-2.8.102/gsoap/gsoapssl.sym ++++ gsoap-2.8.121/gsoap/gsoapssl.sym @@ -0,0 +1 @@ +GSOAPSSL { global: *; }; diff --git a/gsoap-2.8.117.tar.xz b/gsoap-2.8.117.tar.xz deleted file mode 100644 index bef72a7..0000000 --- a/gsoap-2.8.117.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ea0a9187339b1910e9c07738c1960e67cc16b3f7769ea5a4c9a5705b7b83844 -size 17539024 diff --git a/gsoap-2.8.121.tar.xz b/gsoap-2.8.121.tar.xz new file mode 100644 index 0000000..2090eb9 --- /dev/null +++ b/gsoap-2.8.121.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:971662fad6c49cb8df16ee795fd3ba36c6dd4c2f5ed10002bf3373a4b5863b7b +size 17704056 diff --git a/gsoap-automake1_13.diff b/gsoap-automake1_13.diff deleted file mode 100644 index 0cdbb1e..0000000 --- a/gsoap-automake1_13.diff +++ /dev/null @@ -1,23 +0,0 @@ -From: Jan Engelhardt -Date: 2013-02-28 23:21:08.137905619 +0100 - -automake-1.13 has finally removed AM_CONFIG_HEADER. - ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -Index: gsoap-2.8.57/configure.ac -=================================================================== ---- gsoap-2.8.57.orig/configure.ac -+++ gsoap-2.8.57/configure.ac -@@ -4,8 +4,7 @@ AM_INIT_AUTOMAKE([foreign]) - AC_CONFIG_SRCDIR([gsoap/stdsoap2.cpp]) - AC_CANONICAL_HOST - --# AC_CONFIG_HEADERS([config.h]) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS([config.h]) - - # we use subdirs. - AC_PROG_MAKE_SET diff --git a/gsoap.changes b/gsoap.changes index 827e2b6..e55a9b7 100644 --- a/gsoap.changes +++ b/gsoap.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Sun Apr 10 12:59:47 UTC 2022 - Jan Engelhardt + +- Update to release 2.8.121 + * Stricter strict mode flag `SOAP_XML_STRICT` to reject + attributes with an unquoted value and attributes without a + value, this update rejects legacy XML-like formats such as + HTML. + * Improved wsdl2h tool to handle problematic SOAP header + definitions with doc/lit and rpc mixing with invalid or + missing message parts. + * Improved wsdl2h tool to handle ONVIF schemas better, notably + avoid the `final` C++ keyword clash. + * Added `fencoding` callback to inspect and accept or reject + special non-latin/UTF-8 XML encodings. + * Updated wsdl2h option -I to import schemas more + "authoritively" by checking lastly the -I path without the + importing WSDL/XSD location to import schemas (this also + restores the -I option behavior prior to 2.8.75). +- Drop gsoap-automake1_13.diff (merged) + ------------------------------------------------------------------- Thu Aug 19 20:06:01 UTC 2021 - Jan Engelhardt diff --git a/gsoap.spec b/gsoap.spec index 9f5926f..d8c32db 100644 --- a/gsoap.spec +++ b/gsoap.spec @@ -1,7 +1,7 @@ # # spec file for package gsoap # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,8 +17,8 @@ Name: gsoap -%define lname libgsoap-2_8_117 -Version: 2.8.117 +%define lname libgsoap-2_8_121 +Version: 2.8.121 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,7 +27,6 @@ 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 BuildRequires: autoconf BuildRequires: automake @@ -80,16 +79,19 @@ This subpackage contains the documentation for the gSOAP toolkit. %prep %setup -q cmp gsoap/stdsoap2.cpp gsoap/stdsoap2.c -%patch -P 1 -P 2 -p1 +%patch -P 2 -p1 ln -fs stdsoap2.cpp gsoap/stdsoap2.c %build -# The version is used for filenames, and GSOAP changed its ABI between -# 2.8.22 and 2.8.28, so we need the full version. -perl -i -lpe 's{AC_INIT\(gsoap, 2.8\)}{AC_INIT([gsoap], [%version])}' \ +# GSOAP changes its ABI between 2.8.22 and 2.8.28 without updating the SONAMEs. +# Therefore, the full version must be present in the SONAME (and we can trigger +# this by updating the AC_INIT field in this instance). +# +perl -i -lpe 's{AC_INIT\(\[gsoap\], 2.8\)}{AC_INIT([gsoap], [%version])}' \ configure.ac # Rebuild configure - fix that utterly long mktime test. # Also needed because Makefile.am and configure.ac are touched. +# autoreconf -fi %configure --enable-ipv6 --disable-static CFLAGS="%optflags -fcommon" pushd gsoap/src/ diff --git a/sanitize_source.sh b/sanitize_source.sh index 3bb7186..cc95e89 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.117" +version="2.8.121" shortver="2.8" # agh... if [ ! -e "gsoap_$version.zip" ]; then wget -c "https://downloads.sf.net/gsoap2/gsoap_$version.zip"