Sat Nov 11 11:57:20 2023 UTC ()
s6-networking: update to 2.6.0.0. Changes:

- Bugfixes.
- s6-tcpserver has been unified! no ipv4 and ipv6 separation anymore.
   * The only programs in the superserver chain are now s6-tcpserver,
     s6-tcpserver-socketbinder, and s6-tcpserverd.
   * s6-tcpserver-access still exists, should now run under s6-tcpserverd,
     still invoked once per connection. Doesn't spam the log anymore when
     invoked with no ruleset.
   * Options -4 and -6 removed from s6-tcpserver and s6-tlsserver.
     Protocol detection happens when the cmdline address is scanned.
   * Option -e removed from s6-tlsserver. It should now always invoke
     s6-tcpserver-access when needed (and only then).
- Major performance improvements. s6-tcpserverd does not fork on systems
  that support posix_spawn. Also, its lookups are now logarithmic
  instead of linear (which only matters on *heavy* loads).


(schmonz)
diff -r1.16 -r1.17 pkgsrc/net/s6-networking/Makefile
diff -r1.8 -r1.9 pkgsrc/net/s6-networking/PLIST
diff -r1.3 -r1.4 pkgsrc/net/s6-networking/buildlink3.mk
diff -r1.14 -r1.15 pkgsrc/net/s6-networking/distinfo
cvs diff -r1.16 -r1.17 pkgsrc/net/s6-networking/Makefile (expand / switch to unified diff)

--- pkgsrc/net/s6-networking/Makefile 2023/10/24 22:10:33 1.16
+++ pkgsrc/net/s6-networking/Makefile 2023/11/11 11:57:20 1.17
@@ -1,30 +1,29 @@ @@ -1,30 +1,29 @@
1# $NetBSD: Makefile,v 1.16 2023/10/24 22:10:33 wiz Exp $ 1# $NetBSD: Makefile,v 1.17 2023/11/11 11:57:20 schmonz Exp $
2 2
3DISTNAME= s6-networking-2.5.1.3 3DISTNAME= s6-networking-2.6.0.0
4PKGREVISION= 2 
5CATEGORIES= net 4CATEGORIES= net
6MASTER_SITES= ${HOMEPAGE} 5MASTER_SITES= ${HOMEPAGE}
7DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES_DIST} 6DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES_DIST}
8 7
9MAINTAINER= schmonz@NetBSD.org 8MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= https://skarnet.org/software/s6-networking/ 9HOMEPAGE= https://skarnet.org/software/s6-networking/
11COMMENT= Suite of small networking utilities 10COMMENT= Suite of small networking utilities
12LICENSE= isc 11LICENSE= isc
13 12
14# man-pages version is usually not exactly in-sync with PKGVERSION_NOREV 13# man-pages version is usually not exactly in-sync with PKGVERSION_NOREV
15MANPAGES_VERSION= 2.5.1.3.3 14MANPAGES_VERSION= 2.6.0.0.1
16MANPAGES_DIST= s6-networking-man-pages-${MANPAGES_VERSION}.tar.gz 15MANPAGES_DIST= s6-networking-man-pages-${MANPAGES_VERSION}.tar.gz
17SITES.${MANPAGES_DIST}= -${MASTER_SITE_GITHUB:=flexibeast/s6-networking-man-pages/archive/}v${MANPAGES_VERSION}.tar.gz 16SITES.${MANPAGES_DIST}= -https://git.sr.ht/~flexibeast/s6-networking-man-pages/archive/v${MANPAGES_VERSION}.tar.gz
18 17
19USE_TOOLS+= gmake 18USE_TOOLS+= gmake
20HAS_CONFIGURE= yes 19HAS_CONFIGURE= yes
21CONFIGURE_ARGS+= --prefix=${PREFIX} 20CONFIGURE_ARGS+= --prefix=${PREFIX}
22CONFIGURE_ARGS+= --with-sysdeps=${PREFIX}/lib/skalibs/sysdeps 21CONFIGURE_ARGS+= --with-sysdeps=${PREFIX}/lib/skalibs/sysdeps
23CONFIGURE_ARGS+= --enable-absolute-paths 22CONFIGURE_ARGS+= --enable-absolute-paths
24 23
25INSTALLATION_DIRS+= ${PKGMANDIR}/man7 ${PKGMANDIR}/man8 24INSTALLATION_DIRS+= ${PKGMANDIR}/man7 ${PKGMANDIR}/man8
26 25
27.include "options.mk" 26.include "options.mk"
28 27
29.PHONY: do-install-manpages 28.PHONY: do-install-manpages
30post-install: do-install-manpages 29post-install: do-install-manpages
cvs diff -r1.8 -r1.9 pkgsrc/net/s6-networking/PLIST (expand / switch to unified diff)

