diff options
| author | schmonz <schmonz@pkgsrc.org> | 2021-01-22 17:16:45 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2021-01-22 17:16:45 +0000 |
| commit | c4ea72daa04895fe75d554bf076c76f9ec68ad1d (patch) | |
| tree | 3f370b3763cf1f65b7a73a28f95c891d499b7795 /net | |
| parent | b99d82d680b3be4731600269ef016327cfab63fd (diff) | |
| download | pkgsrc-c4ea72daa04895fe75d554bf076c76f9ec68ad1d.tar.gz | |
Also restore the hack to get SSLCERTS defined. Ride previous bump.
Diffstat (limited to 'net')
| -rw-r--r-- | net/s6-networking/files/s6-pkgsrc-cadir.sh | 2 | ||||
| -rw-r--r-- | net/s6-networking/hacks.mk | 10 | ||||
| -rw-r--r-- | net/s6-networking/options.mk | 4 |
3 files changed, 13 insertions, 3 deletions
diff --git a/net/s6-networking/files/s6-pkgsrc-cadir.sh b/net/s6-networking/files/s6-pkgsrc-cadir.sh index f6f4a30d0f0..59c4938a886 100644 --- a/net/s6-networking/files/s6-pkgsrc-cadir.sh +++ b/net/s6-networking/files/s6-pkgsrc-cadir.sh @@ -1,3 +1,3 @@ #!@SH@ -exec @SETENV@ CADIR=@SSLDIR@/certs "$@" +exec @SETENV@ CADIR=@SSLCERTS@ "$@" diff --git a/net/s6-networking/hacks.mk b/net/s6-networking/hacks.mk new file mode 100644 index 00000000000..2095ccc6fe9 --- /dev/null +++ b/net/s6-networking/hacks.mk @@ -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 --git a/net/s6-networking/options.mk b/net/s6-networking/options.mk index 4a31fb260bb..d444ae0589a 100644 --- a/net/s6-networking/options.mk +++ b/net/s6-networking/options.mk @@ -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_SSL_GROUP} 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 \ |