[pkgsrc/trunk]: pkgsrc/net/s6-networking Also restore the hack to get SSLCERT...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b8101edcad5e
branches:  trunk
changeset: 445401:b8101edcad5e
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Fri Jan 22 17:16:45 2021 +0000

description:
Also restore the hack to get SSLCERTS defined. Ride previous bump.

diffstat:

 net/s6-networking/files/s6-pkgsrc-cadir.sh |   2 +-
 net/s6-networking/hacks.mk                 |  10 ++++++++++
 net/s6-networking/options.mk               |   4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r 0e0a601f710a -r b8101edcad5e net/s6-networking/files/s6-pkgsrc-cadir.sh
--- a/net/s6-networking/files/s6-pkgsrc-cadir.sh        Fri Jan 22 17:10:00 2021 +0000
+++ b/net/s6-networking/files/s6-pkgsrc-cadir.sh        Fri Jan 22 17:16:45 2021 +0000
@@ -1,3 +1,3 @@
 #!@SH@
 
-exec @SETENV@ CADIR=@SSLDIR@/certs "$@"
+exec @SETENV@ CADIR=@SSLCERTS@ "$@"
diff -r 0e0a601f710a -r b8101edcad5e net/s6-networking/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/s6-networking/hacks.mk        Fri Jan 22 17:16:45 2021 +0000
@@ -0,0 +1,10 @@
+# $NetBSD: hacks.mk,v 1.3 2021/01/22 17:16:45 schmonz Exp $
+
+# s6 TLS tools don't use OpenSSL, but do need to know where to find CA
+# certs. Buildlink just enough OpenSSL to read ${SSLCERTS}.
+PKG_HACKS+=    detect-openssl-cadir
+
+BUILDLINK_INCDIRS.openssl=     /nonexistent
+BUILDLINK_LIBDIRS.openssl=     /nonexistent
+BUILDLINK_DEPMETHOD.openssl=   build
+.include "../../security/openssl/buildlink3.mk"
diff -r 0e0a601f710a -r b8101edcad5e net/s6-networking/options.mk
--- a/net/s6-networking/options.mk      Fri Jan 22 17:10:00 2021 +0000
+++ b/net/s6-networking/options.mk      Fri Jan 22 17:16:45 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2021/01/22 16:20:38 schmonz Exp $
+# $NetBSD: options.mk,v 1.4 2021/01/22 17:16:45 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.s6-networking
 PKG_SUPPORTED_OPTIONS+=        execline tls
@@ -26,7 +26,7 @@
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_FILES.paths=     s6-pkgsrc-cadir
-SUBST_VARS.paths=      SH SETENV SSLDIR
+SUBST_VARS.paths=      SH SETENV SSLCERTS
 
 post-extract:
        for f in s6-pkgsrc-cadir; do \