From f39d19bb2b49ee8e49370dc5e3786e83c9484071 Mon Sep 17 00:00:00 2001
From: Tomas Korbar <tkorbar@redhat.com>
Date: Fri, 17 Sep 2021 13:43:04 +0200
Subject: [PATCH] Fix BIO control function implementation Resolves:
 rhbz#2004714

---
 libserf-1.3.9-bio-ctrl.patch | 21 +++++++++++++++++++++
 libserf.spec                 |  9 ++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 libserf-1.3.9-bio-ctrl.patch

diff --git a/libserf-1.3.9-bio-ctrl.patch b/libserf-1.3.9-bio-ctrl.patch
new file mode 100644
index 0000000..b679edf
--- /dev/null
+++ b/libserf-1.3.9-bio-ctrl.patch
@@ -0,0 +1,21 @@
+diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c
+index b01e5359db08..3c8b7e2a685f 100644
+--- 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/libserf.spec b/libserf.spec
index 08cc664..c44cc59 100644
--- a/libserf.spec
+++ b/libserf.spec
@@ -1,6 +1,6 @@
 Name:           libserf
 Version:        1.3.9
-Release:        25%{?dist}
+Release:        26%{?dist}
 Summary:        High-Performance Asynchronous HTTP Client Library
 License:        ASL 2.0
 URL:            http://serf.apache.org/
@@ -12,6 +12,9 @@ Patch0:         %{name}-norpath.patch
 Patch1:         %{name}-python3.patch
 Patch2:		%{name}-1.3.9-cmake.patch
 Patch3:         %{name}-1.3.9-errgetfunc.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=2004714
+# Patch BIO to work with openssl 3
+Patch4:		%{name}-1.3.9-bio-ctrl.patch
 
 %description
 The serf library is a C-based HTTP client library built upon the Apache 
@@ -59,6 +62,10 @@ rm -rf %{buildroot}%{_datadir}
 %{_libdir}/pkgconfig/serf*.pc
 
 %changelog
+* Fri Sep 17 2021 Tomas Korbar <tkorbar@redhat.com> - 1.3.9-26
+- Fix BIO control function implementation
+- Resolves: rhbz#2004714
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.3.9-25
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688