CVS commit: pkgsrc/net/s6-networking

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jan 22 17:16:45 UTC 2021

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

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


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 pkgsrc/net/s6-networking/hacks.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/s6-networking/options.mk
cvs rdiff -u -r1.1 -r1.2 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/options.mk
diff -u pkgsrc/net/s6-networking/options.mk:1.3 pkgsrc/net/s6-networking/options.mk:1.4
--- pkgsrc/net/s6-networking/options.mk:1.3     Fri Jan 22 16:20:38 2021
+++ pkgsrc/net/s6-networking/options.mk Fri Jan 22 17:16:45 2021
@@ -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 @@ PKG_USERS+=           ${UCSPI_SSL_USER}:${UCSPI_S
 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 \

Index: pkgsrc/net/s6-networking/files/s6-pkgsrc-cadir.sh
diff -u pkgsrc/net/s6-networking/files/s6-pkgsrc-cadir.sh:1.1 pkgsrc/net/s6-networking/files/s6-pkgsrc-cadir.sh:1.2
--- pkgsrc/net/s6-networking/files/s6-pkgsrc-cadir.sh:1.1       Tue Nov 24 08:33:12 2020
+++ pkgsrc/net/s6-networking/files/s6-pkgsrc-cadir.sh   Fri Jan 22 17:16:45 2021
@@ -1,3 +1,3 @@
 #!@SH@
 
-exec @SETENV@ CADIR=@SSLDIR@/certs "$@"
+exec @SETENV@ CADIR=@SSLCERTS@ "$@"

Added files:

Index: pkgsrc/net/s6-networking/hacks.mk
diff -u /dev/null pkgsrc/net/s6-networking/hacks.mk:1.3
--- /dev/null   Fri Jan 22 17:16:45 2021
+++ pkgsrc/net/s6-networking/hacks.mk   Fri Jan 22 17:16:45 2021
@@ -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"