commit: b535d26d851e7fc8adfe1067016ac70359fd293a Author: Stefan Strogin <steils <AT> gentoo <DOT> org> AuthorDate: Thu May 28 09:28:08 2020 +0000 Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> CommitDate: Thu May 28 09:37:28 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b535d26d
net-libs/serf: add patch for LibreSSL Closes: https://bugs.gentoo.org/725776 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> net-libs/serf/files/serf-1.3.9-libressl.patch | 13 +++++ net-libs/serf/serf-1.3.9-r2.ebuild | 75 +++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/net-libs/serf/files/serf-1.3.9-libressl.patch b/net-libs/serf/files/serf-1.3.9-libressl.patch new file mode 100644 index 00000000000..fe9319fffa8 --- /dev/null +++ b/net-libs/serf/files/serf-1.3.9-libressl.patch @@ -0,0 +1,13 @@ +diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c +index b01e535..6fadb0c 100644 +--- a/buckets/ssl_buckets.c ++++ b/buckets/ssl_buckets.c +@@ -1156,7 +1156,7 @@ static void init_ssl_libraries(void) + } + #endif + +-#ifdef USE_OPENSSL_1_1_API ++#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER) + OPENSSL_malloc_init(); + #else + CRYPTO_malloc_init(); diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r2.ebuild new file mode 100644 index 00000000000..646928a7b05 --- /dev/null +++ b/net-libs/serf/serf-1.3.9-r2.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_6 python3_7 python3_8 ) + +inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic + +DESCRIPTION="HTTP client library" +HOMEPAGE="https://serf.apache.org/"; +SRC_URI="mirror://apache/${PN}/${P}.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +IUSE="kerberos static-libs libressl" +RESTRICT="test" + +RDEPEND="dev-libs/apr:1= + dev-libs/apr-util:1= + !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) + sys-libs/zlib:0= + kerberos? ( virtual/krb5 )" +DEPEND="${RDEPEND} + >=dev-util/scons-2.3.0" + +PATCHES=( "${FILESDIR}"/${PN}-1.3.8-static-lib.patch + "${FILESDIR}"/${PN}-1.3.8-openssl.patch + "${FILESDIR}"/${PN}-1.3.9-python3.patch + "${FILESDIR}"/${PN}-1.3.9-python3_byte.patch + "${FILESDIR}"/${PN}-1.3.9-libressl.patch ) + +src_prepare() { + default + + # https://code.google.com/p/serf/issues/detail?id=133 + sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct + + # need limits.h for PATH_MAX (only when EXTENSIONS is enabled) + [[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__ +} + +src_compile() { + myesconsargs=( + PREFIX="${EPREFIX}/usr" + LIBDIR="${EPREFIX}/usr/$(get_libdir)" + # These config scripts are sent through a shell with an empty env + # which breaks the SYSROOT usage in them. Set the vars inline to + # avoid that. + APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config" + APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config" + BUILD_STATIC=$(usex static-libs) + AR="$(tc-getAR)" + RANLIB="$(tc-getRANLIB)" + CC="$(tc-getCC)" + CPPFLAGS="${CPPFLAGS}" + CFLAGS="${CFLAGS}" + LINKFLAGS="${LDFLAGS}" + ) + + if use kerberos; then + myesconsargs+=( GSSAPI="${SYSROOT}${EPREFIX}/usr/bin/krb5-config" ) + fi + + escons "${myesconsargs[@]}" +} + +src_test() { + escons check +} + +src_install() { + escons install --install-sandbox="${D}" +}
