diff options
author | Patrick Lauer <patrick@gentoo.org> | 2010-05-19 13:20:02 +0000 |
---|---|---|
committer | Patrick Lauer <patrick@gentoo.org> | 2010-05-19 13:20:02 +0000 |
commit | c6a0505327f798774418333cb03fa4739a782dd0 (patch) | |
tree | 69aff9bffbe68123bf965231ec387fbdf1224306 /net-libs/gsoap | |
parent | Linux 2.6.34 and fbcondecor patch (diff) | |
download | historical-c6a0505327f798774418333cb03fa4739a782dd0.tar.gz historical-c6a0505327f798774418333cb03fa4739a782dd0.tar.bz2 historical-c6a0505327f798774418333cb03fa4739a782dd0.zip |
Bump and fixes from dev-zero, closes #306915
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'net-libs/gsoap')
-rw-r--r-- | net-libs/gsoap/ChangeLog | 12 | ||||
-rw-r--r-- | net-libs/gsoap/Manifest | 17 | ||||
-rw-r--r-- | net-libs/gsoap/files/gsoap-2.7-fedora-openssl.patch | 17 | ||||
-rw-r--r-- | net-libs/gsoap/files/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch | 12 | ||||
-rw-r--r-- | net-libs/gsoap/files/gsoap-2.7.15-use_libtool.patch | 101 | ||||
-rw-r--r-- | net-libs/gsoap/gsoap-2.7.15.ebuild | 70 |
6 files changed, 216 insertions, 13 deletions
diff --git a/net-libs/gsoap/ChangeLog b/net-libs/gsoap/ChangeLog index bb0e645dbf84..18776bd47d48 100644 --- a/net-libs/gsoap/ChangeLog +++ b/net-libs/gsoap/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-libs/gsoap -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gsoap/ChangeLog,v 1.7 2009/11/09 12:47:23 maekke Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/gsoap/ChangeLog,v 1.8 2010/05/19 13:20:02 patrick Exp $ + +*gsoap-2.7.15 (19 May 2010) + + 19 May 2010; Patrick Lauer <patrick@gentoo.org> + +files/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch, + +gsoap-2.7.15.ebuild, +files/gsoap-2.7.15-use_libtool.patch, + +files/gsoap-2.7-fedora-openssl.patch: + Bump and fixes from dev-zero, closes #306915 09 Nov 2009; Markus Meier <maekke@gentoo.org> gsoap-2.7.13.ebuild: amd64 stable, bug #289618 diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest index 16f6c6ff76e4..780137c71fec 100644 --- a/net-libs/gsoap/Manifest +++ b/net-libs/gsoap/Manifest @@ -1,21 +1,16 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX gsoap-2.7-fedora-openssl.patch 850 RMD160 4a94ab9bddcc051b8d20669f46560c3ac9082100 SHA1 e082c6dc34ec556c204109ffd7db51dac9284cae SHA256 b0f8a68ab5f9121fd1c7a6813ef7d0bfb3b5d57b4b480d8c7c6cef027abed3ac AUX gsoap-2.7-fix-pre-iso-headers.patch 3599 RMD160 156c6dab53794b97df7dbff3994ef1c30e76618f SHA1 682460d8aa20c7f01dc214f8c8a19042aa568822 SHA256 bcf80dcd8746b65fcc5aeef9898cc0e94f2f1796fae782157163861ced2d0581 +AUX gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch 614 RMD160 012a2f1f66cd201121697aa89918e752d2223268 SHA1 515d53833680a2eed65382574e83c8fd856894ca SHA256 5964ea1b815bc5382cabc6f1235fd0a4c4c313e07d1d4452eecde0a04c9fda40 AUX gsoap-2.7.12-fix-pre-iso-headers.patch 3599 RMD160 156c6dab53794b97df7dbff3994ef1c30e76618f SHA1 682460d8aa20c7f01dc214f8c8a19042aa568822 SHA256 bcf80dcd8746b65fcc5aeef9898cc0e94f2f1796fae782157163861ced2d0581 +AUX gsoap-2.7.15-use_libtool.patch 4790 RMD160 ca5cdee078b3f326bd69b44a016760cbe35f45d8 SHA1 25fcecd21bdc45f8583d60684fb4512663cb5244 SHA256 e4129e70ec9833720b07efacc35d3834cee125c75f18a548de1aae5e3e9c5bbc DIST gsoap_2.7.12.tar.gz 6537268 RMD160 18aeed686ee71b65abd6035a6dda46d5579cb972 SHA1 ea72438f751702d366fd066ce878c7f43874a07f SHA256 69a81c0c329bb8dbd8f117321879b5c38e1731cc937373953d8b66b0ea0712f6 DIST gsoap_2.7.13.tar.gz 6564489 RMD160 58f2bcd95199fdec3c5ce6579374148eaab955b1 SHA1 4c91ce860ee6853f785a11484c7298d294a53ef6 SHA256 3d40a528b8f3309f392945dca2ecaee5a698f4ee00a6036907a57c4f25a6a479 +DIST gsoap_2.7.15.tar.gz 6338478 RMD160 c57f3d25233604d7f428a0d0fc09d76e2d98e3ea SHA1 9c93d71103ec70074fa8db43d0fe1d3a1fff8d55 SHA256 3ed883ab1a3d32b5bb2bf599306f247f6de3ffedd8890eb0e6303ae15995dc12 DIST gsoap_2.7.9f.tar.gz 4014018 RMD160 45ec36f746febf13180a8409d2de25b8db94e7bb SHA1 45d720de52b016f8e854025ea2ca853c57160755 SHA256 c2a57839cc72e355ad1cd10947ff8458703dfec4fa37a995ae41c9a822472baf EBUILD gsoap-2.7.12-r1.ebuild 1268 RMD160 45f7bcd9f7a7b79daf47b0dc2052260e0788b2bd SHA1 2c9eee77e1964f6033eff0ac7cf5aad8beb6e9e3 SHA256 447f106f69e558bc9e2eb41b4774cda1ee5fd3477902013f0c3b231d475e274c EBUILD gsoap-2.7.12.ebuild 1168 RMD160 aa9696d7caede7b18410c4059dd55bedff4ca467 SHA1 eb7a292038b821a656e872178882129b2d206edb SHA256 36cbee9fa3a8e0c3e2d7665bdb194b61c17558f14b6ab568bd61c997130eee5e EBUILD gsoap-2.7.13.ebuild 1287 RMD160 815fa96f69d2d0668877d8546b317922efb3a8e5 SHA1 e9ae5eb7bb09ff675842688269d370f33c6ed8f8 SHA256 f6e152f61b6d964be33bc370702e9bee79d2fec8c7779f1248a2c2a1788d99bb +EBUILD gsoap-2.7.15.ebuild 1656 RMD160 7a135cb27efded6f32ce75e87bddff57f2921381 SHA1 e45a62a70d92b22a2794e8a3993458bb0b3b98ef SHA256 14059927ddc1101cda7cb211c0cb14c264650a4f464c57f5c82c02d5118d336f EBUILD gsoap-2.7.9f.ebuild 990 RMD160 777b244f76550ff31d149a84ee1bffb4c7e6d806 SHA1 bc6184552ebf827f240860e8587c642056c78a2a SHA256 7295aad54880b64ad20b6a9df64aa8b34ca2ed57770fd447e6462a600104c9e5 -MISC ChangeLog 1353 RMD160 55e8733255baa3ceec817cc2e0d394a8dbf26719 SHA1 5703a08b65faa9cc32ed3fb89eb3e7c11271423b SHA256 2222e78d5e53ad02bff30dabe27b7642a7b2178008d36138eb5d1446d9b3e57e +MISC ChangeLog 1649 RMD160 d32b5a28b1d7ea9da2697fef8f38705def6ff0b9 SHA1 d353d908ab2d522ed4295dd15573bd43f5726b17 SHA256 5882cfeae90343480af964ce0181f464d87b52d9667e70e131d2a6f82e6318bb MISC metadata.xml 436 RMD160 f8388e7286f9816635a696226795260c75654259 SHA1 bf123d3c72ad78a50473289a0c1a0313d20c30b6 SHA256 06bb57fd8ea7ea748a574e014bbd1ac10f308975486fd4244ddd0b6f1cd21816 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkr4D3IACgkQkKaRLQcq0GITnACcC9zSrpB9T2244EwGPemIiLBI -gK8AnigAFNT2mrIii0XE4CDC04NIzMUv -=NutH ------END PGP SIGNATURE----- diff --git a/net-libs/gsoap/files/gsoap-2.7-fedora-openssl.patch b/net-libs/gsoap/files/gsoap-2.7-fedora-openssl.patch new file mode 100644 index 000000000000..443fb694bbdb --- /dev/null +++ b/net-libs/gsoap/files/gsoap-2.7-fedora-openssl.patch @@ -0,0 +1,17 @@ +diff -up gsoap-2.7/gsoap/stdsoap2.cpp.openssl gsoap-2.7/gsoap/stdsoap2.cpp +--- gsoap-2.7/gsoap/stdsoap2.cpp.openssl 2008-10-02 19:36:28.000000000 +0200 ++++ gsoap-2.7/gsoap/stdsoap2.cpp 2009-08-22 22:20:49.000000000 +0200 +@@ -4153,7 +4153,12 @@ again: + { X509_EXTENSION *ext = X509_get_ext(peer, i); + const char *ext_str = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext))); + if (ext_str && !strcmp(ext_str, "subjectAltName")) +- { X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext); ++ { ++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) ++ const X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext); ++#else ++ X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext); ++#endif + void *ext_data; + #if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) + const unsigned char *data; diff --git a/net-libs/gsoap/files/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch b/net-libs/gsoap/files/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch new file mode 100644 index 000000000000..673deb17c35f --- /dev/null +++ b/net-libs/gsoap/files/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch @@ -0,0 +1,12 @@ +--- gsoap-2.7/gsoap/Makefile.am 2008-01-27 15:02:36.000000000 -0600 ++++ gsoap-2.7mf/gsoap/Makefile.am 2008-01-28 10:24:26.000000000 -0600 +@@ -12,6 +12,9 @@ CLEANFILES=soapcpp2 stdsoap2_cpp.cpp std + AM_CXXFLAGS=$(SOAPCPP2_DEBUG) -D$(platform) + AM_CFLAGS=$(SOAPCPP2_DEBUG) -D$(platform) + ++# Install all soapcpp2 and wsdl2h files into /usr/share/gsoap ++nobase_pkgdata_DATA = import/* plugin/* WS/* custom/* extras/* ++ + ## we cannot build stdsoap2.o from 2 different sources (stdsoap2.cpp and stdsoap2.c), so we need an intermediate target: + stdsoap2_ck.c: stdsoap2.cpp + $(LN_S) $(srcdir)/stdsoap2.cpp stdsoap2_ck.c diff --git a/net-libs/gsoap/files/gsoap-2.7.15-use_libtool.patch b/net-libs/gsoap/files/gsoap-2.7.15-use_libtool.patch new file mode 100644 index 000000000000..9fde611b81ba --- /dev/null +++ b/net-libs/gsoap/files/gsoap-2.7.15-use_libtool.patch @@ -0,0 +1,101 @@ +diff -Naur gsoap-2.7.orig/configure.in gsoap-2.7/configure.in +--- gsoap-2.7.orig/configure.in 2010-03-04 10:04:10.879898902 +0100 ++++ gsoap-2.7/configure.in 2010-03-04 10:04:57.182889612 +0100 +@@ -15,8 +15,8 @@ + AM_PROG_LEX + AC_PROG_YACC + AC_PROG_CPP +-AC_PROG_RANLIB +-#AC_PROG_LIBTOOL ++#AC_PROG_RANLIB ++AC_PROG_LIBTOOL + AC_PROG_LN_S + AC_PROG_AWK + AC_PROG_INSTALL +@@ -158,12 +158,12 @@ + AC_MSG_RESULT(no) + WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP" + WSDL2H_EXTRA_LIBS="-lssl -lcrypto -lz" +- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" ++ WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la" + else + AC_MSG_RESULT(yes) + WSDL2H_EXTRA_FLAGS= + WSDL2H_EXTRA_LIBS= +- WSDL2H_SOAP_CPP_LIB="libgsoap++.a" ++ WSDL2H_SOAP_CPP_LIB="libgsoap++.la" + fi + AC_SUBST(WSDL2H_EXTRA_FLAGS) + AC_SUBST(WSDL2H_EXTRA_LIBS) +diff -Naur gsoap-2.7.orig/gsoap/Makefile.am gsoap-2.7/gsoap/Makefile.am +--- gsoap-2.7.orig/gsoap/Makefile.am 2010-03-04 10:04:10.920894818 +0100 ++++ gsoap-2.7/gsoap/Makefile.am 2010-03-04 10:06:28.000883644 +0100 +@@ -31,20 +31,20 @@ + stdsoap2_ssl_cpp.cpp: stdsoap2.cpp + $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ssl_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 +-libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) +-libgsoap___a_SOURCES = stdsoap2_cpp.cpp +-libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) +-libgsoapck_a_SOURCES = stdsoap2_ck.c +-libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES +-libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp +-libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES +-libgsoapssl_a_SOURCES = stdsoap2_ssl.c +-libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP +-libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp +-libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP ++libgsoap_la_SOURCES = stdsoap2.c ++libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) ++libgsoap___la_SOURCES = stdsoap2_cpp.cpp ++libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) ++libgsoapck_la_SOURCES = stdsoap2_ck.c ++libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES ++libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp ++libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES ++libgsoapssl_la_SOURCES = stdsoap2_ssl.c ++libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP ++libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp ++libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP + + BUILT_SOURCES = stdsoap2_cpp.cpp $(lib_LIBRARIES) + +diff -Naur gsoap-2.7.orig/gsoap/samples/databinding/Makefile.am gsoap-2.7/gsoap/samples/databinding/Makefile.am +--- gsoap-2.7.orig/gsoap/samples/databinding/Makefile.am 2010-03-04 10:04:10.945913061 +0100 ++++ gsoap-2.7/gsoap/samples/databinding/Makefile.am 2010-03-04 10:13:18.323885257 +0100 +@@ -14,7 +14,7 @@ + WSDLINPUT=$(srcdir)/address.xsd + SOAPHEADER=$(srcdir)/address.h + SOAP_CPP_SRC=addressC.cpp +-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a ++SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la + + $(SOAP_CPP_SRC) : $(WSDLINPUT) + $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) +diff -Naur gsoap-2.7.orig/gsoap/samples/Makefile.defines gsoap-2.7/gsoap/samples/Makefile.defines +--- gsoap-2.7.orig/gsoap/samples/Makefile.defines 2010-03-04 10:04:10.933894722 +0100 ++++ gsoap-2.7/gsoap/samples/Makefile.defines 2010-03-04 10:11:37.388944663 +0100 +@@ -15,13 +15,13 @@ + SOAP_C_CORE=soapC.c + SOAP_C_CLIENT=soapClient.c $(SOAP_C_CORE) + SOAP_C_SERVER=soapServer.c $(SOAP_C_CORE) +-SOAP_C_LIB=$(top_builddir)/gsoap/libgsoap.a +-SOAP_C_LIB_CK=$(top_builddir)/gsoap/libgsoapck.a +-SOAP_C_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl.a ++SOAP_C_LIB=$(top_builddir)/gsoap/libgsoap.la ++SOAP_C_LIB_CK=$(top_builddir)/gsoap/libgsoapck.la ++SOAP_C_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl.la + + SOAP_CPP_CORE=soapC.cpp + SOAP_CPP_CLIENT=soapClient.cpp $(SOAP_CPP_CORE) + SOAP_CPP_SERVER=soapServer.cpp $(SOAP_CPP_CORE) +-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a +-SOAP_CPP_LIB_CK=$(top_builddir)/gsoap/libgsoapck++.a +-SOAP_CPP_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl++.a ++SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la ++SOAP_CPP_LIB_CK=$(top_builddir)/gsoap/libgsoapck++.la ++SOAP_CPP_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl++.la diff --git a/net-libs/gsoap/gsoap-2.7.15.ebuild b/net-libs/gsoap/gsoap-2.7.15.ebuild new file mode 100644 index 000000000000..bf2756d31423 --- /dev/null +++ b/net-libs/gsoap/gsoap-2.7.15.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/gsoap/gsoap-2.7.15.ebuild,v 1.1 2010/05/19 13:20:02 patrick Exp $ + +EAPI=2 + +inherit autotools eutils + +MY_P="${PN}-2.7" + +DESCRIPTION="A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services" +HOMEPAGE="http://gsoap2.sourceforge.net" +SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.tar.gz" + +LICENSE="GPL-2 gSOAP" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc debug examples +ssl static-libs" + +DEPEND="sys-devel/flex + sys-devel/bison + sys-libs/zlib + ssl? ( dev-libs/openssl )" +RDEPEND="" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + # Fix Pre-ISO headers + epatch \ + "${FILESDIR}/${PN}-2.7-fix-pre-iso-headers.patch" \ + "${FILESDIR}/${PN}-2.7-fedora-openssl.patch" \ + "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch" \ + "${FILESDIR}/${P}-use_libtool.patch" + eautoreconf +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(use_enable ssl openssl) \ + $(use_enable examples samples) \ + $(use_enable debug) +} + +src_compile() { + emake -j1 || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Install failed" + + # yes, we also install the license-file since + # it contains info about how to apply the licenses + dodoc *.txt + + dohtml changelog.html + + use static-libs || rm -rf "${D}"/usr/lib*/*.la + + if use examples; then + rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o + insinto /usr/share/doc/${PF}/examples + doins -r gsoap/samples/* + fi + + if use doc; then + dohtml -r gsoap/doc/* + fi +} |