This patch updates net/serf to 1.3.10. This is a bug fix release.
The Subversion regression test suite is still passing for me on OpenBSD
with this release. Two patches can be dropped from the port.

Upstream changelog:

Changes in version 1.3.10:
  - Support for OpenSSL 3
  - Fix issue #171: Win32: Running tests fails with "no OPENSSL_Applink" error
  - Fix issue #194: Win32: Linking error when building against OpenSSL 1.1+
  - Fix issue #198: OpenSSL BIO control method incorrectly handles
    unknown requests
  - Fix issue #202: SSL tests are not passing with OpenSSL 3
  - Fix error handling when reading the outgoing request body
  - Fix handling of invalid chunk lengths in the dechunk bucket
  - Fix an endless loop in the deflate bucket with truncated input
  - Fix BIO control handlers to support BIO_CTRL_EOF
  - Fix a CRT mismatch issue caused by using certain OpenSSL functions
  - Build changes to support VS2017, VS2019 and VS2022
  - Build changes to support Python 3

ok?

diff /usr/ports
commit - 578d62534f167e4cebe7e11ab2e6cb042c678454
path + /usr/ports
blob - a153994ff81451346b919bc236e1d6c430fe9990
file + net/serf/Makefile
--- net/serf/Makefile
+++ net/serf/Makefile
@@ -1,6 +1,5 @@
 COMMENT =              high performance HTTP client library
-DISTNAME =             serf-1.3.9
-REVISION =             0
+DISTNAME =             serf-1.3.10
 SHARED_LIBS =          serf-1                    1.0 # 1.3.0
 CATEGORIES =           net
 HOMEPAGE =             https://serf.apache.org/
blob - 81de8b41324ab7882f45acfbe9667f3b2f63f5ac
file + net/serf/distinfo
--- net/serf/distinfo
+++ net/serf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (serf-1.3.9.tar.bz2) = VJwtIcV3qKnARQ+stcyoCfJlkfBI5GZVIkCUe996h8w=
-SIZE (serf-1.3.9.tar.bz2) = 145132
+SHA256 (serf-1.3.10.tar.bz2) = voHvCLqiUW7Np2p3rffe97wyJ+61eLmjO0X3tB3AZOY=
+SIZE (serf-1.3.10.tar.bz2) = 147744
blob - 469c70877ee0877981ddbff5cba96a515b5fda2b
file + /dev/null
--- net/serf/patches/patch-SConstruct
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: SConstruct
---- SConstruct.orig
-+++ SConstruct
-@@ -166,7 +166,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 +183,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetO
- 
- 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'])
blob - c49cf4ab8a80e53a5a74f7500026c5eb3d117f05
file + /dev/null
--- net/serf/patches/patch-build_check_py
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: build/check.py
---- build/check.py.orig
-+++ build/check.py
-@@ -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)
-+    except subprocess.CalledProcessError as x:
-+      print("ERROR: test failed in '%s', exit code=%d" % (x.cmd, 
x.returncode))
-       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"
-+  except subprocess.CalledProcessError as x:
-+    print("ERROR: test(s) failed in '%s', exit code=%d" % (x.cmd, 
x.returncode))
-     sys.exit(1)

Reply via email to