CVS commit: pkgsrc/net/s6-networking

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Feb 16 14:07:52 UTC 2021

Modified Files:
        pkgsrc/net/s6-networking: Makefile distinfo options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/s6-networking/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/s6-networking/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/s6-networking/options.mk

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

Modified files:

Index: pkgsrc/net/s6-networking/Makefile
diff -u pkgsrc/net/s6-networking/Makefile:1.7 pkgsrc/net/s6-networking/Makefile:1.8
--- pkgsrc/net/s6-networking/Makefile:1.7       Thu Feb  4 09:16:45 2021
+++ pkgsrc/net/s6-networking/Makefile   Tue Feb 16 14:07:52 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2021/02/04 09:16:45 schmonz Exp $
+# $NetBSD: Makefile,v 1.8 2021/02/16 14:07:52 schmonz Exp $
 
-DISTNAME=      s6-networking-2.4.0.0
-PKGREVISION=   3
+DISTNAME=      s6-networking-2.4.1.0
 CATEGORIES=    net
 MASTER_SITES=  ${HOMEPAGE}
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
@@ -11,7 +10,7 @@ HOMEPAGE=     https://skarnet.org/software/s
 COMMENT=       Suite of small networking utilities
 LICENSE=       isc
 
-MANPAGES=              v2.4.0.0.1.tar.gz
+MANPAGES=              v2.4.0.0.2.tar.gz
 SITES.${MANPAGES}=     https://github.com/flexibeast/s6-networking-man-pages/archive/
 
 USE_TOOLS+=            gmake
@@ -24,15 +23,7 @@ INSTALLATION_DIRS+=  ${PKGMANDIR}/man1 ${
 
 .include "options.mk"
 
-.PHONY: do-extract-manpages do-install-manpages
-post-extract: do-extract-manpages
-do-extract-manpages:
-       cd ${WRKDIR}/${PKGBASE}-man-pages-*; \
-       for i in *.in; do \
-               j=$$(echo $$i | sed -e 's|\.in$$||'); \
-               mv $$i $$j; \
-       done
-
+.PHONY: do-install-manpages
 post-install: do-install-manpages
 do-install-manpages:
        cd ${WRKDIR}/${PKGBASE}-man-pages-*; for i in 1 7; do \
@@ -42,7 +33,10 @@ do-install-manpages:
                done \
        done
 
+BUILDLINK_API_DEPENDS.skalibs+=        skalibs>=2.10.0.2
 .include "../../devel/skalibs/buildlink3.mk"
+BUILDLINK_API_DEPENDS.s6-dns+= s6-dns>=2.3.5.0
 .include "../../net/s6-dns/buildlink3.mk"
+BUILDLINK_API_DEPENDS.s6+=     s6>=2.10.0.2
 .include "../../sysutils/s6/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/s6-networking/distinfo
diff -u pkgsrc/net/s6-networking/distinfo:1.4 pkgsrc/net/s6-networking/distinfo:1.5
--- pkgsrc/net/s6-networking/distinfo:1.4       Thu Feb  4 09:16:45 2021
+++ pkgsrc/net/s6-networking/distinfo   Tue Feb 16 14:07:52 2021
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2021/02/04 09:16:45 schmonz Exp $
+$NetBSD: distinfo,v 1.5 2021/02/16 14:07:52 schmonz Exp $
 
-SHA1 (s6-networking-2.4.0.0.tar.gz) = 7b013b0181d5873555bbaead902533429db207ae
-RMD160 (s6-networking-2.4.0.0.tar.gz) = 21fd26cff9868096d297b415f74e799da3db10ab
-SHA512 (s6-networking-2.4.0.0.tar.gz) = e8646bbfe965db0a736b1624e3533151182fd0d0337c08ab6af52f6872af1e8c82e3afa85fd146fec3f0640360173aa57182065982e1f3d60ec16862f449115b
-Size (s6-networking-2.4.0.0.tar.gz) = 102302 bytes
-SHA1 (v2.4.0.0.1.tar.gz) = 7049c4cde484ae97f167c07f0bb0de3cfb20e6c8
-RMD160 (v2.4.0.0.1.tar.gz) = 19d8f4f5d7e1b6d55860222e416b66fa46b09534
-SHA512 (v2.4.0.0.1.tar.gz) = 96ffb8e5c593c3e47b7663a5c0bd6a793286f60b169f069bf0d688466cea699320687dbc99fb12b265deafc1b213251b1fdb8ab178013b6b4b75e89e4a5eff8e
-Size (v2.4.0.0.1.tar.gz) = 23878 bytes
+SHA1 (s6-networking-2.4.1.0.tar.gz) = 72f1c499e625f292e9986be925452667a66839cc
+RMD160 (s6-networking-2.4.1.0.tar.gz) = 085c0fafd60247d404e0aeeae7cad8c160e5371e
+SHA512 (s6-networking-2.4.1.0.tar.gz) = 4f889228b5409bbd7241f1cb38cb1f739572dc28bb59740188531fa62f433030a085b7582108d9ee96b3a22a6280b38fff2b5080f743370e0f59358005583e22
+Size (s6-networking-2.4.1.0.tar.gz) = 103240 bytes
+SHA1 (v2.4.0.0.2.tar.gz) = 11d775919b654b22f2826e8225fe29df1b9880f2
+RMD160 (v2.4.0.0.2.tar.gz) = ebd7d2a54f5fff0fb48ee7e3851437264f2e51c8
+SHA512 (v2.4.0.0.2.tar.gz) = ad8621ff6a7b40d2ad4bd193004be9e340a790be2880203521e4f6eacddfa60a29fc4a336ed717a76ff4291b65525e5c24dfdf6486eaae01bace99e3d89319e3
+Size (v2.4.0.0.2.tar.gz) = 23617 bytes
 SHA1 (patch-src_stls_stls__client__init__and__handshake.c) = 5ba7652cca7fc864cfff31939fa196086d4336f6

Index: pkgsrc/net/s6-networking/options.mk
diff -u pkgsrc/net/s6-networking/options.mk:1.5 pkgsrc/net/s6-networking/options.mk:1.6
--- pkgsrc/net/s6-networking/options.mk:1.5     Thu Feb  4 09:16:45 2021
+++ pkgsrc/net/s6-networking/options.mk Tue Feb 16 14:07:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2021/02/04 09:16:45 schmonz Exp $
+# $NetBSD: options.mk,v 1.6 2021/02/16 14:07:52 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.s6-networking
 PKG_SUPPORTED_OPTIONS+=        execline tls
@@ -7,6 +7,7 @@ PKG_SUGGESTED_OPTIONS+= tls
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mexecline)
+BUILDLINK_API_DEPENDS.execline+=       execline>=2.7.0.1
 .  include "../../lang/execline/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-execline