4 files changed, 119 insertions, 0 deletions
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index c2c64db9b712..cc3d42ece817 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -1,8 +1,11 @@
 AUX serf-1.3.8-openssl.patch 960 BLAKE2B ba24959e39cafd03d041e349806b03feeca52fc1432fa96a39cf44fe392ad5e25bfc11e305d20b752f0469445f3a0932bd1d1de0646c3a95a9c24aec36560d81 SHA512 902f0b28a0166bb2c30127600eeacd8117ab9c8a21787aec7f6ee77b94554a613ec1bdcaef3bbbd730254c9c26a7c40b47906b296ca869af909ec18d9f2ad59b
 AUX serf-1.3.8-static-lib.patch 1922 BLAKE2B 66e518933fd12141916e93955d9648149de4d82f82ba66b9c574a21720d7bad61ea2d575363426d297f1649d394cfac4fcd8b5f963dd307d60db2f08fa3e2a2f SHA512 c5d7cbc7ed7632e3ead1a1eec36106a4e50f89c42b7099d8e6bc2a3021b4b3058c16cb1aef1fedbb26e6bd5b4d0b12b34567d40c38c0f1c5cb6528e924db9e84
+AUX serf-1.3.9-openssl-3-bio-ctrl.patch 647 BLAKE2B 468f4a14b16184b24f19a2325a0377db8416920112189513a7907ab214b8f9550ba20191463f9bcdb492d189fe6b32e1a8d606afdb69f8ad378630b2f0e91cd9 SHA512 71335210bfcb0d8b8a0e28e4a314e25a2c9be6196e55ab2bd25cc7bac1cfe403a6ab9582ce04351ddbaa941ec1bb35c55ec94dc01462c5372912b26e57991894
+AUX serf-1.3.9-openssl-3-errgetfunc.patch 402 BLAKE2B d142dc567dad42966ff7a9bf84e5354e8778df7d696c260b1c895718e01311e51f1141f58cb6d4827b4f9631f11da286ce0eaaedf60e8d6b0517fbeadd3ebf96 SHA512 2f8b8ee93255aae2633f73c16fdec498db6885d25c4d31a5623170a629b616ab4e56bfe6f8db13d8617cc994ec775b1d90777d5596452f14e97338648d5af10c
 AUX serf-1.3.9-python3-check.patch 2896 BLAKE2B b757a9d1d3c4d5f9928e70a0182b3c7a0756ddea3b081378a7180f334eca697cccc5fe637dc8226d72daafbe5440aa595def447f76a52ab9f11e8bc626be846b SHA512 2538c2c80f924fa823a28e00e40688af0a38cb94ae2302cee83070645017e8321a0647e947a98c9d541228054acb8e470a465e4f2d5782b99a9b782aac86dfc1
 AUX serf-1.3.9-python3.patch 965 BLAKE2B 0f7444b19ec1f2b32c165ddf08d96113cb22ca3518eb7257885a582ed50dd3119a6459a52f134d149729cfc967265d6b9c478ec5d6f08a8a589bb5db0893d7bf SHA512 cf6726b860b876503820d8a42ff821f932bd1bf9a6157c98ebcbe77ebe71835ab4d2395fb9463fa187ef457100ededa59f9a7c430f98735c59f878cff600ff07
 AUX serf-1.3.9-python3_byte.patch 1079 BLAKE2B 7e8c328d101c3642cc82be9f92f26e9af49ada5df040da088e35869efddeaaf043cba06fe6c626380e9a68b10f1f5a61e393405d039bb7b59d9d00d00d95e066 SHA512 b02b3eb8fa27a7a133ebe6bd958f378bcc5daf9a1871e5a4015ec8fb292736cf65ba7776ef3297ceb3b4fb767ae4f22cc44e0e3b4a222887c73107e3c03e4533
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
 EBUILD serf-1.3.9-r2.ebuild 2017 BLAKE2B 58b1c8f3f47c1f481162b35dd5feeb207ef74dad4b42740e53872423fd1ec98d9915ed95a57178568654c1bcc57d9ea79119243dc8948e77325ba5e92b9d5f8d SHA512 97064317879b772e7de74b8779808be7242e25a5478bd33e2c9a3dcc942cef54bd744afd5fbb3e7d38b4a6cf594b77bdf830fc08d912b7a7bc0b79f4d4db16b5
+EBUILD serf-1.3.9-r3.ebuild 2139 BLAKE2B 83c56ebea322b1ad4c669236c1f6fc1cdeeaed85b2a00fc96fc6e16bbc31b310fcc185295d44fef27f653dcad3f3917ee4e358b431ed72b43ff71129b4fbdbc7 SHA512 d1ba55e08fd3d5221add2d567fde511a7b33dd93664fb719188dac58d38e88ead870e01efe768a2b465086a7d787a02251d7646b6aa86dd059776300b0f439cf
 MISC metadata.xml 412 BLAKE2B 0c84a591f559e156e38d074ebf645ae696371af6ed9bce2d844841059347653d18ffa6e96f92e92aab7ec95e7310a1a28e8a7ceb9ab562a6e2179e59bb9cd985 SHA512 1cde9c461ea2a3516c2aee1c7c8e7dd7e24b5cbc0d7d48a6443186f16083b869c7b6bfbeb7cf006af0ed90f3b85c911281f03a6a8ede92fdf5e04f51d8f0a73d
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..a10974f4fbdc
--- /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 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/serf-1.3.9-r3.ebuild b/net-libs/serf/serf-1.3.9-r3.ebuild
new file mode 100644
index 000000000000..adc74891f4d4
--- /dev/null
+++ b/net-libs/serf/serf-1.3.9-r3.ebuild
@@ -0,0 +1,80 @@
+# 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
+)
+
+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}"
+}