Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-libs/serf
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs/serf')
-rw-r--r--net-libs/serf/files/serf-1.3.9-libressl.patch35
-rw-r--r--net-libs/serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch22
-rw-r--r--net-libs/serf/files/serf-1.3.9-openssl-3-errgetfunc.patch15
-rw-r--r--net-libs/serf/metadata.xml11
-rw-r--r--net-libs/serf/serf-1.3.9-r4.ebuild (renamed from net-libs/serf/serf-1.3.9-r2.ebuild)23
5 files changed, 90 insertions, 16 deletions
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 000000000000..bfb07bd5a0ad
--- /dev/null
+++ b/net-libs/serf/files/serf-1.3.9-libressl.patch
@@ -0,0 +1,35 @@
+This backported patch avoids the upstream scons check to prevent unintended
+issues and can be removed next release bump where it may be preferable to
+use the newer cmake build system.
+
+https://bugs.gentoo.org/906123
+https://bugs.gentoo.org/903001
+https://github.com/apache/serf/commit/df0d2d0dbdf88576f26da9c71df3ab6249d351dc
+
+From df0d2d0dbdf88576f26da9c71df3ab6249d351dc Mon Sep 17 00:00:00 2001
+From: Stefan Sperling <stsp@apache.org>
+Date: Tue, 20 Dec 2016 09:57:08 +0000
+Subject: [PATCH] Fix another build problem with LibreSSL.
+
+* SConstruct: Check for OpenSSL_malloc_init() and provide the
+ SERF_HAVE_OPENSSL_MALLOC_INIT feature flag.
+
+* buckets/ssl_buckets.c
+ (init_ssl_libraries): Use SERF_HAVE_OPENSSL_MALLOC_INIT instead
+ of USE_LEGACY_OPENSSL.
+
+git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1775242 13f79535-47bb-0310-9956-ffa450edef68
+
+diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c
+index b01e535..27c84c7 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
++#ifndef LIBRESSL_VERSION_NUMBER
+ OPENSSL_malloc_init();
+ #else
+ CRYPTO_malloc_init();
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 000000000000..6bf3aba6de47
--- /dev/null
+++ b/net-libs/serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch
@@ -0,0 +1,22 @@
+https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-bio-ctrl.patch
+https://bugs.gentoo.org/805161
+https://issues.apache.org/jira/projects/SERF/issues/SERF-198
+--- 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 000000000000..2823ee88e17b
--- /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 9bb005e5c177..bc9fee8abdf6 100644
--- a/net-libs/serf/metadata.xml
+++ b/net-libs/serf/metadata.xml
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>arfrever.fta@gmail.com</email>
- </maintainer>
- <maintainer type="person" proxied="proxy">
- <email>floppym@gentoo.org</email>
- <name>Mike Gilbert</name>
- </maintainer>
+ <!--maintainer-needed-->
+ <upstream>
+ <remote-id type="github">apache/serf</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r4.ebuild
index daf94ac8d992..0d7c80cd62a3 100644
--- a/net-libs/serf/serf-1.3.9-r2.ebuild
+++ b/net-libs/serf/serf-1.3.9-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{10..11} )
inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
@@ -13,8 +13,9 @@ 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 static-libs"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="kerberos"
+# Many test failures.
RESTRICT="test"
RDEPEND="dev-libs/apr:1=
@@ -22,21 +23,25 @@ RDEPEND="dev-libs/apr:1=
dev-libs/openssl:0=
sys-libs/zlib:0=
kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
- >=dev-util/scons-2.3.0"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-build/scons-2.3.0"
-PATCHES=( "${FILESDIR}"/${PN}-1.3.8-static-lib.patch
+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 #903001, 906123
)
src_prepare() {
default
# https://code.google.com/p/serf/issues/detail?id=133
- sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct
+ 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__
@@ -44,6 +49,7 @@ src_prepare() {
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
@@ -51,7 +57,6 @@ src_compile() {
# 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)"