CVS commit: pkgsrc/net/s6-networking

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Jun  4 13:29:33 UTC 2025

Modified Files:
        pkgsrc/net/s6-networking: PLIST hacks.mk options.mk

Log Message:
s6-networking: enable openssl option, off by default.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/s6-networking/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/s6-networking/hacks.mk
cvs rdiff -u -r1.8 -r1.9 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/PLIST
diff -u pkgsrc/net/s6-networking/PLIST:1.11 pkgsrc/net/s6-networking/PLIST:1.12
--- pkgsrc/net/s6-networking/PLIST:1.11 Tue May 13 03:50:51 2025
+++ pkgsrc/net/s6-networking/PLIST      Wed Jun  4 13:29:32 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2025/05/13 03:50:51 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.12 2025/06/04 13:29:32 schmonz Exp $
 bin/s6-clockadd
 bin/s6-clockview
 bin/s6-getservbyname
@@ -26,9 +26,11 @@ include/s6-networking/s6net.h
 include/s6-networking/sbearssl.h
 include/s6-networking/stls.h
 lib/libs6net.a
-${PLIST.tls}lib/libsbearssl.a
+${PLIST.bearssl}lib/libsbearssl.a
+${PLIST.libtls}lib/libstls.a
 lib/pkgconfig/libs6net.pc
-${PLIST.tls}lib/pkgconfig/libsbearssl.pc
+${PLIST.bearssl}lib/pkgconfig/libsbearssl.pc
+${PLIST.libtls}lib/pkgconfig/libstls.pc
 man/man7/s6-tls.7
 man/man8/s6-clockadd.8
 man/man8/s6-clockview.8

Index: pkgsrc/net/s6-networking/hacks.mk
diff -u pkgsrc/net/s6-networking/hacks.mk:1.3 pkgsrc/net/s6-networking/hacks.mk:1.4
--- pkgsrc/net/s6-networking/hacks.mk:1.3       Fri Jan 22 17:16:45 2021
+++ pkgsrc/net/s6-networking/hacks.mk   Wed Jun  4 13:29:32 2025
@@ -1,6 +1,6 @@
-# $NetBSD: hacks.mk,v 1.3 2021/01/22 17:16:45 schmonz Exp $
+# $NetBSD: hacks.mk,v 1.4 2025/06/04 13:29:32 schmonz Exp $
 
-# s6 TLS tools don't use OpenSSL, but do need to know where to find CA
+# s6 TLS tools don't necessarily use OpenSSL, but do need to know where to find CA
 # certs. Buildlink just enough OpenSSL to read ${SSLCERTS}.
 PKG_HACKS+=    detect-openssl-cadir
 

Index: pkgsrc/net/s6-networking/options.mk
diff -u pkgsrc/net/s6-networking/options.mk:1.8 pkgsrc/net/s6-networking/options.mk:1.9
--- pkgsrc/net/s6-networking/options.mk:1.8     Tue May 13 03:50:51 2025
+++ pkgsrc/net/s6-networking/options.mk Wed Jun  4 13:29:33 2025
@@ -1,8 +1,11 @@
-# $NetBSD: options.mk,v 1.8 2025/05/13 03:50:51 schmonz Exp $
+# $NetBSD: options.mk,v 1.9 2025/06/04 13:29:33 schmonz Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.s6-networking
-PKG_SUPPORTED_OPTIONS+=        execline tls
-PKG_SUGGESTED_OPTIONS+=        execline tls
+PKG_OPTIONS_VAR=               PKG_OPTIONS.s6-networking
+PKG_OPTIONS_OPTIONAL_GROUPS=   tls
+PKG_OPTIONS_GROUP.tls=         bearssl openssl
+PKG_SUPPORTED_OPTIONS+=                execline
+PKG_SUGGESTED_OPTIONS+=                execline bearssl
+PKG_OPTIONS_LEGACY_OPTS+=      tls:bearssl
 
 .include "../../mk/bsd.options.mk"
 
@@ -14,12 +17,24 @@ CONFIGURE_ARGS+=    --enable-execline
 CONFIGURE_ARGS+=       --disable-execline
 .endif
 
-PLIST_VARS=            tls
-.if !empty(PKG_OPTIONS:Mtls)
+PLIST_VARS=            tls bearssl libtls
+
+.if !empty(PKG_OPTIONS:Mbearssl)
 PLIST.tls=             yes
+PLIST.bearssl=         yes
 .  include "../../security/bearssl/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-ssl=bearssl
+.endif
+
+.if !empty(PKG_OPTIONS:Mopenssl)
+PLIST.tls=             yes
+PLIST.libtls=          yes
+BUILDLINK_API_DEPENDS.libretls+=       libretls>=3.8.1
+.  include "../../security/libretls/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-ssl=libtls
+.endif
 
+.if !empty(PLIST.tls) && ${PLIST.tls} == "yes"
 PKG_USERS_VARS+=       UCSPI_SSL_USER
 PKG_GROUPS_VARS+=      UCSPI_SSL_GROUP
 PKG_GROUPS+=           ${UCSPI_SSL_GROUP}