diff options
Diffstat (limited to 'net-libs/gsoap/files')
-rw-r--r-- | net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch | 38 | ||||
-rw-r--r-- | net-libs/gsoap/files/gsoap-2.8.70-parallel.patch | 10 | ||||
-rw-r--r-- | net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch (renamed from net-libs/gsoap/files/gsoap-2.7.40-shared_libs.patch) | 71 | ||||
-rw-r--r-- | net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch | 20 |
4 files changed, 63 insertions, 76 deletions
diff --git a/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch b/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch deleted file mode 100644 index 8f13a39d32c6..000000000000 --- a/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/gsoap/plugin/smdevp.c 2018-04-20 15:45:25.112658174 +0000 -+++ b/gsoap/plugin/smdevp.c 2018-04-20 15:47:58.826360980 +0000 -@@ -479,7 +479,7 @@ - /* allocate and init the OpenSSL HMAC or EVP_MD context */ - if ((alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) - { --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - data->ctx = (void*)SOAP_MALLOC(soap, sizeof(HMAC_CTX)); - if (data->ctx) - HMAC_CTX_init((HMAC_CTX*)data->ctx); -@@ -489,7 +489,7 @@ - } - else - { --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - data->ctx = (void*)SOAP_MALLOC(soap, sizeof(EVP_MD_CTX)); - if (data->ctx) - EVP_MD_CTX_init((EVP_MD_CTX*)data->ctx); -@@ -642,7 +642,7 @@ - *len = (int)n; - } - /* cleanup */ --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) - HMAC_CTX_cleanup((HMAC_CTX*)data->ctx); - else -@@ -687,7 +687,7 @@ - } - if (data->ctx) - { --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) - HMAC_CTX_cleanup((HMAC_CTX*)data->ctx); - else diff --git a/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch b/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch new file mode 100644 index 000000000000..8abd36d937c9 --- /dev/null +++ b/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch @@ -0,0 +1,10 @@ +--- gsoap-2.8/gsoap/src/Makefile.am ++++ gsoap-2.8/gsoap/src/Makefile.am +@@ -5,6 +5,7 @@ + ## you have all needed files, that a GNU package needs + AUTOMAKE_OPTIONS = foreign 1.4 + ++include MakefileManual + + #LIBS= + AM_YFLAGS=-d -v diff --git a/net-libs/gsoap/files/gsoap-2.7.40-shared_libs.patch b/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch index 829e0e45a58c..cb3f11ed129a 100644 --- a/net-libs/gsoap/files/gsoap-2.7.40-shared_libs.patch +++ b/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch @@ -1,6 +1,5 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2016-12-11 04:12:26.000000000 +0000 -+++ b/configure.ac 2017-01-10 13:41:24.743162628 +0000 +--- gsoap-2.8/configure.ac ++++ gsoap-2.8/configure.ac @@ -17,7 +17,7 @@ AC_PROG_YACC AC_PROG_CPP @@ -10,7 +9,7 @@ diff -Naur a/configure.ac b/configure.ac AC_PROG_LN_S AC_PROG_AWK AC_PROG_INSTALL -@@ -242,16 +242,18 @@ +@@ -278,15 +278,17 @@ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz" SAMPLE_INCLUDES= SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" @@ -20,10 +19,9 @@ diff -Naur a/configure.ac b/configure.ac else AC_MSG_RESULT(no) WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP" - # an ugly hack to get httpda and smdevp plugins to conditionally # compile with wsdl2h when OPENSSL is available -- WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} ../plugin/httpda.c ../plugin/smdevp.c ../plugin/threads.c -lssl -lcrypto -lz" -+ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} ../plugin/httpda.c ../plugin/smdevp.c ../plugin/threads.c -lcrypto" +- 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" @@ -32,15 +30,17 @@ diff -Naur a/configure.ac b/configure.ac fi if test -n "$ZLIB"; then WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}" -@@ -270,13 +272,15 @@ +@@ -305,7 +307,8 @@ WSDL2H_EXTRA_FLAGS= SAMPLE_SSL_LIBS= SAMPLE_INCLUDES= - WSDL2H_SOAP_CPP_LIB="libgsoap++.a" -+ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a" ++ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoap++.a" + WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la" fi - AC_SUBST(WSDL2H_EXTRA_FLAGS) + AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes") + AC_SUBST(WITH_OPENSSL) +@@ -313,7 +316,8 @@ AC_SUBST(WSDL2H_EXTRA_LIBS) AC_SUBST(SAMPLE_INCLUDES) AC_SUBST(SAMPLE_SSL_LIBS) @@ -50,12 +50,11 @@ diff -Naur a/configure.ac b/configure.ac # enable the compile of the samples AC_ARG_ENABLE(samples, -diff -Naur a/gsoap/Makefile.am b/gsoap/Makefile.am ---- a/gsoap/Makefile.am 2016-12-11 04:12:27.000000000 +0000 -+++ b/gsoap/Makefile.am 2017-01-10 13:41:36.487140423 +0000 +--- gsoap-2.8/gsoap/Makefile.am ++++ gsoap-2.8/gsoap/Makefile.am @@ -49,6 +49,29 @@ libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp - libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -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 +lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la +SOVERSION = 0 @@ -83,18 +82,17 @@ diff -Naur a/gsoap/Makefile.am b/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 include_HEADERS = stdsoap2.h -diff -Naur a/gsoap/samples/autotest/Makefile.am b/gsoap/samples/autotest/Makefile.am ---- a/gsoap/samples/autotest/Makefile.am 2016-12-11 04:12:27.000000000 +0000 -+++ b/gsoap/samples/autotest/Makefile.am 2017-01-10 13:44:39.954389922 +0000 +--- gsoap-2.8/gsoap/samples/autotest/Makefile.am ++++ gsoap-2.8/gsoap/samples/autotest/Makefile.am @@ -14,7 +14,7 @@ - WSDLINPUT=$(srcdir)/examples.wsdl - SOAPHEADER=$(srcdir)/examples.h + WSDLINPUT=$(top_srcdir)/gsoap/samples/autotest/examples.wsdl + SOAPHEADER=$(top_srcdir)/gsoap/samples/autotest/examples.h SOAP_CPP_SRC=soapC.cpp soapServer.cpp -SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a +SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a $(SOAP_CPP_SRC) : $(WSDLINPUT) - $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) + $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) @@ -40,6 +40,6 @@ autotest_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform) autotest_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS) @@ -103,18 +101,17 @@ diff -Naur a/gsoap/samples/autotest/Makefile.am b/gsoap/samples/autotest/Makefil +autotest_LDADD=$(SOAP_CPP_SHARED_LIB) $(SAMPLE_EXTRA_LIBS) CLEANFILES= *~ *.h *.cpp *.xml *.log *.nsmap -diff -Naur a/gsoap/samples/databinding/Makefile.am b/gsoap/samples/databinding/Makefile.am ---- a/gsoap/samples/databinding/Makefile.am 2016-12-11 04:12:27.000000000 +0000 -+++ b/gsoap/samples/databinding/Makefile.am 2017-01-10 13:43:51.788258087 +0000 +--- gsoap-2.8/gsoap/samples/databinding/Makefile.am ++++ gsoap-2.8/gsoap/samples/databinding/Makefile.am @@ -14,7 +14,7 @@ - WSDLINPUT=$(srcdir)/address.xsd - SOAPHEADER=$(srcdir)/address.h + WSDLINPUT=$(top_srcdir)/gsoap/samples/databinding/address.xsd + SOAPHEADER=$(top_srcdir)/gsoap/samples/databinding/address.h SOAP_CPP_SRC=addressC.cpp -SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a -+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.la ++SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a $(SOAP_CPP_SRC) : $(WSDLINPUT) - $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) + $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) @@ -28,6 +28,6 @@ address_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform) address_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS) @@ -123,24 +120,22 @@ diff -Naur a/gsoap/samples/databinding/Makefile.am b/gsoap/samples/databinding/M +address_LDADD=$(SOAP_CPP_SHARED_LIB) CLEANFILES= *~ address.h *C.cpp *H.h *Stub.h *.nsmap -diff -Naur a/gsoap/wsdl/Makefile.am b/gsoap/wsdl/Makefile.am ---- a/gsoap/wsdl/Makefile.am 2016-12-11 04:12:28.000000000 +0000 -+++ b/gsoap/wsdl/Makefile.am 2017-01-10 13:42:08.991078959 +0000 +--- gsoap-2.8/gsoap/wsdl/Makefile.am ++++ gsoap-2.8/gsoap/wsdl/Makefile.am @@ -10,7 +10,7 @@ - AM_LDFLAGS=-L$(srcdir) -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin + AM_LDFLAGS=-L$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin AM_CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin SOAP=$(top_builddir)/gsoap/src/soapcpp2$(EXEEXT) -SOAP_CPP_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_LIB) +SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_SHARED_LIB) SOAP_CPP_SRC=wsdlC.cpp - SOAPHEADER=$(srcdir)/wsdl.h - SOAP_FLAGS=-SC -pwsdl -I$(srcdir) -I$(top_srcdir)/gsoap/import -@@ -29,6 +29,6 @@ - wsdl2h_CXXFLAGS=$(C_DEBUG_FLAGS) $(WSDL2H_EXTRA_FLAGS) $(WSDL2H_IMPORTPATH) - 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) + SOAPHEADER=$(top_srcdir)/gsoap/wsdl/wsdl.h + SOAP_FLAGS=-SC -pwsdl -I$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap/import +@@ -32,6 +32,6 @@ + if WITH_OPENSSL + 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) +wsdl2h_LDADD=$(SOAP_CPP_SHARED_LIB) $(WSDL2H_EXTRA_LIBS) CLEANFILES= *~ *C.cpp *H.h *Stub.h *.nsmap - diff --git a/net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch b/net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch new file mode 100644 index 000000000000..fd550dd2670d --- /dev/null +++ b/net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch @@ -0,0 +1,20 @@ +--- gsoap-2.8/configure.ac ++++ gsoap-2.8/configure.ac +@@ -196,15 +196,15 @@ + AC_ARG_ENABLE(xlocale, + [AC_HELP_STRING([--enable-xlocale], + [compile library with forced inclusion of xlocale.h])], +- [with_xlocale="$enable_xl"], ++ [with_xlocale="$enableval"], + [with_xlocale="no"]) + + 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 + AC_SUBST(SOAPCPP2_INCLUDE_XLOCALE) + |