SOURCES/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:

SOURCES/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);

SOURCES/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)

SPECS/libserf.spec

@@ -1,20 +1,23 @@
+%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} > 28 || 0%{?rhel} > 7
+%global scons scons-3
+%global scons_pkg python3-scons
+%else
+%global scons scons-2
+%global scons_pkg python2-scons
+%endif
+
 Name:           libserf
 Version:        1.3.9
-Release:        26%{?dist}
+Release:        9%{?dist}
 Summary:        High-Performance Asynchronous HTTP Client Library
 License:        ASL 2.0
 URL:            http://serf.apache.org/
 Source0:        https://archive.apache.org/dist/serf/serf-%{version}.tar.bz2
-BuildRequires:  gcc, pkgconfig
+BuildRequires:  gcc, %{scons_pkg}, pkgconfig
 BuildRequires:  apr-devel, apr-util-devel, krb5-devel, openssl-devel
-BuildRequires:  zlib-devel, cmake
+BuildRequires:  zlib-devel
 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 
@@ -34,22 +37,33 @@ developing applications that use %{name}.
 %prep
 %autosetup -n serf-%{version} -p1
 
+# Shared library versioning support in scons is worse than awful...
+# minimally, here fix the soname to match serf-1.2.x.  Minor version
+# handling should be fixed too; really requires better upstream support:
+# http://scons.tigris.org/issues/show_bug.cgi?id=2869
+sed -i '/SHLIBVERSION/s/MAJOR/0/' SConstruct
+
 %build
-%cmake -DCMAKE_INSTALL_LIBDIR=%{_libdir}
-%cmake_build
+%{scons} \
+      CFLAGS="%{optflags}" \
+      LINKFLAGS="%{__global_ldflags}" \
+      PREFIX=%{_prefix} \
+      LIBDIR=%{_libdir} \
+      GSSAPI=%{_prefix} \
+      %{?_smp_mflags}
 
 %install
-%cmake_install
-find %{buildroot}%{_libdir} -type f -name '*.*a' -delete -print
+%{scons} install --install-sandbox=%{buildroot}
 
-mkdir -p  %{buildroot}%{_libdir}/pkgconfig
-mv %{buildroot}%{_datadir}/pkgconfig/serf.pc %{buildroot}%{_libdir}/pkgconfig/serf.pc
-rm -rf %{buildroot}%{_datadir}
+find %{buildroot}%{_libdir} -type f -name '*.*a' -delete -print
 
 %check
-%ctest || true
+export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
+%{scons} %{?_smp_mflags} check || true
+
+%post -p /sbin/ldconfig
 
-%ldconfig_scriptlets
+%postun -p /sbin/ldconfig
 
 %files
 %license LICENSE NOTICE
@@ -62,67 +76,8 @@ 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
-
-* Mon Aug  9 2021 Joe Orton <jorton@redhat.com> - 1.3.9-24
-- fix FTBFS with OpenSSL 3.0 beta 2 (#1991008)
-
-* Wed Jun 30 2021 Tomas Korbar <tkorbar@redhat.com> - 1.3.9-23
-- Fix soname problems
-- Related: rhbz#1974621
-
-* Wed Jun 30 2021 Tomas Korbar <tkorbar@redhat.com> - 1.3.9-22
-- Remove scons from build requirements
-- Related: rhbz#1974621
-
-* Wed Jun 30 2021 Tomas Korbar <tkorbar@redhat.com> - 1.3.9-21
-- Backport cmake support
-- Resolves: rhbz#1974621
-
-* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.3.9-20
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.3.9-19
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* 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
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.9-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jul 02 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.9-9
-- Switch to %%ldconfig_scriptlets
+* Mon Aug 05 2019 Lubos Uhliarik <luhliari@redhat.com> - 1.3.9-9
+- Resolves: #1695587 - Ensure modular RPM upgrade path
 
 * Mon Jul 02 2018 Nils Philippsen <nils@redhat.com> - 1.3.9-8
 - use the Python 3 version of scons from Fedora 29 on