[gentoo-commits] repo/gentoo:master commit in: net-libs/gsoap/, net-libs/gsoap/files/
commit: 776672faf2298ee0d943293d75289d86b0c05d31 Author: Brahmajit Das gmail com> AuthorDate: Wed Sep 13 05:46:59 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Fri Oct 20 07:25:50 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=776672fa net-libs/gsoap: Fix incompatible integer to pointer conversion Closes: https://bugs.gentoo.org/897870 Signed-off-by: Brahmajit Das gmail.com> Closes: https://github.com/gentoo/gentoo/pull/32741 Signed-off-by: Joonas Niilola gentoo.org> .../files/gsoap-2.8.130-musl-strerror_r.patch | 59 +++ net-libs/gsoap/gsoap-2.8.130-r1.ebuild | 83 ++ 2 files changed, 142 insertions(+) diff --git a/net-libs/gsoap/files/gsoap-2.8.130-musl-strerror_r.patch b/net-libs/gsoap/files/gsoap-2.8.130-musl-strerror_r.patch new file mode 100644 index ..01a7f82b2348 --- /dev/null +++ b/net-libs/gsoap/files/gsoap-2.8.130-musl-strerror_r.patch @@ -0,0 +1,59 @@ +Bug: https://bugs.gentoo.org/897870 +From: Brahmajit Das +Date: Tue, 12 Sep 2023 17:32:42 + +Subject: [PATCH] Fix incompatible integer to pointer conversion on musl + +musl libc only supports XSI-compliant version of strerror_r. Hence we +need to check if __GLIBC__ is defined or not. + +Also it's incorrectly assumed to use a differnt version of gethostbyname_r than +that's available with glibc or musl libc. Without the extra !defined(__GLIBC__) +the condition goes straight to the following section of the code +``` +#elif defined(HAVE_GETHOSTBYNAME_R) + hostent = gethostbyname_r(addr, hostent, tmpbuf, tmplen, >errnum); +#elif defined(VXWORKS) +``` +Which is not the correct implementation of gethostbyname_r present. + +Signed-off-by: Brahmajit Das +--- a/gsoap/stdsoap2.c b/gsoap/stdsoap2.c +@@ -23145,7 +23145,7 @@ soap_strerror(struct soap *soap) + { + #ifndef WIN32 + # ifdef HAVE_STRERROR_R +-# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) ++# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) || !defined(__GLIBC__) + err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ + if (err != 0) + soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); +--- a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp +@@ -5457,7 +5457,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, + { + #if (defined(_AIX43) || defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R) + struct hostent_data ht_data; +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && defined(HAVE_GETHOSTBYNAME_R) ++#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && defined(HAVE_GETHOSTBYNAME_R) || !defined(__GLIBC__) + int r; + char *tmpbuf = soap->tmpbuf; + size_t tmplen = sizeof(soap->tmpbuf); +@@ -5490,7 +5490,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, + hostent = NULL; + soap->errnum = h_errno; + } +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) ++#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) || !defined(__GLIBC__) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) + while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, , >errnum)) < 0) + { + if (tmpbuf != soap->tmpbuf) +@@ -23145,7 +23145,7 @@ soap_strerror(struct soap *soap) + { + #ifndef WIN32 + # ifdef HAVE_STRERROR_R +-# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) ++# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) || !defined(__GLIBC__) + err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ + if (err != 0) + soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf),
[gentoo-commits] repo/gentoo:master commit in: net-libs/gsoap/, net-libs/gsoap/files/
commit: c259222bef572fd4f1108ee060e50df439bb7683 Author: Sam James gentoo org> AuthorDate: Wed Sep 13 02:40:58 2023 + Commit: Sam James gentoo org> CommitDate: Wed Sep 13 02:45:20 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c259222b net-libs/gsoap: add 2.8.130 Signed-off-by: Sam James gentoo.org> net-libs/gsoap/Manifest| 1 + .../gsoap/files/gsoap-2.8.130-shared_libs.patch| 140 + net-libs/gsoap/gsoap-2.8.130.ebuild| 81 3 files changed, 222 insertions(+) diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest index 1184f7d7ed75..ce66e72e2664 100644 --- a/net-libs/gsoap/Manifest +++ b/net-libs/gsoap/Manifest @@ -1 +1,2 @@ DIST gsoap_2.8.114.zip 34599617 BLAKE2B fe68b057fa288b033f068be33e3f8871af8daf812d77a2fc87399f6750a4a8e23cb323dade3385c9b2147b2cde46980e9c52d393eff6eb16fa52cdbcc7a62537 SHA512 205d38a36c56780fd34bad8ea56525a04d4dc5b58af55676783c78d6eecf47dd0e9c86b0106f68127cfb2f45cb94f6ac9ebe353d1c6687e9faa13badb4a9690a +DIST gsoap_2.8.130.zip 55318989 BLAKE2B 5b118027811787c818c2e4e9be86eae954fc15fcc9f0bc237afec6fb71c697c659ce5071d572ee3178315c9d140e32c0e0c226bfaeb6aba0df7d84a4b90fcd3a SHA512 b82ebc7d058a9e2f59d325e2c50e96f6bd712c65285389cb120c4a9bbf51da1b99a833d8f81ba674e37f34090fde8317990de1906c97434342cbe84568d66b6c diff --git a/net-libs/gsoap/files/gsoap-2.8.130-shared_libs.patch b/net-libs/gsoap/files/gsoap-2.8.130-shared_libs.patch new file mode 100644 index ..3acb732fb3e3 --- /dev/null +++ b/net-libs/gsoap/files/gsoap-2.8.130-shared_libs.patch @@ -0,0 +1,140 @@ +https://bugs.gentoo.org/583398 +https://build.opensuse.org/package/view_file/openSUSE:Factory/gsoap/gsoap-01-sharedlibs.diff?expand=1 +See also: https://src.fedoraproject.org/rpms/gsoap/blob/rawhide/f/gsoap-libtool.patch + +From: Jan Engelhardt +Date: 2011-07-01 17:19:00 +0200 + +build: always use shared libraries + +--- a/configure.ac b/configure.ac +@@ -15,8 +15,8 @@ AM_PROG_CC_C_O + AM_PROG_LEX([noyywrap]) + AC_PROG_YACC + AC_PROG_CPP +-AC_PROG_RANLIB +-#AM_PROG_LIBTOOL ++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) ++LT_INIT + AC_PROG_LN_S + AC_PROG_AWK + AC_PROG_INSTALL +@@ -310,7 +310,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" +-WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" ++WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la" + else + if test "x$with_wolfssl" = "xyes"; then + AC_MSG_RESULT(yes) +@@ -318,7 +318,7 @@ if test "x$with_openssl" = "xyes"; then + 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" +@@ -326,7 +326,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" +- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" ++ WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la" + fi + fi + if test -n "$ZLIB"; then +@@ -346,7 +346,7 @@ else + 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" -a "x$with_wolfssl" != "xyes"]) + AC_SUBST(WSDL2H_EXTRA_FLAGS) +--- a/gsoap/Makefile.am b/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 + +-lib_LIBRARIES = libgsoap.a libgsoap++.a libgsoapck.a libgsoapck++.a libgsoapssl.a libgsoapssl++.a ++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_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) +-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_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 +-libgsoapssl_a_SOURCES = stdsoap2_ssl.c dom.c +-libgsoapssl_a_CFLAGS =
[gentoo-commits] repo/gentoo:master commit in: net-libs/gsoap/, net-libs/gsoap/files/
commit: e035a4bf9fbd9853270a0a665ea80f59009b060d Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Sep 27 15:51:27 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Sep 27 17:50:13 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e035a4bf net-libs/gsoap: bump to v2.8.93 - Use proper autotools magic to address fatal error: soapcpp2_yacc.h: No such file or directory error. - Previous change will ensure that we will respect CFLAGS for soapcpp2. Fixes 6526a590e ("net-libs/gsoap: Fixed parallel make issue.") Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann gentoo.org> net-libs/gsoap/Manifest| 1 + .../files/gsoap-2.8.93-fix-parallel-build.patch| 17 + net-libs/gsoap/gsoap-2.8.93.ebuild | 86 ++ 3 files changed, 104 insertions(+) diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest index 3f72da213d7..8d59309406b 100644 --- a/net-libs/gsoap/Manifest +++ b/net-libs/gsoap/Manifest @@ -1,3 +1,4 @@ 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 +DIST gsoap_2.8.93.zip 32559296 BLAKE2B 1c27a2d99eb529715f775392a6aeed803ef03f9b703caca49e56e7b4eeb6c9bf7b801d9853fb4009ab61ec138da1c23d54dc33c2f604d73f8134121a5ea2e975 SHA512 45965d04e1c46e06803467887f62d9bea5909fa2d4c4d9ffc935f9fced014efed9169a0171a555067c89ef47b2def9983b277eecee18eb9e70d7198bc72b1ece diff --git a/net-libs/gsoap/files/gsoap-2.8.93-fix-parallel-build.patch b/net-libs/gsoap/files/gsoap-2.8.93-fix-parallel-build.patch new file mode 100644 index 000..27e2a94d14e --- /dev/null +++ b/net-libs/gsoap/files/gsoap-2.8.93-fix-parallel-build.patch @@ -0,0 +1,17 @@ +--- a/gsoap/src/Makefile.am b/gsoap/src/Makefile.am +@@ -10,11 +10,13 @@ AUTOMAKE_OPTIONS = foreign 1.4 + AM_YFLAGS=-d -v + AM_LFLAGS=$(LEX_FLAGS) + ++BUILT_SOURCES = soapcpp2_yacc.h ++ + bin_PROGRAMS=soapcpp2 + + soapcpp2_CFLAGS=$(BISON_DEFINE) $(LEX_DEFINE) $(C_DEBUG_FLAGS) $(SOAPCPP2_IMPORTPATH) -D$(platform) + soapcpp2_LDADD=$(YACC_LIB) $(LEXLIB) +-soapcpp2_SOURCES= soapcpp2_yacc.y soapcpp2_yacc.h soapcpp2_lex.l symbol2.c error2.c init2.c soapcpp2.c ++soapcpp2_SOURCES= soapcpp2_yacc.y soapcpp2_lex.l symbol2.c error2.c init2.c soapcpp2.c + + CLEANFILES= *~ soapcpp2_lex.c soapcpp2_yacc.c soapcpp2_yacc.h soapcpp2_yacc.output + diff --git a/net-libs/gsoap/gsoap-2.8.93.ebuild b/net-libs/gsoap/gsoap-2.8.93.ebuild new file mode 100644 index 000..3dd945fab44 --- /dev/null +++ b/net-libs/gsoap/gsoap-2.8.93.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.93-fix-parallel-build.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 ''
[gentoo-commits] repo/gentoo:master commit in: net-libs/gsoap/, net-libs/gsoap/files/
commit: d67e22ab8eafe1856ce6f112c019b42cd0366a31 Author: Lars Wendler gentoo org> AuthorDate: Thu Jul 25 09:10:51 2019 + Commit: Lars Wendler gentoo org> CommitDate: Thu Jul 25 09:11:28 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d67e22ab net-libs/gsoap: Removed old. Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> net-libs/gsoap/Manifest | 2 - net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch | 20 - net-libs/gsoap/gsoap-2.8.70.ebuild| 89 --- net-libs/gsoap/gsoap-2.8.83.ebuild| 86 -- 4 files changed, 197 deletions(-) diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest index f2f38892b23..d72fede425d 100644 --- a/net-libs/gsoap/Manifest +++ b/net-libs/gsoap/Manifest @@ -1,4 +1,2 @@ -DIST gsoap_2.8.70.zip 32695627 BLAKE2B 6d803441804badf06b29cee8ca898dc864b9a0388f6f3fa58b84c1b237d77e22ab70e0cc5439915c715bdba7831b14f86d8003e1338b6184ddbfe845bb76ff75 SHA512 f7e9f85580c19bb390f1310bb47b690a5788b54c1e12c6fc0d9166039a84ae24ec5d3268cb67cd72b20e2eaa78689e175b975f07da44fd20e172a77ef37f4ae7 -DIST gsoap_2.8.83.zip 32703770 BLAKE2B 1750a25bcd38c020c83d644395e9b3ac3e0c1080fb82f26b11ea0d0beea98c7dc8f3f24a77e093c6ac7e3598d416430990105eeb93e565809844825e1e937ec1 SHA512 7f4ae6feea26ec2d0e970e77cf476a0049c2e3fe47feba4e3b3b57239e7ae0016c409a74d3e865e56d2c01a8098be282d74a33c686d177d203cb8c2dff6bc407 DIST gsoap_2.8.84.zip 32538551 BLAKE2B cab2b75ac931ee6063af47975665f45514cb94f5514fb1f76d17ccb2e71d64d4ebd43543cc004ff7f5c49982975ebaa38e555e3bc45dbc370aae991bc7639273 SHA512 ec050119cd3e480b266cad36823f4862fe0ac21045ce901c3c91a552eae2fbf9e1cd515458835807cce54c04df7835a980a299d37f418190cd57684fd6bdcf79 DIST gsoap_2.8.87.zip 32545316 BLAKE2B c2d0f9fafdfa9de83ea35f8dfc88e23d9d80967a2e58c30d554d539fd93056d7a8eb00ea9c928c6cf786e4888eb9f942ba4574e343de0c0104fce8b270494d6a SHA512 638bf9b2b8aca5facba518f136ad5af5bda41f2b92ee345ee6989d73223a571ce5ddab23c0b65259e9fd524039250d861defc8cfc2fc0a366a578ce3629b9ca4 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 deleted file mode 100644 index fd550dd2670..000 --- a/net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch +++ /dev/null @@ -1,20 +0,0 @@ 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) - diff --git a/net-libs/gsoap/gsoap-2.8.70.ebuild b/net-libs/gsoap/gsoap-2.8.70.ebuild deleted file mode 100644 index 7423a510e48..000 --- a/net-libs/gsoap/gsoap-2.8.70.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2018 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.70-shared_libs.patch" - - # Fix --enable-xlocale configure switch - "${FILESDIR}/${PN}-2.8.70-xlocale_h.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
[gentoo-commits] repo/gentoo:master commit in: net-libs/gsoap/, net-libs/gsoap/files/
commit: c3de07e5236962952d47815e6ab96c46cd38dfd0 Author: Aaron Bauman gentoo org> AuthorDate: Fri Apr 20 16:24:17 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Apr 20 16:24:28 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3de07e5 net-libs/gsoap: compatibility patch for LibreSSL This patch fixes building with dev-libs/libressl-2.6.4. This patch will not be needed once dev-libs/libressl-2.7.x goes stable. Additionally, fix slot/subslot modifier to ensure rebuilds are trigged for API changes. Closes: https://bugs.gentoo.org/617264 Package-Manager: Portage-2.3.31, Repoman-2.3.9 .../gsoap-2.8.51-libressl-2.6-compatibility.patch | 38 ++ net-libs/gsoap/gsoap-2.8.51.ebuild | 7 ++-- 2 files changed, 43 insertions(+), 2 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 new file mode 100644 index 000..8f13a39d32c --- /dev/null +++ b/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch @@ -0,0 +1,38 @@ +--- a/gsoap/plugin/smdevp.c2018-04-20 15:45:25.112658174 + b/gsoap/plugin/smdevp.c2018-04-20 15:47:58.826360980 + +@@ -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 < 0x1010L) ++#if (OPENSSL_VERSION_NUMBER < 0x1010L || 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 < 0x1010L) ++#if (OPENSSL_VERSION_NUMBER < 0x1010L || 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 < 0x1010L) ++#if (OPENSSL_VERSION_NUMBER < 0x1010L || 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 < 0x1010L) ++#if (OPENSSL_VERSION_NUMBER < 0x1010L || 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/gsoap-2.8.51.ebuild b/net-libs/gsoap/gsoap-2.8.51.ebuild index 345507edae7..5dd67d3686f 100644 --- a/net-libs/gsoap/gsoap-2.8.51.ebuild +++ b/net-libs/gsoap/gsoap-2.8.51.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,7 +21,7 @@ RDEPEND=" gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl ) + libressl? ( dev-libs/libressl:0= ) ) " DEPEND="${RDEPEND} @@ -41,6 +41,9 @@ src_prepare() { # enable shared libs https://bugs.gentoo.org/583398 eapply "${FILESDIR}/${PN}-2.7.40-shared_libs.patch" + # fix building with libressl-2.6.x. This will not be needed when 2.7.x goes stable + eapply "${FILESDIR}/${PN}-2.8.51-libressl-2.6-compatibility.patch" + eautoreconf }
[gentoo-commits] repo/gentoo:master commit in: net-libs/gsoap/, net-libs/gsoap/files/
commit: b2fb2b9f06691af5e37cd5031348825d5498ed9d Author: Lars Wendler gentoo org> AuthorDate: Mon Aug 21 08:27:09 2017 + Commit: Lars Wendler gentoo org> CommitDate: Mon Aug 21 08:27:42 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2fb2b9f net-libs/gsoap: Bump to version 2.8.52 Package-Manager: Portage-2.3.8, Repoman-2.3.3 net-libs/gsoap/Manifest| 1 + .../gsoap/files/gsoap-2.8.52-shared_libs.patch | 145 + net-libs/gsoap/gsoap-2.8.52.ebuild | 83 3 files changed, 229 insertions(+) diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest index 821c0332943..0e98b84499f 100644 --- a/net-libs/gsoap/Manifest +++ b/net-libs/gsoap/Manifest @@ -1,3 +1,4 @@ DIST gsoap_2.8.40.zip 36317175 SHA256 54ef56d9c55a6a7a00ae57f8cb0b3266af1b26e623070be2ef20833626157f77 SHA512 fc26899e780a7d797544f21aa7beaabc6c1507b7097c4a229a641e4be763733a40e96ce0d5181024eae19653de9513a5b35d51c8b12e85078423e30d0b898a6f WHIRLPOOL 6f795590a5b1e36d796200e3669b3a2aa45c016aa3acaae6291c09543422530a12e977a159a2f892b328cd7813633f41966432e75fd36268bfe4c6d9d1bb6fbf DIST gsoap_2.8.50.zip 34688187 SHA256 d1225f297963d1336ffaa7557990a2a0c8c7700774baa107ecb5467bfc0a265a SHA512 45bbff06083971152054571749fc7dc84962ace550154399590d8b697f0cf702c1614cbfb9f9cd23bc87b3812817abfdcaa6fc210c5daa5e8197493ce0e52a72 WHIRLPOOL f56d19091bdc69cf89a4c11183d946f3b26cc83d132387c9a0771821427e42ed6dc01eaefac15bd9d5f56f126948275bff3fd0b5eb39aa4b462227d041d57c7d DIST gsoap_2.8.51.zip 34505931 SHA256 3e7bb24a9e492f5cb86daca34054c9787152f1d7b70add36b789d03816d5ffa1 SHA512 491e31ce6be02c577b6184335672a0805e2287418a7e26d9b0f009aab8af462ddef7d7a1893dc867db5362c5f2a1e0022d0a45865d81e43286ce16c649da6910 WHIRLPOOL 78bf9dd3c20e3a7683e20de263c1f608e69039ae505533dc7695dd1b0031d222ea99ca3991e8b046af66943215a7ce4c4db3a0efafc6933d74907dda71815d05 +DIST gsoap_2.8.52.zip 34464252 SHA256 96ad6ce7be175742e693b19e3d72e0f04752a70845c7e0ad539cb882f2e7800a SHA512 ec08b8f49651e51754f5a404db83e1fb9d636bf84646cb9783be4aaf8c1b60adfb6f25722b2bdd55fb6812a9943296b1e9569e3b33df50d2d93a7a4494d13d55 WHIRLPOOL b2caa3fad3c33b3bb86a145fdec37da7a2be2e0dc2f40c9fa6b5352c1657190464a78c0ce9d047de03a5a5a9ff7701354ac2e1c938bd9a56fe0c3731d397fc4c diff --git a/net-libs/gsoap/files/gsoap-2.8.52-shared_libs.patch b/net-libs/gsoap/files/gsoap-2.8.52-shared_libs.patch new file mode 100644 index 000..9437de86f61 --- /dev/null +++ b/net-libs/gsoap/files/gsoap-2.8.52-shared_libs.patch @@ -0,0 +1,145 @@ +--- 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 +@@ -259,15 +259,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}" +@@ -286,7 +288,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) +@@ -294,7 +297,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) -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)
[gentoo-commits] repo/gentoo:master commit in: net-libs/gsoap/, net-libs/gsoap/files/
commit: 67a035a2c882f07ed42c2b6e4f90a3aa5f434ca2 Author: Gokturk Yuksek binghamton edu> AuthorDate: Sun Dec 27 03:13:44 2015 + Commit: Patrice Clement gentoo org> CommitDate: Sun Dec 27 06:05:25 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67a035a2 net-libs/gsoap: backport missing cookie support #340647 For+Subject: [PATCH] Backport missing cookie support + +For