From c3b19ddf182532c13c04f31403f11c46631d5938 Mon Sep 17 00:00:00 2001 From: Tomas Korbar Date: Mon, 20 Sep 2021 14:09:17 +0200 Subject: [PATCH] Fix internal BIO control function --- libserf-1.3.9-bio-ctrl.patch | 21 +++++++++++++++++++++ libserf.spec | 6 +++++- 2 files changed, 26 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 616cd3e..cd9bf4a 100644 --- a/libserf.spec +++ b/libserf.spec @@ -8,7 +8,7 @@ Name: libserf Version: 1.3.9 -Release: 20%{?dist} +Release: 21%{?dist} Summary: High-Performance Asynchronous HTTP Client Library License: ASL 2.0 URL: http://serf.apache.org/ @@ -18,6 +18,7 @@ BuildRequires: apr-devel, apr-util-devel, krb5-devel, openssl-devel BuildRequires: zlib-devel Patch0: %{name}-norpath.patch Patch1: %{name}-python3.patch +Patch2: %{name}-1.3.9-bio-ctrl.patch %description The serf library is a C-based HTTP client library built upon the Apache @@ -74,6 +75,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_libdir}/pkgconfig/serf*.pc %changelog +* Mon Sep 20 2021 Tomas Korbar - 1.3.9-21 +- Fix internal BIO control function + * Tue Sep 14 2021 Sahana Prasad - 1.3.9-20 - Rebuilt with OpenSSL 3.0.0