CVS commit: pkgsrc/net/s6-networking

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jul 11 21:16:20 UTC 2025

Modified Files:
        pkgsrc/net/s6-networking: Makefile PLIST options.mk
Removed Files:
        pkgsrc/net/s6-networking: hacks.mk
        pkgsrc/net/s6-networking/files: s6-pkgsrc-cadir.sh

Log Message:
s6-networking: change default options. Bump PKGREVISION.

Instead of BearSSL, link with OpenSSL by default. The 'bearssl' option
is still present and 'libressl' is now available too.

Remove the transitional 'tls' option mapping.

While here, remove s6-pkgsrc-cadir. pkgsrc doesn't have a clear
library-independent notion of its "SSL cert directory", so we can't
helpfully tell clients (or servers that want to validate client certs)
where to find it.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/net/s6-networking/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/s6-networking/PLIST
cvs rdiff -u -r1.4 -r0 pkgsrc/net/s6-networking/hacks.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/s6-networking/options.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/net/s6-networking/files/s6-pkgsrc-cadir.sh

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.25 pkgsrc/net/s6-networking/Makefile:1.26
--- pkgsrc/net/s6-networking/Makefile:1.25      Tue Jul  8 21:45:34 2025
+++ pkgsrc/net/s6-networking/Makefile   Fri Jul 11 21:16:20 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2025/07/08 21:45:34 schmonz Exp $
+# $NetBSD: Makefile,v 1.26 2025/07/11 21:16:20 schmonz Exp $
 
 DISTNAME=              ${GITHUB_PROJECT}-${GITHUB_TAG}
 PKGNAME=               s6-networking-2.7.1.0
-PKGREVISION=           1
+PKGREVISION=           2
 MANPAGES_VERSION=      2.7.0.4.1
 CATEGORIES=            net security
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=skarnet/}

Index: pkgsrc/net/s6-networking/PLIST
diff -u pkgsrc/net/s6-networking/PLIST:1.13 pkgsrc/net/s6-networking/PLIST:1.14
--- pkgsrc/net/s6-networking/PLIST:1.13 Tue Jul  8 21:17:06 2025
+++ pkgsrc/net/s6-networking/PLIST      Fri Jul 11 21:16:20 2025
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.13 2025/07/08 21:17:06 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.14 2025/07/11 21:16:20 schmonz Exp $
 bin/proxy-server
 bin/s6-clockadd
 bin/s6-clockview
 bin/s6-getservbyname
 bin/s6-ident-client
-${PLIST.tls}bin/s6-pkgsrc-cadir
 bin/s6-sntpclock
 bin/s6-taiclock
 bin/s6-taiclockd

Index: pkgsrc/net/s6-networking/options.mk
diff -u pkgsrc/net/s6-networking/options.mk:1.9 pkgsrc/net/s6-networking/options.mk:1.10
--- pkgsrc/net/s6-networking/options.mk:1.9     Wed Jun  4 13:29:33 2025
+++ pkgsrc/net/s6-networking/options.mk Fri Jul 11 21:16:20 2025
@@ -1,11 +1,10 @@
-# $NetBSD: options.mk,v 1.9 2025/06/04 13:29:33 schmonz Exp $
+# $NetBSD: options.mk,v 1.10 2025/07/11 21:16:20 schmonz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.s6-networking
 PKG_OPTIONS_OPTIONAL_GROUPS=   tls
-PKG_OPTIONS_GROUP.tls=         bearssl openssl
+PKG_OPTIONS_GROUP.tls=         bearssl libressl openssl
 PKG_SUPPORTED_OPTIONS+=                execline
-PKG_SUGGESTED_OPTIONS+=                execline bearssl
-PKG_OPTIONS_LEGACY_OPTS+=      tls:bearssl
+PKG_SUGGESTED_OPTIONS+=                execline openssl
 
 .include "../../mk/bsd.options.mk"
 
@@ -26,6 +25,17 @@ PLIST.bearssl=               yes
 CONFIGURE_ARGS+=       --enable-ssl=bearssl
 .endif
 
+# XXX libtls-bearssl
+
+.if !empty(PKG_OPTIONS:Mlibressl)
+PLIST.tls=             yes
+PLIST.libtls=          yes
+BUILDLINK_API_DEPENDS.libressl+=       libressl>=4.1.0
+.  include "../../security/libressl/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-ssl=libtls
+CONFIGURE_ARGS+=       --with-ssl-path=${PREFIX:Q}/libressl
+.endif
+
 .if !empty(PKG_OPTIONS:Mopenssl)
 PLIST.tls=             yes
 PLIST.libtls=          yes
@@ -39,21 +49,4 @@ PKG_USERS_VARS+=     UCSPI_SSL_USER
 PKG_GROUPS_VARS+=      UCSPI_SSL_GROUP
 PKG_GROUPS+=           ${UCSPI_SSL_GROUP}
 PKG_USERS+=            ${UCSPI_SSL_USER}:${UCSPI_SSL_GROUP}
-
-SUBST_CLASSES+=                paths
-SUBST_STAGE.paths=     pre-configure
-SUBST_FILES.paths=     s6-pkgsrc-cadir
-SUBST_VARS.paths=      SH SETENV SSLCERTS
-
-.PHONY: do-extract-cadir do-install-cadir
-post-extract: do-extract-cadir
-do-extract-cadir:
-       for f in s6-pkgsrc-cadir; do \
-               ${CP} ${FILESDIR}/$$f.sh ${WRKSRC}/$$f; \
-       done
-post-install: do-install-cadir
-do-install-cadir:
-       for f in s6-pkgsrc-cadir; do \
-               ${INSTALL_SCRIPT} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/bin/$$f; \
-       done
 .endif