Tue Feb 16 14:07:52 2021 UTC ()
Update to 2.4.1.0. From the changelog:

- Bugfixes.
- Handshake timeout now also works with the libtls backend.
- The SNI server name is now exported after the handshake in the
  SSL_TLS_SNI_SERVERNAME variable.


(schmonz)
diff -r1.7 -r1.8 pkgsrc/net/s6-networking/Makefile
diff -r1.4 -r1.5 pkgsrc/net/s6-networking/distinfo
diff -r1.5 -r1.6 pkgsrc/net/s6-networking/options.mk
cvs diff -r1.7 -r1.8 pkgsrc/net/s6-networking/Makefile (expand / switch to unified diff)

--- pkgsrc/net/s6-networking/Makefile 2021/02/04 09:16:45 1.7
+++ pkgsrc/net/s6-networking/Makefile 2021/02/16 14:07:52 1.8
@@ -1,48 +1,42 @@ @@ -1,48 +1,42 @@
1# $NetBSD: Makefile,v 1.7 2021/02/04 09:16:45 schmonz Exp $ 1# $NetBSD: Makefile,v 1.8 2021/02/16 14:07:52 schmonz Exp $
2 2
3DISTNAME= s6-networking-2.4.0.0 3DISTNAME= s6-networking-2.4.1.0
4PKGREVISION= 3 
5CATEGORIES= net 4CATEGORIES= net
6MASTER_SITES= ${HOMEPAGE} 5MASTER_SITES= ${HOMEPAGE}
7DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES} 6DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
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
14MANPAGES= v2.4.0.0.1.tar.gz 13MANPAGES= v2.4.0.0.2.tar.gz
15SITES.${MANPAGES}= https://github.com/flexibeast/s6-networking-man-pages/archive/ 14SITES.${MANPAGES}= https://github.com/flexibeast/s6-networking-man-pages/archive/
16 15
17USE_TOOLS+= gmake 16USE_TOOLS+= gmake
18HAS_CONFIGURE= yes 17HAS_CONFIGURE= yes
19CONFIGURE_ARGS+= --prefix=${PREFIX} 18CONFIGURE_ARGS+= --prefix=${PREFIX}
20CONFIGURE_ARGS+= --with-sysdeps=${PREFIX}/lib/skalibs/sysdeps 19CONFIGURE_ARGS+= --with-sysdeps=${PREFIX}/lib/skalibs/sysdeps
21CONFIGURE_ARGS+= --enable-absolute-paths 20CONFIGURE_ARGS+= --enable-absolute-paths
22 21
23INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man7 22INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man7
24 23
25.include "options.mk" 24.include "options.mk"
26 25
27.PHONY: do-extract-manpages do-install-manpages 26.PHONY: do-install-manpages
28post-extract: do-extract-manpages 
29do-extract-manpages: 
30 cd ${WRKDIR}/${PKGBASE}-man-pages-*; \ 
31 for i in *.in; do \ 
32 j=$$(echo $$i | sed -e 's|\.in$$||'); \ 
33 mv $$i $$j; \ 
34 done 
35 
36post-install: do-install-manpages 27post-install: do-install-manpages
37do-install-manpages: 28do-install-manpages:
38 cd ${WRKDIR}/${PKGBASE}-man-pages-*; for i in 1 7; do \ 29 cd ${WRKDIR}/${PKGBASE}-man-pages-*; for i in 1 7; do \
39 for j in *.$$i; do \ 30 for j in *.$$i; do \
40 ${INSTALL_MAN} $$j \ 31 ${INSTALL_MAN} $$j \
41 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; \ 32 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; \
42 done \ 33 done \
43 done 34 done
44 35
 36BUILDLINK_API_DEPENDS.skalibs+= skalibs>=2.10.0.2
45.include "../../devel/skalibs/buildlink3.mk" 37.include "../../devel/skalibs/buildlink3.mk"
 38BUILDLINK_API_DEPENDS.s6-dns+= s6-dns>=2.3.5.0
46.include "../../net/s6-dns/buildlink3.mk" 39.include "../../net/s6-dns/buildlink3.mk"
 40BUILDLINK_API_DEPENDS.s6+= s6>=2.10.0.2
47.include "../../sysutils/s6/buildlink3.mk" 41.include "../../sysutils/s6/buildlink3.mk"
48.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/net/s6-networking/distinfo (expand / switch to unified diff)

