1 |
commit: a493458c7a5fd98846bf97384cff74b08b958d01 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 18 10:09:29 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 18 10:14:09 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a493458c |
7 |
|
8 |
net-libs/gsoap: Bump to version 2.8.70 |
9 |
|
10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
net-libs/gsoap/Manifest | 1 + |
14 |
.../gsoap/files/gsoap-2.8.70-shared_libs.patch | 141 +++++++++++++++++++++ |
15 |
net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch | 20 +++ |
16 |
net-libs/gsoap/gsoap-2.8.70.ebuild | 90 +++++++++++++ |
17 |
4 files changed, 252 insertions(+) |
18 |
|
19 |
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest |
20 |
index ce81399e710..af4c92f4233 100644 |
21 |
--- a/net-libs/gsoap/Manifest |
22 |
+++ b/net-libs/gsoap/Manifest |
23 |
@@ -3,3 +3,4 @@ DIST gsoap_2.8.55.zip 32571850 BLAKE2B 6f262c0b65c7704fbf6c0973d766c0cff788745d0 |
24 |
DIST gsoap_2.8.58.zip 32931913 BLAKE2B ab6e1b9f1e3b866199236b471e638a80c3542ce709e5cca75df9b3d5cd06fc498d09e768078a6863c549e721f657723d50bf53274c7d6603da23f1ea7a887879 SHA512 019c428aee0309ac952af349738a062d4e6deae28f2c5d38178bcd2aa3ead76a7a43faf952ca61f15e8928600a46f1a865b7996ded1c32e1749d1036c5354e2b |
25 |
DIST gsoap_2.8.59.zip 33109898 BLAKE2B d05ddf0c1e24afc03a33592cf8abef6f0bb6c8a8a216aee9ce7614720a8e3cd015f1e03429113ac8bdc05e6b916fee022914db22d0c29b5c9c4d0fb60c549168 SHA512 d43320e6965c3f17d122ea7aeeecbc0b608dac52204e630c3254d32eadd3c93aaca446c92bb439b98207f8560b2ad6bff220c0502b75ebd18b99e37402570624 |
26 |
DIST gsoap_2.8.63.zip 32985252 BLAKE2B 6bedf06a98701dd63c13e805f865c3b84cae8c498a9ec1c4dd062e191f217c56cf9667046c5fbf0b33d94c5500e2eb4746eefa7cc909398a8ad891f2cb33e357 SHA512 1941aba9c4a7d5e57e8b8f4f2183ee3c24a9a5c3e93caedfd27a13cbc625dc06e3114f850f0dcddb87dd436a997e1157fb2c6fb20c28f1b0675e634c3d489d96 |
27 |
+DIST gsoap_2.8.70.zip 32695627 BLAKE2B 6d803441804badf06b29cee8ca898dc864b9a0388f6f3fa58b84c1b237d77e22ab70e0cc5439915c715bdba7831b14f86d8003e1338b6184ddbfe845bb76ff75 SHA512 f7e9f85580c19bb390f1310bb47b690a5788b54c1e12c6fc0d9166039a84ae24ec5d3268cb67cd72b20e2eaa78689e175b975f07da44fd20e172a77ef37f4ae7 |
28 |
|
29 |
diff --git a/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch b/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..cb3f11ed129 |
32 |
--- /dev/null |
33 |
+++ b/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch |
34 |
@@ -0,0 +1,141 @@ |
35 |
+--- gsoap-2.8/configure.ac |
36 |
++++ gsoap-2.8/configure.ac |
37 |
+@@ -17,7 +17,7 @@ |
38 |
+ AC_PROG_YACC |
39 |
+ AC_PROG_CPP |
40 |
+ AC_PROG_RANLIB |
41 |
+-#AM_PROG_LIBTOOL |
42 |
++AM_PROG_LIBTOOL |
43 |
+ AC_PROG_LN_S |
44 |
+ AC_PROG_AWK |
45 |
+ AC_PROG_INSTALL |
46 |
+@@ -278,15 +278,17 @@ |
47 |
+ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz" |
48 |
+ SAMPLE_INCLUDES= |
49 |
+ SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" |
50 |
+- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" |
51 |
++ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a" |
52 |
++ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la" |
53 |
+ else |
54 |
+ AC_MSG_RESULT(no) |
55 |
+ WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP" |
56 |
+ # compile with wsdl2h when OPENSSL is available |
57 |
+- WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz" |
58 |
++ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lcrypto" |
59 |
+ SAMPLE_INCLUDES= |
60 |
+ SAMPLE_SSL_LIBS="-lssl -lcrypto -lz" |
61 |
+- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" |
62 |
++ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a" |
63 |
++ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la" |
64 |
+ fi |
65 |
+ if test -n "$ZLIB"; then |
66 |
+ WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}" |
67 |
+@@ -305,7 +307,8 @@ |
68 |
+ WSDL2H_EXTRA_FLAGS= |
69 |
+ SAMPLE_SSL_LIBS= |
70 |
+ SAMPLE_INCLUDES= |
71 |
+- WSDL2H_SOAP_CPP_LIB="libgsoap++.a" |
72 |
++ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoap++.a" |
73 |
++ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la" |
74 |
+ fi |
75 |
+ AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes") |
76 |
+ AC_SUBST(WITH_OPENSSL) |
77 |
+@@ -313,7 +316,8 @@ |
78 |
+ AC_SUBST(WSDL2H_EXTRA_LIBS) |
79 |
+ AC_SUBST(SAMPLE_INCLUDES) |
80 |
+ AC_SUBST(SAMPLE_SSL_LIBS) |
81 |
+-AC_SUBST(WSDL2H_SOAP_CPP_LIB) |
82 |
++AC_SUBST(WSDL2H_SOAP_CPP_SHARED_LIB) |
83 |
++AC_SUBST(WSDL2H_SOAP_CPP_STATIC_LIB) |
84 |
+ |
85 |
+ # enable the compile of the samples |
86 |
+ AC_ARG_ENABLE(samples, |
87 |
+--- gsoap-2.8/gsoap/Makefile.am |
88 |
++++ gsoap-2.8/gsoap/Makefile.am |
89 |
+@@ -49,6 +49,29 @@ |
90 |
+ libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp |
91 |
+ libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES |
92 |
+ |
93 |
++lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la |
94 |
++SOVERSION = 0 |
95 |
++libgsoap_la_SOURCES = stdsoap2.c dom.c |
96 |
++libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) |
97 |
++libgsoap_la_LDFLAGS = -version-info $(SOVERSION) |
98 |
++libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp |
99 |
++libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) |
100 |
++libgsoap___la_LDFLAGS = -version-info $(SOVERSION) |
101 |
++libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c |
102 |
++libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES |
103 |
++libgsoapck_la_LDFLAGS = -version-info $(SOVERSION) |
104 |
++libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp |
105 |
++libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES |
106 |
++libgsoapck___la_LDFLAGS = -version-info $(SOVERSION) |
107 |
++libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c |
108 |
++libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES |
109 |
++libgsoapssl_la_LDFLAGS = -version-info $(SOVERSION) |
110 |
++libgsoapssl_la_LIBADD = -lssl -lcrypto -lz |
111 |
++libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp |
112 |
++libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES |
113 |
++libgsoapssl___la_LDFLAGS = -version-info $(SOVERSION) |
114 |
++libgsoapssl___la_LIBADD = -lssl -lcrypto -lz |
115 |
++ |
116 |
+ BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp |
117 |
+ |
118 |
+ include_HEADERS = stdsoap2.h |
119 |
+--- gsoap-2.8/gsoap/samples/autotest/Makefile.am |
120 |
++++ gsoap-2.8/gsoap/samples/autotest/Makefile.am |
121 |
+@@ -14,7 +14,7 @@ |
122 |
+ WSDLINPUT=$(top_srcdir)/gsoap/samples/autotest/examples.wsdl |
123 |
+ SOAPHEADER=$(top_srcdir)/gsoap/samples/autotest/examples.h |
124 |
+ SOAP_CPP_SRC=soapC.cpp soapServer.cpp |
125 |
+-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a |
126 |
++SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a |
127 |
+ |
128 |
+ $(SOAP_CPP_SRC) : $(WSDLINPUT) |
129 |
+ $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) |
130 |
+@@ -40,6 +40,6 @@ |
131 |
+ autotest_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform) |
132 |
+ autotest_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS) |
133 |
+ autotest_SOURCES=$(SOAP_CPP_SRC) soapTester.cpp duration.cpp long_time.cpp struct_tm.cpp struct_tm_date.cpp |
134 |
+-autotest_LDADD=$(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS) |
135 |
++autotest_LDADD=$(SOAP_CPP_SHARED_LIB) $(SAMPLE_EXTRA_LIBS) |
136 |
+ |
137 |
+ CLEANFILES= *~ *.h *.cpp *.xml *.log *.nsmap |
138 |
+--- gsoap-2.8/gsoap/samples/databinding/Makefile.am |
139 |
++++ gsoap-2.8/gsoap/samples/databinding/Makefile.am |
140 |
+@@ -14,7 +14,7 @@ |
141 |
+ WSDLINPUT=$(top_srcdir)/gsoap/samples/databinding/address.xsd |
142 |
+ SOAPHEADER=$(top_srcdir)/gsoap/samples/databinding/address.h |
143 |
+ SOAP_CPP_SRC=addressC.cpp |
144 |
+-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a |
145 |
++SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a |
146 |
+ |
147 |
+ $(SOAP_CPP_SRC) : $(WSDLINPUT) |
148 |
+ $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) |
149 |
+@@ -28,6 +28,6 @@ |
150 |
+ address_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform) |
151 |
+ address_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS) |
152 |
+ address_SOURCES=$(SOAP_CPP_SRC) address.cpp |
153 |
+-address_LDADD=$(SOAP_CPP_LIB) |
154 |
++address_LDADD=$(SOAP_CPP_SHARED_LIB) |
155 |
+ |
156 |
+ CLEANFILES= *~ address.h *C.cpp *H.h *Stub.h *.nsmap |
157 |
+--- gsoap-2.8/gsoap/wsdl/Makefile.am |
158 |
++++ gsoap-2.8/gsoap/wsdl/Makefile.am |
159 |
+@@ -10,7 +10,7 @@ |
160 |
+ AM_LDFLAGS=-L$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin |
161 |
+ AM_CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin |
162 |
+ SOAP=$(top_builddir)/gsoap/src/soapcpp2$(EXEEXT) |
163 |
+-SOAP_CPP_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_LIB) |
164 |
++SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_SHARED_LIB) |
165 |
+ SOAP_CPP_SRC=wsdlC.cpp |
166 |
+ SOAPHEADER=$(top_srcdir)/gsoap/wsdl/wsdl.h |
167 |
+ SOAP_FLAGS=-SC -pwsdl -I$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap/import |
168 |
+@@ -32,6 +32,6 @@ |
169 |
+ if WITH_OPENSSL |
170 |
+ wsdl2h_SOURCES += $(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c $(top_srcdir)/gsoap/plugin/threads.c |
171 |
+ endif |
172 |
+-wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS) |
173 |
++wsdl2h_LDADD=$(SOAP_CPP_SHARED_LIB) $(WSDL2H_EXTRA_LIBS) |
174 |
+ |
175 |
+ CLEANFILES= *~ *C.cpp *H.h *Stub.h *.nsmap |
176 |
|
177 |
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 |
178 |
new file mode 100644 |
179 |
index 00000000000..fd550dd2670 |
180 |
--- /dev/null |
181 |
+++ b/net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch |
182 |
@@ -0,0 +1,20 @@ |
183 |
+--- gsoap-2.8/configure.ac |
184 |
++++ gsoap-2.8/configure.ac |
185 |
+@@ -196,15 +196,15 @@ |
186 |
+ AC_ARG_ENABLE(xlocale, |
187 |
+ [AC_HELP_STRING([--enable-xlocale], |
188 |
+ [compile library with forced inclusion of xlocale.h])], |
189 |
+- [with_xlocale="$enable_xl"], |
190 |
++ [with_xlocale="$enableval"], |
191 |
+ [with_xlocale="no"]) |
192 |
+ |
193 |
+ AC_MSG_CHECKING(for enable xlocale usage in library) |
194 |
+ if test "x$with_xlocale" = "xyes"; then |
195 |
+ AC_MSG_RESULT(yes) |
196 |
++ SOAPCPP2_INCLUDE_XLOCALE="-DWITH_INCLUDE_XLOCALE_H" |
197 |
+ else |
198 |
+ AC_MSG_RESULT(no) |
199 |
+- SOAPCPP2_INCLUDE_XLOCALE="-DWITH_INCLUDE_XLOCALE_H" |
200 |
+ fi |
201 |
+ AC_SUBST(SOAPCPP2_INCLUDE_XLOCALE) |
202 |
+ |
203 |
|
204 |
diff --git a/net-libs/gsoap/gsoap-2.8.70.ebuild b/net-libs/gsoap/gsoap-2.8.70.ebuild |
205 |
new file mode 100644 |
206 |
index 00000000000..0abfb9e600c |
207 |
--- /dev/null |
208 |
+++ b/net-libs/gsoap/gsoap-2.8.70.ebuild |
209 |
@@ -0,0 +1,90 @@ |
210 |
+# Copyright 1999-2018 Gentoo Authors |
211 |
+# Distributed under the terms of the GNU General Public License v2 |
212 |
+ |
213 |
+EAPI=7 |
214 |
+ |
215 |
+inherit autotools |
216 |
+ |
217 |
+MY_P="${PN}-2.8" |
218 |
+ |
219 |
+DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services" |
220 |
+HOMEPAGE="http://gsoap2.sourceforge.net" |
221 |
+SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip" |
222 |
+ |
223 |
+LICENSE="GPL-2 gSOAP" |
224 |
+SLOT="0" |
225 |
+KEYWORDS="~amd64 ~x86" |
226 |
+IUSE="doc debug examples ipv6 libressl gnutls +ssl" |
227 |
+ |
228 |
+RDEPEND=" |
229 |
+ sys-libs/zlib |
230 |
+ gnutls? ( net-libs/gnutls ) |
231 |
+ ssl? ( |
232 |
+ !libressl? ( dev-libs/openssl:0= ) |
233 |
+ libressl? ( dev-libs/libressl ) |
234 |
+ ) |
235 |
+" |
236 |
+DEPEND="${RDEPEND} |
237 |
+ app-arch/unzip |
238 |
+ sys-devel/flex |
239 |
+ sys-devel/bison |
240 |
+" |
241 |
+ |
242 |
+PATCHES=( |
243 |
+ # Fix Pre-ISO headers |
244 |
+ "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch" |
245 |
+ |
246 |
+ # enable shared libs https://bugs.gentoo.org/583398 |
247 |
+ "${FILESDIR}/${PN}-2.8.70-shared_libs.patch" |
248 |
+ |
249 |
+ # Fix --enable-xlocale configure switch |
250 |
+ "${FILESDIR}/${PN}-2.8.70-xlocale_h.patch" |
251 |
+) |
252 |
+ |
253 |
+S="${WORKDIR}/${MY_P}" |
254 |
+ |
255 |
+src_prepare() { |
256 |
+ default |
257 |
+ eautoreconf |
258 |
+} |
259 |
+ |
260 |
+src_configure() { |
261 |
+ local myeconfargs=( |
262 |
+ # Don't include xlocale.h as it got removed in >=glibc-2.26 |
263 |
+ --disable-xlocale |
264 |
+ $(use_enable debug) |
265 |
+ $(use_enable examples samples) |
266 |
+ $(usex gnutls --enable-gnutls '') |
267 |
+ $(usex ipv6 --enable-ipv6 '') |
268 |
+ $(usex ssl '' --disable-ssl) |
269 |
+ ) |
270 |
+ econf "${myeconfargs[@]}" |
271 |
+} |
272 |
+ |
273 |
+src_compile() { |
274 |
+ emake -j1 |
275 |
+} |
276 |
+ |
277 |
+src_install() { |
278 |
+ emake DESTDIR="${D}" install |
279 |
+ |
280 |
+ # yes, we also install the license-file since |
281 |
+ # it contains info about how to apply the licenses |
282 |
+ dodoc *.txt |
283 |
+ |
284 |
+ docinto html |
285 |
+ dodoc changelog.md |
286 |
+ |
287 |
+ find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die |
288 |
+ |
289 |
+ if use examples; then |
290 |
+ rm -r gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die |
291 |
+ insinto /usr/share/doc/${PF}/examples |
292 |
+ doins -r gsoap/samples/* |
293 |
+ fi |
294 |
+ |
295 |
+ if use doc; then |
296 |
+ docinto html |
297 |
+ dodoc -r gsoap/doc/* |
298 |
+ fi |
299 |
+} |