Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2723E84D54 for ; Sat, 11 Nov 2023 11:57:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id FT2A20-vCteI for ; Sat, 11 Nov 2023 11:57:20 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4F91D84CF7 for ; Sat, 11 Nov 2023 11:57:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 48722FA2F; Sat, 11 Nov 2023 11:57:20 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1699703840182750" MIME-Version: 1.0 Date: Sat, 11 Nov 2023 11:57:20 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/net/s6-networking To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20231111115720.48722FA2F@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1699703840182750 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sat Nov 11 11:57:20 UTC 2023 Modified Files: pkgsrc/net/s6-networking: Makefile PLIST buildlink3.mk distinfo Log Message: 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). To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/s6-networking/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/s6-networking/PLIST cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/s6-networking/buildlink3.mk cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/s6-networking/distinfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1699703840182750 Content-Disposition: inline Content-Length: 5155 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/s6-networking/Makefile diff -u pkgsrc/net/s6-networking/Makefile:1.16 pkgsrc/net/s6-networking/Makefile:1.17 --- pkgsrc/net/s6-networking/Makefile:1.16 Tue Oct 24 22:10:33 2023 +++ pkgsrc/net/s6-networking/Makefile Sat Nov 11 11:57:20 2023 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.16 2023/10/24 22:10:33 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2023/11/11 11:57:20 schmonz Exp $ -DISTNAME= s6-networking-2.5.1.3 -PKGREVISION= 2 +DISTNAME= s6-networking-2.6.0.0 CATEGORIES= net MASTER_SITES= ${HOMEPAGE} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES_DIST} @@ -12,9 +11,9 @@ COMMENT= Suite of small networking utili LICENSE= isc # man-pages version is usually not exactly in-sync with PKGVERSION_NOREV -MANPAGES_VERSION= 2.5.1.3.3 +MANPAGES_VERSION= 2.6.0.0.1 MANPAGES_DIST= s6-networking-man-pages-${MANPAGES_VERSION}.tar.gz -SITES.${MANPAGES_DIST}= -${MASTER_SITE_GITHUB:=flexibeast/s6-networking-man-pages/archive/}v${MANPAGES_VERSION}.tar.gz +SITES.${MANPAGES_DIST}= -https://git.sr.ht/~flexibeast/s6-networking-man-pages/archive/v${MANPAGES_VERSION}.tar.gz USE_TOOLS+= gmake HAS_CONFIGURE= yes Index: pkgsrc/net/s6-networking/PLIST diff -u pkgsrc/net/s6-networking/PLIST:1.8 pkgsrc/net/s6-networking/PLIST:1.9 --- pkgsrc/net/s6-networking/PLIST:1.8 Wed Dec 22 16:07:04 2021 +++ pkgsrc/net/s6-networking/PLIST Sat Nov 11 11:57:20 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2021/12/22 16:07:04 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.9 2023/11/11 11:57:20 schmonz Exp $ bin/s6-clockadd bin/s6-clockview bin/s6-getservbyname @@ -10,12 +10,8 @@ bin/s6-taiclockd bin/s6-tcpclient bin/s6-tcpserver bin/s6-tcpserver-access -bin/s6-tcpserver4 -bin/s6-tcpserver4-socketbinder -bin/s6-tcpserver4d -bin/s6-tcpserver6 -bin/s6-tcpserver6-socketbinder -bin/s6-tcpserver6d +bin/s6-tcpserver-socketbinder +bin/s6-tcpserverd ${PLIST.tls}bin/s6-tlsc ${PLIST.tls}bin/s6-tlsc-io ${PLIST.tls}bin/s6-tlsclient @@ -41,13 +37,9 @@ man/man8/s6-taiclock.8 man/man8/s6-taiclockd.8 man/man8/s6-tcpclient.8 man/man8/s6-tcpserver-access.8 +man/man8/s6-tcpserver-socketbinder.8 man/man8/s6-tcpserver.8 -man/man8/s6-tcpserver4-socketbinder.8 -man/man8/s6-tcpserver4.8 -man/man8/s6-tcpserver4d.8 -man/man8/s6-tcpserver6-socketbinder.8 -man/man8/s6-tcpserver6.8 -man/man8/s6-tcpserver6d.8 +man/man8/s6-tcpserverd.8 man/man8/s6-tlsc-io.8 man/man8/s6-tlsc.8 man/man8/s6-tlsclient.8 Index: pkgsrc/net/s6-networking/buildlink3.mk diff -u pkgsrc/net/s6-networking/buildlink3.mk:1.3 pkgsrc/net/s6-networking/buildlink3.mk:1.4 --- pkgsrc/net/s6-networking/buildlink3.mk:1.3 Wed Sep 29 09:56:36 2021 +++ pkgsrc/net/s6-networking/buildlink3.mk Sat Nov 11 11:57:20 2023 @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.3 2021/09/29 09:56:36 schmonz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2023/11/11 11:57:20 schmonz Exp $ BUILDLINK_TREE+= s6-networking .if !defined(S6_NETWORKING_BUILDLINK3_MK) S6_NETWORKING_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.s6-networking+= s6-networking>=2.5.0.0 +BUILDLINK_API_DEPENDS.s6-networking+= s6-networking>=2.6.0.0 BUILDLINK_PKGSRCDIR.s6-networking?= ../../net/s6-networking BUILDLINK_INCDIRS.s6-networking+= include/s6-networking BUILDLINK_LIBDIRS.s6-networking+= lib/s6-networking Index: pkgsrc/net/s6-networking/distinfo diff -u pkgsrc/net/s6-networking/distinfo:1.14 pkgsrc/net/s6-networking/distinfo:1.15 --- pkgsrc/net/s6-networking/distinfo:1.14 Tue Apr 4 20:15:52 2023 +++ pkgsrc/net/s6-networking/distinfo Sat Nov 11 11:57:20 2023 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.14 2023/04/04 20:15:52 schmonz Exp $ +$NetBSD: distinfo,v 1.15 2023/11/11 11:57:20 schmonz Exp $ -BLAKE2s (s6-networking-2.5.1.3.tar.gz) = 2f25406d35e95fe90c5678fd2107102fccf31e01bb159fea6f0c2e32c32772ad -SHA512 (s6-networking-2.5.1.3.tar.gz) = abc90d374a24507998041fd8dcd5f9c2d91bf94046e3da8d324546471f482b5929d863bd2bc846581da32f6c980ef5c2e5d6780655c757316ef0b67e37c72a19 -Size (s6-networking-2.5.1.3.tar.gz) = 114490 bytes -BLAKE2s (s6-networking-man-pages-2.5.1.3.3.tar.gz) = bc37a3e5e222a741b3d91c5a5f6bed8b10b8f7f930713b6a9fe371713983a5ac -SHA512 (s6-networking-man-pages-2.5.1.3.3.tar.gz) = caaff064c285ba80c293fede4f5b45d8f349fc389d5ab30f438552f81b2889b863741e55d7092d33a2b2738f2e4fcec918492dc87446d8de7dbbba6021e4df46 -Size (s6-networking-man-pages-2.5.1.3.3.tar.gz) = 24361 bytes +BLAKE2s (s6-networking-2.6.0.0.tar.gz) = 013cf2f14921d31017aa64e78581126b3e917ea20579d0501913d945962f1382 +SHA512 (s6-networking-2.6.0.0.tar.gz) = dcd9a9c8e2d17fcfca96d44b1b86760a0f0e303a638f566ba064b4eb071e18736baa188cfcdb2ae27c0b00a2ed7876a9da6361a8e3a4719b70f462925df913e7 +Size (s6-networking-2.6.0.0.tar.gz) = 112145 bytes +BLAKE2s (s6-networking-man-pages-2.6.0.0.1.tar.gz) = f158cf477669fd4381aa0a6178ff93778c1dad2f134d28ea5ee40574d644998a +SHA512 (s6-networking-man-pages-2.6.0.0.1.tar.gz) = 3d2a30cfd77e2c109c9e270e6e0139fc80519c999fd73b6c1aa244d90df22b4b0f09b17516c0dfc59f7af45822360f79d7cdfda0bf959e8b571ed7cb4bc5e242 +Size (s6-networking-man-pages-2.6.0.0.1.tar.gz) = 23537 bytes SHA1 (patch-src_stls_stls__client__init__and__handshake.c) = 5ba7652cca7fc864cfff31939fa196086d4336f6 --_----------=_1699703840182750--