--- pkgsrc/net/s6-networking/PLIST 2021/12/22 16:07:04 1.8
+++ pkgsrc/net/s6-networking/PLIST 2023/11/11 11:57:20 1.9
@@ -1,58 +1,50 @@ @@ -1,58 +1,50 @@
1@comment $NetBSD: PLIST,v 1.8 2021/12/22 16:07:04 schmonz Exp $ 1@comment $NetBSD: PLIST,v 1.9 2023/11/11 11:57:20 schmonz Exp $
2bin/s6-clockadd 2bin/s6-clockadd
3bin/s6-clockview 3bin/s6-clockview
4bin/s6-getservbyname 4bin/s6-getservbyname
5bin/s6-ident-client 5bin/s6-ident-client
6${PLIST.tls}bin/s6-pkgsrc-cadir 6${PLIST.tls}bin/s6-pkgsrc-cadir
7bin/s6-sntpclock 7bin/s6-sntpclock
8bin/s6-taiclock 8bin/s6-taiclock
9bin/s6-taiclockd 9bin/s6-taiclockd
10bin/s6-tcpclient 10bin/s6-tcpclient
11bin/s6-tcpserver 11bin/s6-tcpserver
12bin/s6-tcpserver-access 12bin/s6-tcpserver-access
13bin/s6-tcpserver4 13bin/s6-tcpserver-socketbinder
14bin/s6-tcpserver4-socketbinder 14bin/s6-tcpserverd
15bin/s6-tcpserver4d 
16bin/s6-tcpserver6 
17bin/s6-tcpserver6-socketbinder 
18bin/s6-tcpserver6d 
19${PLIST.tls}bin/s6-tlsc 15${PLIST.tls}bin/s6-tlsc
20${PLIST.tls}bin/s6-tlsc-io 16${PLIST.tls}bin/s6-tlsc-io
21${PLIST.tls}bin/s6-tlsclient 17${PLIST.tls}bin/s6-tlsclient
22${PLIST.tls}bin/s6-tlsd 18${PLIST.tls}bin/s6-tlsd
23${PLIST.tls}bin/s6-tlsd-io 19${PLIST.tls}bin/s6-tlsd-io
24${PLIST.tls}bin/s6-tlsserver 20${PLIST.tls}bin/s6-tlsserver
25${PLIST.tls}bin/s6-ucspitlsc 21${PLIST.tls}bin/s6-ucspitlsc
26${PLIST.tls}bin/s6-ucspitlsd 22${PLIST.tls}bin/s6-ucspitlsd
27include/s6-networking/config.h 23include/s6-networking/config.h
28include/s6-networking/ident.h 24include/s6-networking/ident.h
29include/s6-networking/s6net.h 25include/s6-networking/s6net.h
30include/s6-networking/sbearssl.h 26include/s6-networking/sbearssl.h
31include/s6-networking/stls.h 27include/s6-networking/stls.h
32lib/s6-networking/libs6net.a 28lib/s6-networking/libs6net.a
33${PLIST.tls}lib/s6-networking/libsbearssl.a 29${PLIST.tls}lib/s6-networking/libsbearssl.a
34man/man7/s6-tls.7 30man/man7/s6-tls.7
35man/man8/s6-clockadd.8 31man/man8/s6-clockadd.8
36man/man8/s6-clockview.8 32man/man8/s6-clockview.8
37man/man8/s6-getservbyname.8 33man/man8/s6-getservbyname.8
38man/man8/s6-ident-client.8 34man/man8/s6-ident-client.8
39man/man8/s6-sntpclock.8 35man/man8/s6-sntpclock.8
40man/man8/s6-taiclock.8 36man/man8/s6-taiclock.8
41man/man8/s6-taiclockd.8 37man/man8/s6-taiclockd.8
42man/man8/s6-tcpclient.8 38man/man8/s6-tcpclient.8
43man/man8/s6-tcpserver-access.8 39man/man8/s6-tcpserver-access.8
 40man/man8/s6-tcpserver-socketbinder.8