--- pkgsrc/net/s6-networking/distinfo 2021/02/04 09:16:45 1.4
+++ pkgsrc/net/s6-networking/distinfo 2021/02/16 14:07:52 1.5
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.4 2021/02/04 09:16:45 schmonz Exp $ 1$NetBSD: distinfo,v 1.5 2021/02/16 14:07:52 schmonz Exp $
2 2
3SHA1 (s6-networking-2.4.0.0.tar.gz) = 7b013b0181d5873555bbaead902533429db207ae 3SHA1 (s6-networking-2.4.1.0.tar.gz) = 72f1c499e625f292e9986be925452667a66839cc
4RMD160 (s6-networking-2.4.0.0.tar.gz) = 21fd26cff9868096d297b415f74e799da3db10ab 4RMD160 (s6-networking-2.4.1.0.tar.gz) = 085c0fafd60247d404e0aeeae7cad8c160e5371e
5SHA512 (s6-networking-2.4.0.0.tar.gz) = e8646bbfe965db0a736b1624e3533151182fd0d0337c08ab6af52f6872af1e8c82e3afa85fd146fec3f0640360173aa57182065982e1f3d60ec16862f449115b 5SHA512 (s6-networking-2.4.1.0.tar.gz) = 4f889228b5409bbd7241f1cb38cb1f739572dc28bb59740188531fa62f433030a085b7582108d9ee96b3a22a6280b38fff2b5080f743370e0f59358005583e22
6Size (s6-networking-2.4.0.0.tar.gz) = 102302 bytes 6Size (s6-networking-2.4.1.0.tar.gz) = 103240 bytes
7SHA1 (v2.4.0.0.1.tar.gz) = 7049c4cde484ae97f167c07f0bb0de3cfb20e6c8 7SHA1 (v2.4.0.0.2.tar.gz) = 11d775919b654b22f2826e8225fe29df1b9880f2
8RMD160 (v2.4.0.0.1.tar.gz) = 19d8f4f5d7e1b6d55860222e416b66fa46b09534 8RMD160 (v2.4.0.0.2.tar.gz) = ebd7d2a54f5fff0fb48ee7e3851437264f2e51c8
9SHA512 (v2.4.0.0.1.tar.gz) = 96ffb8e5c593c3e47b7663a5c0bd6a793286f60b169f069bf0d688466cea699320687dbc99fb12b265deafc1b213251b1fdb8ab178013b6b4b75e89e4a5eff8e 9SHA512 (v2.4.0.0.2.tar.gz) = ad8621ff6a7b40d2ad4bd193004be9e340a790be2880203521e4f6eacddfa60a29fc4a336ed717a76ff4291b65525e5c24dfdf6486eaae01bace99e3d89319e3
10Size (v2.4.0.0.1.tar.gz) = 23878 bytes 10Size (v2.4.0.0.2.tar.gz) = 23617 bytes
11SHA1 (patch-src_stls_stls__client__init__and__handshake.c) = 5ba7652cca7fc864cfff31939fa196086d4336f6 11SHA1 (patch-src_stls_stls__client__init__and__handshake.c) = 5ba7652cca7fc864cfff31939fa196086d4336f6
cvs diff -r1.5 -r1.6 pkgsrc/net/s6-networking/options.mk (expand / switch to unified diff)

--- pkgsrc/net/s6-networking/options.mk 2021/02/04 09:16:45 1.5
+++ pkgsrc/net/s6-networking/options.mk 2021/02/16 14:07:52 1.6
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1# $NetBSD: options.mk,v 1.5 2021/02/04 09:16:45 schmonz Exp $ 1# $NetBSD: options.mk,v 1.6 2021/02/16 14:07:52 schmonz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.s6-networking 3PKG_OPTIONS_VAR= PKG_OPTIONS.s6-networking
4PKG_SUPPORTED_OPTIONS+= execline tls 4PKG_SUPPORTED_OPTIONS+= execline tls
5PKG_SUGGESTED_OPTIONS+= tls 5PKG_SUGGESTED_OPTIONS+= tls
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mexecline) 9.if !empty(PKG_OPTIONS:Mexecline)
 10BUILDLINK_API_DEPENDS.execline+= execline>=2.7.0.1
10. include "../../lang/execline/buildlink3.mk" 11. include "../../lang/execline/buildlink3.mk"
11.else 12.else
12CONFIGURE_ARGS+= --disable-execline 13CONFIGURE_ARGS+= --disable-execline
13.endif 14.endif
14 15
15PLIST_VARS= tls 16PLIST_VARS= tls
16.if !empty(PKG_OPTIONS:Mtls) 17.if !empty(PKG_OPTIONS:Mtls)
17PLIST.tls= yes 18PLIST.tls= yes
18. include "../../security/bearssl/buildlink3.mk" 19. include "../../security/bearssl/buildlink3.mk"
19CONFIGURE_ARGS+= --enable-ssl=bearssl 20CONFIGURE_ARGS+= --enable-ssl=bearssl
20 21
21PKG_USERS_VARS+= UCSPI_SSL_USER 22PKG_USERS_VARS+= UCSPI_SSL_USER
22PKG_GROUPS_VARS+= UCSPI_SSL_GROUP 23PKG_GROUPS_VARS+= UCSPI_SSL_GROUP