Fri Jan 22 16:20:39 2021 UTC ()
LibreTLS + OpenSSL isn't working well for me yet. Switch back to BearSSL
for now, riding recent PKGREVISION bump.


(schmonz)
diff -r1.4 -r1.5 pkgsrc/net/s6-networking/PLIST
diff -r1.2 -r1.3 pkgsrc/net/s6-networking/options.mk
cvs diff -r1.4 -r1.5 pkgsrc/net/s6-networking/PLIST (expand / switch to unified diff)

--- pkgsrc/net/s6-networking/PLIST 2021/01/11 18:31:10 1.4
+++ pkgsrc/net/s6-networking/PLIST 2021/01/22 16:20:38 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.4 2021/01/11 18:31:10 schmonz Exp $ 1@comment $NetBSD: PLIST,v 1.5 2021/01/22 16:20:38 schmonz Exp $
2bin/minidentd 2bin/minidentd
3bin/s6-clockadd 3bin/s6-clockadd
4bin/s6-clockview 4bin/s6-clockview
5bin/s6-getservbyname 5bin/s6-getservbyname
6bin/s6-ident-client 6bin/s6-ident-client
7${PLIST.tls}bin/s6-pkgsrc-cadir 7${PLIST.tls}bin/s6-pkgsrc-cadir
8bin/s6-sntpclock 8bin/s6-sntpclock
9bin/s6-taiclock 9bin/s6-taiclock
10bin/s6-taiclockd 10bin/s6-taiclockd
11bin/s6-tcpclient 11bin/s6-tcpclient
12bin/s6-tcpserver 12bin/s6-tcpserver
13bin/s6-tcpserver-access 13bin/s6-tcpserver-access
14bin/s6-tcpserver4 14bin/s6-tcpserver4
@@ -21,14 +21,14 @@ ${PLIST.tls}bin/s6-tlsc @@ -21,14 +21,14 @@ ${PLIST.tls}bin/s6-tlsc
21${PLIST.tls}bin/s6-tlsc-io 21${PLIST.tls}bin/s6-tlsc-io
22${PLIST.tls}bin/s6-tlsclient 22${PLIST.tls}bin/s6-tlsclient
23${PLIST.tls}bin/s6-tlsd 23${PLIST.tls}bin/s6-tlsd
24${PLIST.tls}bin/s6-tlsd-io 24${PLIST.tls}bin/s6-tlsd-io
25${PLIST.tls}bin/s6-tlsserver 25${PLIST.tls}bin/s6-tlsserver
26${PLIST.tls}bin/s6-ucspitlsc 26${PLIST.tls}bin/s6-ucspitlsc
27${PLIST.tls}bin/s6-ucspitlsd 27${PLIST.tls}bin/s6-ucspitlsd
28include/s6-networking/config.h 28include/s6-networking/config.h
29include/s6-networking/ident.h 29include/s6-networking/ident.h
30include/s6-networking/s6net.h 30include/s6-networking/s6net.h
31include/s6-networking/sbearssl.h 31include/s6-networking/sbearssl.h
32include/s6-networking/stls.h 32include/s6-networking/stls.h
33lib/s6-networking/libs6net.a 33lib/s6-networking/libs6net.a
34${PLIST.tls}lib/s6-networking/libstls.a 34${PLIST.tls}lib/s6-networking/libsbearssl.a
cvs diff -r1.2 -r1.3 pkgsrc/net/s6-networking/options.mk (expand / switch to unified diff)

--- pkgsrc/net/s6-networking/options.mk 2021/01/11 18:31:10 1.2
+++ pkgsrc/net/s6-networking/options.mk 2021/01/22 16:20:38 1.3
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: options.mk,v 1.2 2021/01/11 18:31:10 schmonz Exp $ 1# $NetBSD: options.mk,v 1.3 2021/01/22 16:20:38 schmonz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.s6-networking 3PKG_OPTIONS_VAR= PKG_OPTIONS.s6-networking
4PKG_SUPPORTED_OPTIONS+= execline tls 4PKG_SUPPORTED_OPTIONS+= execline tls
5PKG_SUGGESTED_OPTIONS+= tls 5PKG_SUGGESTED_OPTIONS+= tls
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mexecline) 9.if !empty(PKG_OPTIONS:Mexecline)
10. include "../../lang/execline/buildlink3.mk" 10. include "../../lang/execline/buildlink3.mk"
11.else 11.else
12CONFIGURE_ARGS+= --disable-execline 12CONFIGURE_ARGS+= --disable-execline
13.endif 13.endif
14 14
15PLIST_VARS= tls 15PLIST_VARS= tls
16.if !empty(PKG_OPTIONS:Mtls) 16.if !empty(PKG_OPTIONS:Mtls)
17PLIST.tls= yes 17PLIST.tls= yes
18. include "../../security/libretls/buildlink3.mk" 18. include "../../security/bearssl/buildlink3.mk"
19CONFIGURE_ARGS+= --enable-ssl=libressl 19CONFIGURE_ARGS+= --enable-ssl=bearssl
20 20
21PKG_USERS_VARS+= UCSPI_SSL_USER 21PKG_USERS_VARS+= UCSPI_SSL_USER
22PKG_GROUPS_VARS+= UCSPI_SSL_GROUP 22PKG_GROUPS_VARS+= UCSPI_SSL_GROUP
23PKG_GROUPS+= ${UCSPI_SSL_GROUP} 23PKG_GROUPS+= ${UCSPI_SSL_GROUP}
24PKG_USERS+= ${UCSPI_SSL_USER}:${UCSPI_SSL_GROUP} 24PKG_USERS+= ${UCSPI_SSL_USER}:${UCSPI_SSL_GROUP}
25 25
26SUBST_CLASSES+= paths 26SUBST_CLASSES+= paths
27SUBST_STAGE.paths= pre-configure 27SUBST_STAGE.paths= pre-configure
28SUBST_FILES.paths= s6-pkgsrc-cadir 28SUBST_FILES.paths= s6-pkgsrc-cadir
29SUBST_VARS.paths= SH SETENV SSLDIR 29SUBST_VARS.paths= SH SETENV SSLDIR
30 30
31post-extract: 31post-extract:
32 for f in s6-pkgsrc-cadir; do \ 32 for f in s6-pkgsrc-cadir; do \