44man/man8/s6-tcpserver.8 41man/man8/s6-tcpserver.8
45man/man8/s6-tcpserver4-socketbinder.8 42man/man8/s6-tcpserverd.8
46man/man8/s6-tcpserver4.8 
47man/man8/s6-tcpserver4d.8 
48man/man8/s6-tcpserver6-socketbinder.8 
49man/man8/s6-tcpserver6.8 
50man/man8/s6-tcpserver6d.8 
51man/man8/s6-tlsc-io.8 43man/man8/s6-tlsc-io.8
52man/man8/s6-tlsc.8 44man/man8/s6-tlsc.8
53man/man8/s6-tlsclient.8 45man/man8/s6-tlsclient.8
54man/man8/s6-tlsd-io.8 46man/man8/s6-tlsd-io.8
55man/man8/s6-tlsd.8 47man/man8/s6-tlsd.8
56man/man8/s6-tlsserver.8 48man/man8/s6-tlsserver.8
57man/man8/s6-ucspitlsc.8 49man/man8/s6-ucspitlsc.8
58man/man8/s6-ucspitlsd.8 50man/man8/s6-ucspitlsd.8
cvs diff -r1.3 -r1.4 pkgsrc/net/s6-networking/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/net/s6-networking/buildlink3.mk 2021/09/29 09:56:36 1.3
+++ pkgsrc/net/s6-networking/buildlink3.mk 2023/11/11 11:57:20 1.4
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.3 2021/09/29 09:56:36 schmonz Exp $ 1# $NetBSD: buildlink3.mk,v 1.4 2023/11/11 11:57:20 schmonz Exp $
2 2
3BUILDLINK_TREE+= s6-networking 3BUILDLINK_TREE+= s6-networking
4 4
5.if !defined(S6_NETWORKING_BUILDLINK3_MK) 5.if !defined(S6_NETWORKING_BUILDLINK3_MK)
6S6_NETWORKING_BUILDLINK3_MK:= 6S6_NETWORKING_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.s6-networking+= s6-networking>=2.5.0.0 8BUILDLINK_API_DEPENDS.s6-networking+= s6-networking>=2.6.0.0
9BUILDLINK_PKGSRCDIR.s6-networking?= ../../net/s6-networking 9BUILDLINK_PKGSRCDIR.s6-networking?= ../../net/s6-networking
10BUILDLINK_INCDIRS.s6-networking+= include/s6-networking 10BUILDLINK_INCDIRS.s6-networking+= include/s6-networking
11BUILDLINK_LIBDIRS.s6-networking+= lib/s6-networking 11BUILDLINK_LIBDIRS.s6-networking+= lib/s6-networking
12BUILDLINK_DEPMETHOD.s6-networking?= build 12BUILDLINK_DEPMETHOD.s6-networking?= build
13.endif # S6_NETWORKING_BUILDLINK3_MK 13.endif # S6_NETWORKING_BUILDLINK3_MK
14 14
15BUILDLINK_TREE+= -s6-networking 15BUILDLINK_TREE+= -s6-networking
cvs diff -r1.14 -r1.15 pkgsrc/net/s6-networking/distinfo (expand / switch to unified diff)

--- pkgsrc/net/s6-networking/distinfo 2023/04/04 20:15:52 1.14
+++ pkgsrc/net/s6-networking/distinfo 2023/11/11 11:57:20 1.15
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.14 2023/04/04 20:15:52 schmonz Exp $ 1$NetBSD: distinfo,v 1.15 2023/11/11 11:57:20 schmonz Exp $
2 2
3BLAKE2s (s6-networking-2.5.1.3.tar.gz) = 2f25406d35e95fe90c5678fd2107102fccf31e01bb159fea6f0c2e32c32772ad 3BLAKE2s (s6-networking-2.6.0.0.tar.gz) = 013cf2f14921d31017aa64e78581126b3e917ea20579d0501913d945962f1382
4SHA512 (s6-networking-2.5.1.3.tar.gz) = abc90d374a24507998041fd8dcd5f9c2d91bf94046e3da8d324546471f482b5929d863bd2bc846581da32f6c980ef5c2e5d6780655c757316ef0b67e37c72a19 4SHA512 (s6-networking-2.6.0.0.tar.gz) = dcd9a9c8e2d17fcfca96d44b1b86760a0f0e303a638f566ba064b4eb071e18736baa188cfcdb2ae27c0b00a2ed7876a9da6361a8e3a4719b70f462925df913e7
5Size (s6-networking-2.5.1.3.tar.gz) = 114490 bytes 5Size (s6-networking-2.6.0.0.tar.gz) = 112145 bytes
6BLAKE2s (s6-networking-man-pages-2.5.1.3.3.tar.gz) = bc37a3e5e222a741b3d91c5a5f6bed8b10b8f7f930713b6a9fe371713983a5ac 6BLAKE2s (s6-networking-man-pages-2.6.0.0.1.tar.gz) = f158cf477669fd4381aa0a6178ff93778c1dad2f134d28ea5ee40574d644998a
7SHA512 (s6-networking-man-pages-2.5.1.3.3.tar.gz) = caaff064c285ba80c293fede4f5b45d8f349fc389d5ab30f438552f81b2889b863741e55d7092d33a2b2738f2e4fcec918492dc87446d8de7dbbba6021e4df46 7SHA512 (s6-networking-man-pages-2.6.0.0.1.tar.gz) = 3d2a30cfd77e2c109c9e270e6e0139fc80519c999fd73b6c1aa244d90df22b4b0f09b17516c0dfc59f7af45822360f79d7cdfda0bf959e8b571ed7cb4bc5e242
8Size (s6-networking-man-pages-2.5.1.3.3.tar.gz) = 24361 bytes 8Size (s6-networking-man-pages-2.6.0.0.1.tar.gz) = 23537 bytes
9SHA1 (patch-src_stls_stls__client__init__and__handshake.c) = 5ba7652cca7fc864cfff31939fa196086d4336f6 9SHA1 (patch-src_stls_stls__client__init__and__handshake.c) = 5ba7652cca7fc864cfff31939fa196086d4336f6