commit: 623674378a6ae11e4bf387070027de8f2afe73cd Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Sun Jun 19 20:39:49 2022 +0000 Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> CommitDate: Sun Jun 19 21:27:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=62367437
net-libs/serf: Added serf-1.3.9-r3 This fixes the build for dev-vcs/subversion. Signed-off-by: orbea <orbea <AT> riseup.net> Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> .../serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch | 21 ++++++ .../files/serf-1.3.9-openssl-3-errgetfunc.patch | 15 ++++ net-libs/serf/metadata.xml | 12 ++-- net-libs/serf/serf-1.3.9-r3.ebuild | 81 ++++++++++++++++++++++ 4 files changed, 123 insertions(+), 6 deletions(-) diff --git a/net-libs/serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch b/net-libs/serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch new file mode 100644 index 0000000..a10974f --- /dev/null +++ b/net-libs/serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch @@ -0,0 +1,21 @@ +https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-bio-ctrl.patch +https://bugs.gentoo.org/805161 +--- a/buckets/ssl_buckets.c ++++ b/buckets/ssl_buckets.c +@@ -407,7 +407,7 @@ static int bio_bucket_destroy(BIO *bio) + + static long bio_bucket_ctrl(BIO *bio, int cmd, long num, void *ptr) + { +- long ret = 1; ++ long ret = 0; + + switch (cmd) { + default: +@@ -415,6 +415,7 @@ static long bio_bucket_ctrl(BIO *bio, int cmd, long num, void *ptr) + break; + case BIO_CTRL_FLUSH: + /* At this point we can't force a flush. */ ++ ret = 1; + break; + case BIO_CTRL_PUSH: + case BIO_CTRL_POP: diff --git a/net-libs/serf/files/serf-1.3.9-openssl-3-errgetfunc.patch b/net-libs/serf/files/serf-1.3.9-openssl-3-errgetfunc.patch new file mode 100644 index 0000000..2823ee8 --- /dev/null +++ b/net-libs/serf/files/serf-1.3.9-openssl-3-errgetfunc.patch @@ -0,0 +1,15 @@ +https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-errgetfunc.patch +https://bugs.gentoo.org/805161 +--- a/buckets/ssl_buckets.c ++++ b/buckets/ssl_buckets.c +@@ -1204,6 +1204,10 @@ + } + } + ++#ifndef ERR_GET_FUNC ++#define ERR_GET_FUNC(ec) (0) ++#endif ++ + static int ssl_need_client_cert(SSL *ssl, X509 **cert, EVP_PKEY **pkey) + { + serf_ssl_context_t *ctx = SSL_get_app_data(ssl); diff --git a/net-libs/serf/metadata.xml b/net-libs/serf/metadata.xml index ca82cff..5480aa8 100644 --- a/net-libs/serf/metadata.xml +++ b/net-libs/serf/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>[email protected]</email> + <name>Arfrever Frehtes Taifersar Arahesis</name> </maintainer> - <maintainer type="person"> - <email>[email protected]</email> - <name>Mike Gilbert</name> - <description>Proxy</description> + <maintainer type="person" proxied="proxy"> + <email>[email protected]</email> + <name>Jakov Smolić</name> </maintainer> </pkgmetadata> diff --git a/net-libs/serf/serf-1.3.9-r3.ebuild b/net-libs/serf/serf-1.3.9-r3.ebuild new file mode 100644 index 0000000..49b49f7 --- /dev/null +++ b/net-libs/serf/serf-1.3.9-r3.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{8..10} ) + +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 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="kerberos" +# Many test failures. +RESTRICT="test" + +RDEPEND="dev-libs/apr:1= + dev-libs/apr-util:1= + dev-libs/openssl:0= + sys-libs/zlib:0= + kerberos? ( virtual/krb5 )" +DEPEND="${RDEPEND}" +BDEPEND=">=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-python3-check.patch + "${FILESDIR}"/${PN}-1.3.9-openssl-3-bio-ctrl.patch + "${FILESDIR}"/${PN}-1.3.9-openssl-3-errgetfunc.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 || die + + # need limits.h for PATH_MAX (only when EXTENSIONS is enabled) + [[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__ +} + +src_compile() { + myesconsargs=( + BUILD_STATIC=no + 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" + 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}" +}
