From 89d5a028392a5abeb805758f0242fc347140270d Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Sat, 24 Aug 2019 01:14:36 +0200 Subject: net-libs/gsoap: Bump to version 2.8.91 Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Lars Wendler --- net-libs/gsoap/Manifest | 1 + .../gsoap/files/gsoap-2.8.91-shared_libs.patch | 142 +++++++++++++++++++++ net-libs/gsoap/gsoap-2.8.91.ebuild | 86 +++++++++++++ 3 files changed, 229 insertions(+) create mode 100644 net-libs/gsoap/files/gsoap-2.8.91-shared_libs.patch create mode 100644 net-libs/gsoap/gsoap-2.8.91.ebuild diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest index d72fede425df..3f72da213d78 100644 --- a/net-libs/gsoap/Manifest +++ b/net-libs/gsoap/Manifest @@ -1,2 +1,3 @@ DIST gsoap_2.8.84.zip 32538551 BLAKE2B cab2b75ac931ee6063af47975665f45514cb94f5514fb1f76d17ccb2e71d64d4ebd43543cc004ff7f5c49982975ebaa38e555e3bc45dbc370aae991bc7639273 SHA512 ec050119cd3e480b266cad36823f4862fe0ac21045ce901c3c91a552eae2fbf9e1cd515458835807cce54c04df7835a980a299d37f418190cd57684fd6bdcf79 DIST gsoap_2.8.87.zip 32545316 BLAKE2B c2d0f9fafdfa9de83ea35f8dfc88e23d9d80967a2e58c30d554d539fd93056d7a8eb00ea9c928c6cf786e4888eb9f942ba4574e343de0c0104fce8b270494d6a SHA512 638bf9b2b8aca5facba518f136ad5af5bda41f2b92ee345ee6989d73223a571ce5ddab23c0b65259e9fd524039250d861defc8cfc2fc0a366a578ce3629b9ca4 +DIST gsoap_2.8.91.zip 32553307 BLAKE2B 463c2d9c2d56c2a09fa8c9ebea7fa8059ed050cff81780b04a1a47ee1f016e385e6eb338ca740a40cd0c9483b4e10cf0963d02c52d6020863ce015e2f9cf2024 SHA512 ed99f1a20fd95edc7f24cf55454ee057b8c88d2e5b5b153b61c44c57bf4d92fb65ed557e9cb9ea89e3fa8939689c0e30791cebdb91b837482ec8ec13ae281abc diff --git a/net-libs/gsoap/files/gsoap-2.8.91-shared_libs.patch b/net-libs/gsoap/files/gsoap-2.8.91-shared_libs.patch new file mode 100644 index 000000000000..1fcdeeb69844 --- /dev/null +++ b/net-libs/gsoap/files/gsoap-2.8.91-shared_libs.patch @@ -0,0 +1,142 @@ +--- gsoap-2.8/configure.ac ++++ gsoap-2.8/configure.ac +@@ -17,7 +17,7 @@ + AC_PROG_YACC + AC_PROG_CPP + AC_PROG_RANLIB +-#AM_PROG_LIBTOOL ++AM_PROG_LIBTOOL + AC_PROG_LN_S + AC_PROG_AWK + AC_PROG_INSTALL +@@ -307,15 +307,17 @@ + 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_STATIC_LIB="libgsoapssl++.a" ++ WSDL2H_SOAP_CPP_SHARED_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_STATIC_LIB="libgsoapssl++.a" ++ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la" + fi + if test -n "$ZLIB"; then + WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}" +@@ -334,7 +336,8 @@ + WSDL2H_EXTRA_FLAGS= + SAMPLE_SSL_LIBS= + SAMPLE_INCLUDES= +- WSDL2H_SOAP_CPP_LIB="libgsoap++.a" ++ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoap++.a" ++ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la" + fi + AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes") + AC_SUBST(WITH_OPENSSL) +@@ -342,7 +345,8 @@ + AC_SUBST(WSDL2H_EXTRA_LIBS) + AC_SUBST(SAMPLE_INCLUDES) + AC_SUBST(SAMPLE_SSL_LIBS) +-AC_SUBST(WSDL2H_SOAP_CPP_LIB) ++AC_SUBST(WSDL2H_SOAP_CPP_SHARED_LIB) ++AC_SUBST(WSDL2H_SOAP_CPP_STATIC_LIB) + + # enable the compile of the samples + AC_ARG_ENABLE(samples, +--- 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_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -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 ++libgsoap_la_SOURCES = stdsoap2.c dom.c ++libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) ++libgsoap_la_LDFLAGS = -version-info $(SOVERSION) ++libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp ++libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) ++libgsoap___la_LDFLAGS = -version-info $(SOVERSION) ++libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c ++libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES ++libgsoapck_la_LDFLAGS = -version-info $(SOVERSION) ++libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp ++libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES ++libgsoapck___la_LDFLAGS = -version-info $(SOVERSION) ++libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c ++libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES ++libgsoapssl_la_LDFLAGS = -version-info $(SOVERSION) ++libgsoapssl_la_LIBADD = -lssl -lcrypto -lz ++libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp ++libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES ++libgsoapssl___la_LDFLAGS = -version-info $(SOVERSION) ++libgsoapssl___la_LIBADD = -lssl -lcrypto -lz ++ + 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 +--- gsoap-2.8/gsoap/samples/autotest/Makefile.am ++++ gsoap-2.8/gsoap/samples/autotest/Makefile.am +@@ -14,7 +14,7 @@ + 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) +@@ -40,6 +40,6 @@ + autotest_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform) + autotest_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS) + autotest_SOURCES=$(SOAP_CPP_SRC) soapTester.cpp duration.cpp long_time.cpp struct_tm.cpp struct_tm_date.cpp +-autotest_LDADD=$(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS) ++autotest_LDADD=$(SOAP_CPP_SHARED_LIB) $(SAMPLE_EXTRA_LIBS) + + CLEANFILES= *~ *.h *.cpp *.xml *.log *.nsmap +--- gsoap-2.8/gsoap/samples/databinding/Makefile.am ++++ gsoap-2.8/gsoap/samples/databinding/Makefile.am +@@ -14,7 +14,7 @@ + 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++.a + + $(SOAP_CPP_SRC) : $(WSDLINPUT) + $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) +@@ -28,6 +28,6 @@ + address_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform) + address_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS) + address_SOURCES=$(SOAP_CPP_SRC) address.cpp +-address_LDADD=$(SOAP_CPP_LIB) ++address_LDADD=$(SOAP_CPP_SHARED_LIB) + + CLEANFILES= *~ address.h *C.cpp *H.h *Stub.h *.nsmap +--- gsoap-2.8/gsoap/wsdl/Makefile.am ++++ gsoap-2.8/gsoap/wsdl/Makefile.am +@@ -10,7 +10,7 @@ + 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=$(top_srcdir)/gsoap/wsdl/wsdl.h + SOAP_FLAGS=-SC -pwsdl -I$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap/import +@@ -29,7 +29,7 @@ + wsdl2h_CXXFLAGS=$(C_DEBUG_FLAGS) $(SOAPCPP2_INCLUDE_XLOCALE) $(SOAPCPP2_NO_C_LOCALE) $(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) +-wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS) ++wsdl2h_LDADD=$(SOAP_CPP_SHARED_LIB) $(WSDL2H_EXTRA_LIBS) + if WITH_OPENSSL + wsdl2h_SOURCES+=$(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c + wsdl2h_LDADD+=-lpthread diff --git a/net-libs/gsoap/gsoap-2.8.91.ebuild b/net-libs/gsoap/gsoap-2.8.91.ebuild new file mode 100644 index 000000000000..edad97594bbc --- /dev/null +++ b/net-libs/gsoap/gsoap-2.8.91.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +MY_P="${PN}-2.8" + +DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services" +HOMEPAGE="http://gsoap2.sourceforge.net" +SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip" + +LICENSE="GPL-2 gSOAP" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc debug examples ipv6 libressl gnutls +ssl" + +RDEPEND=" + sys-libs/zlib + gnutls? ( net-libs/gnutls ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + ) +" +DEPEND="${RDEPEND} + app-arch/unzip + sys-devel/flex + sys-devel/bison +" + +PATCHES=( + # Fix Pre-ISO headers + "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch" + + # enable shared libs https://bugs.gentoo.org/583398 + "${FILESDIR}/${PN}-2.8.91-shared_libs.patch" + + # Fix parallel make + "${FILESDIR}/${PN}-2.8.70-parallel.patch" +) + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + # Don't include xlocale.h as it got removed in >=glibc-2.26 + --disable-xlocale + $(use_enable debug) + $(use_enable examples samples) + $(usex gnutls --enable-gnutls '') + $(usex ipv6 --enable-ipv6 '') + $(usex ssl '' --disable-ssl) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + + # yes, we also install the license-file since + # it contains info about how to apply the licenses + dodoc *.txt + + docinto html + dodoc changelog.md + + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die + + if use examples; then + rm -r gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die + insinto /usr/share/doc/${PF}/examples + doins -r gsoap/samples/* + fi + + if use doc; then + docinto html + dodoc -r gsoap/doc/* + fi +} -- cgit v1.2.3-65-gdbad