diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2018-10-21 14:54:22 +0200 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-10-21 14:55:45 +0200 |
commit | c8c89629974ddf0fd9acee9909891f5e9315414b (patch) | |
tree | d9abba8b84333104fcaa134f42eae3bd7a1384c3 /net-libs/gsoap | |
parent | x11-misc/lightdm: Removed old. (diff) | |
download | gentoo-c8c89629974ddf0fd9acee9909891f5e9315414b.tar.gz gentoo-c8c89629974ddf0fd9acee9909891f5e9315414b.tar.bz2 gentoo-c8c89629974ddf0fd9acee9909891f5e9315414b.zip |
net-libs/gsoap: Security cleanup.
Bug: https://bugs.gentoo.org/652734
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Diffstat (limited to 'net-libs/gsoap')
-rw-r--r-- | net-libs/gsoap/Manifest | 1 | ||||
-rw-r--r-- | net-libs/gsoap/files/gsoap-2.7.40-shared_libs.patch | 146 | ||||
-rw-r--r-- | net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch | 38 | ||||
-rw-r--r-- | net-libs/gsoap/gsoap-2.8.51.ebuild | 85 |
4 files changed, 0 insertions, 270 deletions
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest index 4f4b700c0dc4..b979c4d84afa 100644 --- a/net-libs/gsoap/Manifest +++ b/net-libs/gsoap/Manifest @@ -1,3 +1,2 @@ -DIST gsoap_2.8.51.zip 34505931 BLAKE2B 6f2d6ee2bd405054dc75105f42f6edeaa2300f1e7e6bea15f9e8f0dfcc2df56b36cddfc8f0a038b029f36a6dd1fd63f39eadb8d7f363335344eb142ec27be726 SHA512 491e31ce6be02c577b6184335672a0805e2287418a7e26d9b0f009aab8af462ddef7d7a1893dc867db5362c5f2a1e0022d0a45865d81e43286ce16c649da6910 DIST gsoap_2.8.63.zip 32985252 BLAKE2B 6bedf06a98701dd63c13e805f865c3b84cae8c498a9ec1c4dd062e191f217c56cf9667046c5fbf0b33d94c5500e2eb4746eefa7cc909398a8ad891f2cb33e357 SHA512 1941aba9c4a7d5e57e8b8f4f2183ee3c24a9a5c3e93caedfd27a13cbc625dc06e3114f850f0dcddb87dd436a997e1157fb2c6fb20c28f1b0675e634c3d489d96 DIST gsoap_2.8.70.zip 32695627 BLAKE2B 6d803441804badf06b29cee8ca898dc864b9a0388f6f3fa58b84c1b237d77e22ab70e0cc5439915c715bdba7831b14f86d8003e1338b6184ddbfe845bb76ff75 SHA512 f7e9f85580c19bb390f1310bb47b690a5788b54c1e12c6fc0d9166039a84ae24ec5d3268cb67cd72b20e2eaa78689e175b975f07da44fd20e172a77ef37f4ae7 diff --git a/net-libs/gsoap/files/gsoap-2.7.40-shared_libs.patch b/net-libs/gsoap/files/gsoap-2.7.40-shared_libs.patch deleted file mode 100644 index 829e0e45a58c..000000000000 --- a/net-libs/gsoap/files/gsoap-2.7.40-shared_libs.patch +++ /dev/null @@ -1,146 +0,0 @@ -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 -@@ -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 -@@ -242,16 +242,18 @@ - 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" - # 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" - 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}" -@@ -270,13 +272,15 @@ - WSDL2H_EXTRA_FLAGS= - SAMPLE_SSL_LIBS= - SAMPLE_INCLUDES= -- WSDL2H_SOAP_CPP_LIB="libgsoap++.a" -+ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a" -+ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la" - fi - AC_SUBST(WSDL2H_EXTRA_FLAGS) - 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, -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 -@@ -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 - -+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 -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 -@@ -14,7 +14,7 @@ - WSDLINPUT=$(srcdir)/examples.wsdl - SOAPHEADER=$(srcdir)/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 -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 -@@ -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_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.la - - $(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 -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 -@@ -10,7 +10,7 @@ - AM_LDFLAGS=-L$(srcdir) -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) --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.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/gsoap-2.8.51.ebuild b/net-libs/gsoap/gsoap-2.8.51.ebuild deleted file mode 100644 index 5dd67d3686ff..000000000000 --- a/net-libs/gsoap/gsoap-2.8.51.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils - -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:0= ) - ) -" -DEPEND="${RDEPEND} - app-arch/unzip - sys-devel/flex - sys-devel/bison -" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # Fix Pre-ISO headers - eapply "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch" - - # 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 -} - -src_configure() { - local myconf=() - use ssl || myconf+=( --disable-ssl ) - use gnutls && myconf+=( --enable-gnutls ) - use ipv6 && myconf+=( --enable-ipv6 ) - econf \ - ${myconf[@]} \ - $(use_enable debug) \ - $(use_enable examples samples) -} - -src_compile() { - emake -j1 -} - -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 - - dohtml changelog.md - - prune_libtool_files --all - - if use examples; then - rm -rf 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 - dohtml -r gsoap/doc/* - fi -} |