CVS commit: pkgsrc/www/serf

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jun  6 10:55:13 UTC 2023

Modified Files:
        pkgsrc/www/serf: Makefile distinfo
        pkgsrc/www/serf/patches: patch-SConstruct
Removed Files:
        pkgsrc/www/serf/patches: patch-buckets_ssl__buckets.c

Log Message:
serf: update to 1.3.10.

Apache Serf 1.3.10 [2023-xx-xx, from tags/1.3.10, rxxxxxxx]
  Support for OpenSSL 3 (r1901937, ...)
  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 (r1804534, ...)
  Fix handling of invalid chunk lengths in the dechunk bucket (r1804005, ...)
  Fix an endless loop in the deflate bucket with truncated input (r1805301)
  Fix BIO control handlers to support BIO_CTRL_EOF (r1902208)
  Fix a CRT mismatch issue caused by using certain OpenSSL functions (r1909252)
  Build changes to support VS2017, VS2019 and VS2022 (r1712131, ...)
  Build changes to support Python 3 (r1875933)


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/www/serf/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/www/serf/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/serf/patches/patch-SConstruct
cvs rdiff -u -r1.3 -r0 pkgsrc/www/serf/patches/patch-buckets_ssl__buckets.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/serf/Makefile
diff -u pkgsrc/www/serf/Makefile:1.41 pkgsrc/www/serf/Makefile:1.42
--- pkgsrc/www/serf/Makefile:1.41       Thu Oct 21 07:46:39 2021
+++ pkgsrc/www/serf/Makefile    Tue Jun  6 10:55:13 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2021/10/21 07:46:39 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2023/06/06 10:55:13 wiz Exp $
 
-DISTNAME=      serf-1.3.9
-PKGREVISION=   2
+DISTNAME=      serf-1.3.10
 CATEGORIES=    www
 MASTER_SITES=  https://www.apache.org/dist/serf/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/www/serf/distinfo
diff -u pkgsrc/www/serf/distinfo:1.27 pkgsrc/www/serf/distinfo:1.28
--- pkgsrc/www/serf/distinfo:1.27       Thu Jan 12 11:44:48 2023
+++ pkgsrc/www/serf/distinfo    Tue Jun  6 10:55:13 2023
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.27 2023/01/12 11:44:48 markd Exp $
+$NetBSD: distinfo,v 1.28 2023/06/06 10:55:13 wiz Exp $
 
-BLAKE2s (serf-1.3.9.tar.bz2) = 5fd4011a036f0d6b3d6ab695214646acc85f8601bb6c3fe32ba808deefa07ade
-SHA512 (serf-1.3.9.tar.bz2) = 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
-Size (serf-1.3.9.tar.bz2) = 145132 bytes
-SHA1 (patch-SConstruct) = f5adb0e945fc22937ee8f7861d65735d7ffa0b2d
-SHA1 (patch-buckets_ssl__buckets.c) = 2b12c0e27ffc256a76a00b06891275ead5a58e16
+BLAKE2s (serf-1.3.10.tar.bz2) = 0186e2142b317e40f55fbc5924ce80c3008e3c0f073e47a9e4406526c514c2a1
+SHA512 (serf-1.3.10.tar.bz2) = 19165274d35c694935cda33f99ef92a7663a5d9c540fb7fd6792aa0efe39941b2fa87ff8b61afd060c6676baec634fd33dc2e9d34ecbee45ed99dfaed077802c
+Size (serf-1.3.10.tar.bz2) = 147744 bytes
+SHA1 (patch-SConstruct) = dd96be2c3e788c8ef653b561df32e40130ce5897

Index: pkgsrc/www/serf/patches/patch-SConstruct
diff -u pkgsrc/www/serf/patches/patch-SConstruct:1.10 pkgsrc/www/serf/patches/patch-SConstruct:1.11
--- pkgsrc/www/serf/patches/patch-SConstruct:1.10       Wed Jan  2 17:25:06 2019
+++ pkgsrc/www/serf/patches/patch-SConstruct    Tue Jun  6 10:55:13 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-SConstruct,v 1.10 2019/01/02 17:25:06 tnn Exp $
+$NetBSD: patch-SConstruct,v 1.11 2023/06/06 10:55:13 wiz Exp $
 
 Hack: Use OPENSSL variable as final shared library path; fixes lib id on Darwin.
 Don't append -O2 compiler flag.
@@ -24,24 +24,6 @@ Fix build with scons-3.x.
                    tools=('default', 'textfile',),
                    CPPPATH=['.', ],
                    )
-@@ -166,7 +167,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 +184,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'])
 @@ -215,8 +216,7 @@ incdir = '$PREFIX/include/serf-$MAJOR'
  # Unfortunately we can't set the .dylib compatibility_version option separately
  # from current_version, so don't use the PATCH level to avoid that build and