diff --git a/gsoap-libtool.patch b/gsoap-libtool.patch index df4c70607a44b3bda91208df068badbe8abf9310..3d6d93f62330a77deb10c32c6f50cdc222c25e2d 100644 --- a/gsoap-libtool.patch +++ b/gsoap-libtool.patch @@ -1,6 +1,6 @@ diff -ur gsoap-2.8.orig/configure.ac gsoap-2.8/configure.ac ---- gsoap-2.8.orig/configure.ac 2022-12-04 22:03:49.000000000 +0100 -+++ gsoap-2.8/configure.ac 2022-12-21 06:11:12.732737406 +0100 +--- gsoap-2.8.orig/configure.ac 2023-12-23 15:54:31.000000000 +0100 ++++ gsoap-2.8/configure.ac 2024-01-22 23:35:13.194024293 +0100 @@ -15,8 +15,7 @@ AM_PROG_LEX([noyywrap]) AC_PROG_YACC @@ -11,37 +11,46 @@ diff -ur gsoap-2.8.orig/configure.ac gsoap-2.8/configure.ac AC_PROG_LN_S AC_PROG_AWK AC_PROG_INSTALL -@@ -303,15 +302,15 @@ +@@ -310,7 +309,7 @@ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz" SAMPLE_INCLUDES= SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" - WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" + WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la" else - AC_MSG_RESULT(no) - WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP" - # compile with wsdl2h when OPENSSL is available -- WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz" -+ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lcrypto" - SAMPLE_INCLUDES= - SAMPLE_SSL_LIBS="-lssl -lcrypto -lz" -- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" -+ WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la" + if test "x$with_wolfssl" = "xyes"; then + AC_MSG_RESULT(yes) +@@ -318,15 +317,15 @@ + WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lwolfssl -lz" + SAMPLE_INCLUDES= + SAMPLE_SSL_LIBS="-lwolfssl -lz" +- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" ++ WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la" + else + AC_MSG_RESULT(no) + WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP" + # compile with wsdl2h when OPENSSL is available +- WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz" ++ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lcrypto" + SAMPLE_INCLUDES= + SAMPLE_SSL_LIBS="-lssl -lcrypto -lz" +- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" ++ WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la" + fi fi if test -n "$ZLIB"; then - WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}" -@@ -330,7 +329,7 @@ +@@ -346,7 +345,7 @@ WSDL2H_EXTRA_FLAGS= SAMPLE_SSL_LIBS= SAMPLE_INCLUDES= - WSDL2H_SOAP_CPP_LIB="libgsoap++.a" + WSDL2H_SOAP_CPP_LIB="libgsoap++.la" fi - AM_CONDITIONAL([WITH_OPENSSL], [test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes"]) + AM_CONDITIONAL([WITH_OPENSSL], [test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes" -a "x$with_wolfssl" != "xyes"]) AC_SUBST(WSDL2H_EXTRA_FLAGS) diff -ur gsoap-2.8.orig/gsoap/Makefile.am gsoap-2.8/gsoap/Makefile.am ---- gsoap-2.8.orig/gsoap/Makefile.am 2022-12-04 22:03:49.000000000 +0100 -+++ gsoap-2.8/gsoap/Makefile.am 2022-12-21 06:11:12.733737409 +0100 +--- gsoap-2.8.orig/gsoap/Makefile.am 2023-12-23 15:54:31.000000000 +0100 ++++ gsoap-2.8/gsoap/Makefile.am 2024-01-22 23:31:41.361498861 +0100 @@ -34,20 +34,30 @@ dom_cpp.cpp: dom.cpp $(LN_S) -f $(top_srcdir)/gsoap/dom.cpp dom_cpp.cpp @@ -87,8 +96,8 @@ diff -ur gsoap-2.8.orig/gsoap/Makefile.am gsoap-2.8/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 diff -ur gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am gsoap-2.8/gsoap/samples/autotest/Makefile.am ---- gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am 2022-12-04 22:03:49.000000000 +0100 -+++ gsoap-2.8/gsoap/samples/autotest/Makefile.am 2022-12-21 06:11:12.733737409 +0100 +--- gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am 2023-12-23 15:54:31.000000000 +0100 ++++ gsoap-2.8/gsoap/samples/autotest/Makefile.am 2024-01-22 23:31:41.361498861 +0100 @@ -14,7 +14,7 @@ WSDLINPUT=$(top_srcdir)/gsoap/samples/autotest/examples.wsdl SOAPHEADER=$(top_srcdir)/gsoap/samples/autotest/examples.h @@ -99,8 +108,8 @@ diff -ur gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am gsoap-2.8/gsoap/sampl $(SOAP_CPP_SRC) : $(WSDLINPUT) $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) diff -ur gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am gsoap-2.8/gsoap/samples/databinding/Makefile.am ---- gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am 2022-12-04 22:03:50.000000000 +0100 -+++ gsoap-2.8/gsoap/samples/databinding/Makefile.am 2022-12-21 06:11:12.733737409 +0100 +--- gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am 2023-12-23 15:54:32.000000000 +0100 ++++ gsoap-2.8/gsoap/samples/databinding/Makefile.am 2024-01-22 23:31:41.361498861 +0100 @@ -14,7 +14,7 @@ WSDLINPUT=$(top_srcdir)/gsoap/samples/databinding/address.xsd SOAPHEADER=$(top_srcdir)/gsoap/samples/databinding/address.h @@ -111,8 +120,8 @@ diff -ur gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am gsoap-2.8/gsoap/sa $(SOAP_CPP_SRC) : $(WSDLINPUT) $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) diff -ur gsoap-2.8.orig/gsoap/samples/Makefile.defines gsoap-2.8/gsoap/samples/Makefile.defines ---- gsoap-2.8.orig/gsoap/samples/Makefile.defines 2022-12-04 22:03:50.000000000 +0100 -+++ gsoap-2.8/gsoap/samples/Makefile.defines 2022-12-21 06:11:12.734737411 +0100 +--- gsoap-2.8.orig/gsoap/samples/Makefile.defines 2023-12-23 15:54:32.000000000 +0100 ++++ gsoap-2.8/gsoap/samples/Makefile.defines 2024-01-22 23:31:41.362498864 +0100 @@ -13,13 +13,13 @@ SOAP_C_CORE=soapC.c SOAP_C_CLIENT=soapClient.c $(SOAP_C_CORE) diff --git a/gsoap.spec b/gsoap.spec index a6a1face88cff834d83aabcdb9ef7b55fd5785cd..eb1a2618582fa0f34b24f5eec2f9266b101a7e7a 100644 --- a/gsoap.spec +++ b/gsoap.spec @@ -1,10 +1,10 @@ Summary: Generator Tools for Coding SOAP/XML Web Services in C and C++ Name: gsoap -Version: 2.8.124 +Version: 2.8.135 Release: 1 -License: GPLv2+ with exceptions -URL: http://gsoap2.sourceforge.net/ -Source0: http://downloads.sourceforge.net/gsoap2/%{name}_%{version}.zip +License: GPL-2.0-or-later +URL: https://gsoap2.sourceforge.net/ +Source0: https://downloads.sourceforge.net/gsoap2/%{name}_%{version}.zip Source1: soapcpp2.1 Source2: wsdl2h.1 Source3: index.html @@ -125,6 +125,9 @@ install -m 644 -p %{SOURCE1} %{SOURCE2} %{buildroot}/%_mandir/man1 %license LICENSE.txt GPLv2_license.txt %changelog +* Fri Aug 02 2024 xu_ping <707078654@qq.com> - 2.8.135-1 +- Update to 2.8.135 + * Mon Apr 17 2023 liyanan - 2.8.124-1 - Update to 2.8.124 diff --git a/gsoap_2.8.124.zip b/gsoap_2.8.135.zip similarity index 83% rename from gsoap_2.8.124.zip rename to gsoap_2.8.135.zip index 1268084c4cbe07a0ca9d792f90b9f5ff41a6312b..29e317c460386223e8df59c9f850f1f8cfdef363 100644 Binary files a/gsoap_2.8.124.zip and b/gsoap_2.8.135.zip differ