CVS commit: pkgsrc/net/s6-networking

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jan 22 16:20:39 UTC 2021

Modified Files:
        pkgsrc/net/s6-networking: PLIST options.mk

Log Message:
LibreTLS + OpenSSL isn't working well for me yet. Switch back to BearSSL
for now, riding recent PKGREVISION bump.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/s6-networking/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/s6-networking/options.mk

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/PLIST
diff -u pkgsrc/net/s6-networking/PLIST:1.4 pkgsrc/net/s6-networking/PLIST:1.5
--- pkgsrc/net/s6-networking/PLIST:1.4  Mon Jan 11 18:31:10 2021
+++ pkgsrc/net/s6-networking/PLIST      Fri Jan 22 16:20:38 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2021/01/11 18:31:10 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/01/22 16:20:38 schmonz Exp $
 bin/minidentd
 bin/s6-clockadd
 bin/s6-clockview
@@ -31,4 +31,4 @@ include/s6-networking/s6net.h
 include/s6-networking/sbearssl.h
 include/s6-networking/stls.h
 lib/s6-networking/libs6net.a
-${PLIST.tls}lib/s6-networking/libstls.a
+${PLIST.tls}lib/s6-networking/libsbearssl.a

Index: pkgsrc/net/s6-networking/options.mk
diff -u pkgsrc/net/s6-networking/options.mk:1.2 pkgsrc/net/s6-networking/options.mk:1.3
--- pkgsrc/net/s6-networking/options.mk:1.2     Mon Jan 11 18:31:10 2021
+++ pkgsrc/net/s6-networking/options.mk Fri Jan 22 16:20:38 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2021/01/11 18:31:10 schmonz Exp $
+# $NetBSD: options.mk,v 1.3 2021/01/22 16:20:38 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.s6-networking
 PKG_SUPPORTED_OPTIONS+=        execline tls
@@ -15,8 +15,8 @@ CONFIGURE_ARGS+=      --disable-execline
 PLIST_VARS=            tls
 .if !empty(PKG_OPTIONS:Mtls)
 PLIST.tls=             yes
-.  include "../../security/libretls/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-ssl=libressl
+.  include "../../security/bearssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-ssl=bearssl
 
 PKG_USERS_VARS+=       UCSPI_SSL_USER
 PKG_GROUPS_VARS+=      UCSPI_SSL_GROUP