libserf-1.3.9-bio-ctrl.patch

@@ -1,21 +0,0 @@
-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:

libserf-1.3.9-errgetfunc.patch

@@ -1,13 +0,0 @@
---- serf-1.3.9/buckets/ssl_buckets.c.errgetfunc
-+++ serf-1.3.9/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);

libserf-python3.patch

@@ -28,33 +28,3 @@ diff -up serf-1.3.9/SConstruct.python3 serf-1.3.9/SConstruct
  
  apr = str(env['APR'])
  apu = str(env['APU'])
-diff -uap serf-1.3.9/build/check.py.python3 serf-1.3.9/build/check.py
---- serf-1.3.9/build/check.py.python3	2015-09-17 13:46:24.000000000 +0100
-+++ serf-1.3.9/build/check.py	2018-12-17 11:40:06.524901129 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- #
- # check.py :  Run all the test cases.
- #
-@@ -52,16 +52,16 @@ if __name__ == '__main__':
- 
-   # Find test responses and run them one by one
-   for case in glob.glob(testdir + "/testcases/*.response"):
--    print "== Testing %s ==" % (case)
-+    print("== Testing %s ==" % (case))
-     try:
-       subprocess.check_call([SERF_RESPONSE_EXE, case])
-     except subprocess.CalledProcessError:
--      print "ERROR: test case %s failed" % (case)
-+      print("ERROR: test case %s failed" % (case))
-       sys.exit(1)
- 
--  print "== Running the unit tests =="
-+  print("== Running the unit tests ==")
-   try:
-     subprocess.check_call(TEST_ALL_EXE)
-   except subprocess.CalledProcessError:
--    print "ERROR: test(s) failed in test_all"
-+    print("ERROR: test(s) failed in test_all")
-     sys.exit(1)

libserf.spec

@@ -8,7 +8,7 @@
 
 Name:           libserf
 Version:        1.3.9
-Release:        24%{?dist}
+Release:        11%{?dist}
 Summary:        High-Performance Asynchronous HTTP Client Library
 License:        ASL 2.0
 URL:            http://serf.apache.org/
@@ -18,8 +18,6 @@ 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
-Patch3:         %{name}-1.3.9-errgetfunc.patch
 
 %description
 The serf library is a C-based HTTP client library built upon the Apache 
@@ -76,47 +74,6 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
 %{_libdir}/pkgconfig/serf*.pc
 
 %changelog
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.9-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.9-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Oct  4 2021 Joe Orton <jorton@redhat.com> - 1.3.9-22
-- fix build with OpenSSL 3.0
-
-* Mon Sep 20 2021 Tomas Korbar <tkorbar@redhat.com> - 1.3.9-21
-- Fix internal BIO control function
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.3.9-20
-- Rebuilt with OpenSSL 3.0.0
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.9-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.9-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.9-17
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.9-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.9-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Nov 14 2019 Joe Orton <jorton@redhat.com> - 1.3.9-14
-- revert broken IPv6 workaround
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.9-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Apr 16 2019 Joe Orton <jorton@redhat.com> - 1.3.9-12
-- fix IPv6 fallback behaviour (#1130328)
-- use Python3 in tests
-
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.9-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild