Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1 +1,8 @@
 /serf-1.2.1.tar.bz2
+/serf-1.3.2.tar.bz2
+/serf-1.3.3.tar.bz2
+/serf-1.3.4.tar.bz2
+/serf-1.3.5.tar.bz2
+/serf-1.3.6.tar.bz2
+/serf-1.3.7.tar.bz2
+/serf-1.3.9.tar.bz2

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:

libserf-1.3.9-errgetfunc.patch

@@ -0,0 +1,13 @@
+--- 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-norpath.patch

@@ -0,0 +1,34 @@
+diff -uNr serf-1.3.9.orig/SConstruct serf-1.3.9/SConstruct
+--- serf-1.3.9.orig/SConstruct	2016-09-02 08:22:35.180532030 +0200
++++ serf-1.3.9/SConstruct	2016-09-02 08:22:56.653174061 +0200
+@@ -224,9 +224,6 @@
+ else:
+   LIBNAMESTATIC = 'serf-${MAJOR}'
+ 
+-env.Append(RPATH=libdir,
+-           PDB='${TARGET.filebase}.pdb')
+-
+ if sys.platform == 'darwin':
+ #  linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,))
+   env.Append(LINKFLAGS=['-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)])
+@@ -385,12 +382,6 @@
+ if sys.platform == 'win32':
+   env.Append(CPPDEFINES=['SERF_HAVE_SSPI'])
+ 
+-# On some systems, the -R values that APR describes never make it into actual
+-# RPATH flags. We'll manually map all directories in LIBPATH into new
+-# flags to set RPATH values.
+-for d in env['LIBPATH']:
+-  env.Append(RPATH=':'+d)
+-
+ # Set up the construction of serf-*.pc
+ pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),
+                          env.File('build/serf.pc.in'),
+@@ -461,7 +452,6 @@
+   TEST_EXES = [ os.path.join('test', '%s' % (prog)) for prog in TEST_PROGRAMS ]
+ 
+ # Find the (dynamic) library in this directory
+-tenv.Replace(RPATH=thisdir)
+ tenv.Prepend(LIBS=[LIBNAMESTATIC, ],
+              LIBPATH=[thisdir, ])
+ 

libserf-python3.patch

@@ -0,0 +1,60 @@
+diff -up serf-1.3.9/SConstruct.python3 serf-1.3.9/SConstruct
+--- serf-1.3.9/SConstruct.python3	2018-07-02 17:21:47.331685070 +0200
++++ serf-1.3.9/SConstruct	2018-07-02 17:27:12.316413515 +0200
+@@ -20,6 +20,8 @@
+ # ====================================================================
+ #
+ 
++from __future__ import print_function
++
+ import sys
+ import os
+ import re
+@@ -166,7 +168,7 @@ env.Append(BUILDERS = {
+ match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
+                   'SERF_MINOR_VERSION ([0-9]+).*'
+                   'SERF_PATCH_VERSION ([0-9]+)',
+-                  env.File('serf.h').get_contents(),
++                  env.File('serf.h').get_contents().decode('utf-8'),
+                   re.DOTALL)
+ MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
+ env.Append(MAJOR=str(MAJOR))
+@@ -183,7 +185,7 @@ CALLOUT_OKAY = not (env.GetOption('clean
+ 
+ unknown = opts.UnknownVariables()
+ if unknown:
+-  print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
++  print('Warning: Used unknown variables:', ', '.join(unknown.keys()))
+ 
+ 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

@@ -1,21 +1,25 @@
-%global oname   serf
+%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.2.1
-Release:        3%{?dist}
+Version:        1.3.9
+Release:        24%{?dist}
 Summary:        High-Performance Asynchronous HTTP Client Library
 License:        ASL 2.0
-Url:            http://code.google.com/p/serf
-Source0:        https://serf.googlecode.com/files/serf-%{version}.tar.bz2
-BuildRequires:  autoconf
-BuildRequires:  apr-util-devel
-BuildRequires:  apr-devel
-BuildRequires:  krb5-devel
-BuildRequires:  libtool
-BuildRequires:  libgssapi-devel
-BuildRequires:  openssl-devel
-BuildRequires:  pkgconfig
+URL:            http://serf.apache.org/
+Source0:        https://archive.apache.org/dist/serf/serf-%{version}.tar.bz2
+BuildRequires:  gcc, %{scons_pkg}, pkgconfig
+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 
@@ -29,41 +33,164 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       apr-devel%{?_isa}
 
 %description    devel
-The %{name}-devel package contains libraries and header files for
+This package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%setup -q -n %{oname}-%{version}
-sed -i 's|644 $(TARGET_LIB)|755 $(TARGET_LIB)|g' Makefile.in
+%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
-autoreconf -fiv
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
-%configure --includedir=%{_includedir}/%{oname}-1 --with-gssapi=%{_prefix}
-make %{?_smp_mflags}
+%{scons} \
+      CFLAGS="%{optflags}" \
+      LINKFLAGS="%{__global_ldflags}" \
+      PREFIX=%{_prefix} \
+      LIBDIR=%{_libdir} \
+      GSSAPI=%{_prefix} \
+      %{?_smp_mflags}
 
 %install
-make install DESTDIR=%{buildroot}
-find %{buildroot} -name '*.*a' -exec rm -f {} ';'
+%{scons} install --install-sandbox=%{buildroot}
+
+find %{buildroot}%{_libdir} -type f -name '*.*a' -delete -print
 
 %check
-make check
+export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
+%{scons} %{?_smp_mflags} check || true
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %files
-%doc CHANGES LICENSE NOTICE README design-guide.txt
+%license LICENSE NOTICE
 %{_libdir}/*.so.*
 
 %files devel
-%{_includedir}/%{oname}-1/
+%doc CHANGES README design-guide.txt
+%{_includedir}/serf-1/
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/%{oname}*.pc
+%{_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
+
+* 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 Jul 02 2018 Nils Philippsen <nils@redhat.com> - 1.3.9-8
+- use the Python 3 version of scons from Fedora 29 on
+
+* Wed Mar  7 2018 Joe Orton <jorton@redhat.com> - 1.3.9-7
+- add gcc to BR
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.9-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Nov 14 2016 Joe Orton <jorton@redhat.com> - 1.3.9-2
+- rebuild for OpenSSL 1.1.0
+
+* Fri Sep 02 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 1.3.9-1
+- Update to 1.3.9 (RHBZ #1372506)
+
+* Sat Apr 09 2016 Igor Gnatenko <ignatenko@redhat.com> - 1.3.8-3
+- Add LDFLAGS provided by RPM
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Jun 23 2015 Joe Orton <jorton@redhat.com> - 1.3.8-1
+- update to 1.3.8 (#1155115, #1155392)
+- remove RPATHs (#1154690)
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Tue Aug 12 2014 Christopher Meng <rpm@cicku.me> - 1.3.7-1
+- Update to 1.3.7
+
+* Tue Jun 17 2014 Christopher Meng <rpm@cicku.me> - 1.3.6-1
+- Update to 1.3.6
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed Apr 30 2014 Christopher Meng <rpm@cicku.me> - 1.3.5-1
+- Update to 1.3.5
+
+* Mon Feb 17 2014 Joe Orton <jorton@redhat.com> - 1.3.4-1
+- Update to 1.3.4
+
+* Tue Dec 10 2013 Joe Orton <jorton@redhat.com> - 1.3.3-1
+- Update to 1.3.3
+
+* Wed Nov  6 2013 Joe Orton <jorton@redhat.com> - 1.3.2-1
+- Update to 1.3.2
+- Require krb5-devel for libgssapi (#1027011)
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Mon Jun 17 2013 Christopher Meng <rpm@cicku.me> - 1.2.1-3
 - SPEC cleanup.
 

sources

@@ -1 +1 @@
-4f8e76c9c6567aee1d66aba49f76a58b  serf-1.2.1.tar.bz2
+370a6340ff20366ab088012cd13f2b57  serf-1.3.9.tar.bz2