CVS commit: pkgsrc/net/s6-networking

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Nov 24 08:33:12 UTC 2020

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

Log Message:
s6 TLS tools don't use OpenSSL, but do need to know where to find CA
certs. Buildlink just enough OpenSSL to read SSLDIR, then install a new
s6-pkgsrc-cadir program that knows it. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/s6-networking/Makefile \
    pkgsrc/net/s6-networking/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/net/s6-networking/hacks.mk
cvs rdiff -u -r0 -r1.1 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.2 pkgsrc/net/s6-networking/Makefile:1.3
--- pkgsrc/net/s6-networking/Makefile:1.2       Sun Nov 22 11:33:22 2020
+++ pkgsrc/net/s6-networking/Makefile   Tue Nov 24 08:33:12 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2020/11/22 11:33:22 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2020/11/24 08:33:12 schmonz Exp $
 
 DISTNAME=      s6-networking-2.3.2.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  ${HOMEPAGE}
 
@@ -16,8 +16,23 @@ CONFIGURE_ARGS+=     --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --with-sysdeps=${PREFIX}/lib/skalibs/sysdeps
 CONFIGURE_ARGS+=       --enable-absolute-paths
 
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths=     s6-pkgsrc-cadir
+SUBST_VARS.paths=      SH SETENV SSLDIR
+
 .include "options.mk"
 
+post-extract:
+       for f in s6-pkgsrc-cadir; do \
+               ${CP} ${FILESDIR}/$$f.sh ${WRKSRC}/$$f; \
+       done
+
+post-install:
+       for f in s6-pkgsrc-cadir; do \
+               ${INSTALL_SCRIPT} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/bin/$$f; \
+       done
+
 BUILDLINK_API_DEPENDS.skalibs+=skalibs>=2.9.3.0
 .include "../../devel/skalibs/buildlink3.mk"
 BUILDLINK_API_DEPENDS.execline+=execline>=2.6.1.1
Index: pkgsrc/net/s6-networking/PLIST
diff -u pkgsrc/net/s6-networking/PLIST:1.2 pkgsrc/net/s6-networking/PLIST:1.3
--- pkgsrc/net/s6-networking/PLIST:1.2  Sun Nov 22 11:33:22 2020
+++ pkgsrc/net/s6-networking/PLIST      Tue Nov 24 08:33:12 2020
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2020/11/22 11:33:22 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/11/24 08:33:12 schmonz Exp $
 bin/minidentd
 bin/s6-clockadd
 bin/s6-clockview
 bin/s6-getservbyname
 bin/s6-ident-client
+bin/s6-pkgsrc-cadir
 bin/s6-sntpclock
 bin/s6-taiclock
 bin/s6-taiclockd

Added files:

Index: pkgsrc/net/s6-networking/hacks.mk
diff -u /dev/null pkgsrc/net/s6-networking/hacks.mk:1.1
--- /dev/null   Tue Nov 24 08:33:12 2020
+++ pkgsrc/net/s6-networking/hacks.mk   Tue Nov 24 08:33:12 2020
@@ -0,0 +1,10 @@
+# $NetBSD: hacks.mk,v 1.1 2020/11/24 08:33:12 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 SSLDIR.
+PKG_HACKS+=     detect-openssl-cadir
+
+BUILDLINK_INCDIRS.openssl=     /nonexistent
+BUILDLINK_LIBDIRS.openssl=     /nonexistent
+BUILDLINK_DEPMETHOD.openssl=    build
+.include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/net/s6-networking/files/s6-pkgsrc-cadir.sh
diff -u /dev/null pkgsrc/net/s6-networking/files/s6-pkgsrc-cadir.sh:1.1
--- /dev/null   Tue Nov 24 08:33:12 2020
+++ pkgsrc/net/s6-networking/files/s6-pkgsrc-cadir.sh   Tue Nov 24 08:33:12 2020
@@ -0,0 +1,3 @@
+#!@SH@
+
+exec @SETENV@ CADIR=@SSLDIR@/certs "$@"