pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/s6-networking Update to 2.4.0.0. From the changelog:
details: https://anonhg.NetBSD.org/pkgsrc/rev/ce6428256f1f
branches: trunk
changeset: 444725:ce6428256f1f
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Mon Jan 11 18:31:10 2021 +0000
description:
Update to 2.4.0.0. From the changelog:
- Can be built against OpenSSL + libretls.
- execline is now optional.
- s6-tlsc and s6-tlsd rewrite. They're now wrappers around new
binaries: s6-tlsc-io and s6-tlsd-io, which establish and run a
TLS tunnel over already existing fds.
- New functionality: s6-ucspitlsc and s6-ucspitlsd, for an
implementation of delayed encryption.
pkgsrc changes:
- Switch from BearSSL to LibreTLS (atop OpenSSL).
- Turn 'execline' option off by default.
diffstat:
net/s6-networking/Makefile | 23 ++---------------------
net/s6-networking/PLIST | 10 +++++++---
net/s6-networking/distinfo | 10 +++++-----
net/s6-networking/hacks.mk | 10 ----------
net/s6-networking/options.mk | 33 +++++++++++++++++++++++++++++----
5 files changed, 43 insertions(+), 43 deletions(-)
diffs (152 lines):
diff -r cb685c794e73 -r ce6428256f1f net/s6-networking/Makefile
--- a/net/s6-networking/Makefile Mon Jan 11 18:25:36 2021 +0000
+++ b/net/s6-networking/Makefile Mon Jan 11 18:31:10 2021 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2020/11/24 08:33:12 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2021/01/11 18:31:10 schmonz Exp $
-DISTNAME= s6-networking-2.3.2.0
-PKGREVISION= 2
+DISTNAME= s6-networking-2.4.0.0
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE}
@@ -16,27 +15,9 @@
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
-.include "../../lang/execline/buildlink3.mk"
.include "../../net/s6-dns/buildlink3.mk"
.include "../../sysutils/s6/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r cb685c794e73 -r ce6428256f1f net/s6-networking/PLIST
--- a/net/s6-networking/PLIST Mon Jan 11 18:25:36 2021 +0000
+++ b/net/s6-networking/PLIST Mon Jan 11 18:31:10 2021 +0000
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2020/11/24 08:33:12 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/01/11 18:31:10 schmonz Exp $
bin/minidentd
bin/s6-clockadd
bin/s6-clockview
bin/s6-getservbyname
bin/s6-ident-client
-bin/s6-pkgsrc-cadir
+${PLIST.tls}bin/s6-pkgsrc-cadir
bin/s6-sntpclock
bin/s6-taiclock
bin/s6-taiclockd
@@ -18,13 +18,17 @@
bin/s6-tcpserver6-socketbinder
bin/s6-tcpserver6d
${PLIST.tls}bin/s6-tlsc
+${PLIST.tls}bin/s6-tlsc-io
${PLIST.tls}bin/s6-tlsclient
${PLIST.tls}bin/s6-tlsd
+${PLIST.tls}bin/s6-tlsd-io
${PLIST.tls}bin/s6-tlsserver
+${PLIST.tls}bin/s6-ucspitlsc
+${PLIST.tls}bin/s6-ucspitlsd
include/s6-networking/config.h
include/s6-networking/ident.h
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/libsbearssl.a
+${PLIST.tls}lib/s6-networking/libstls.a
diff -r cb685c794e73 -r ce6428256f1f net/s6-networking/distinfo
--- a/net/s6-networking/distinfo Mon Jan 11 18:25:36 2021 +0000
+++ b/net/s6-networking/distinfo Mon Jan 11 18:31:10 2021 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2020/11/19 20:12:54 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2021/01/11 18:31:10 schmonz Exp $
-SHA1 (s6-networking-2.3.2.0.tar.gz) = 445d001d3cad598fdd505ed7f4155f9e917e76c0
-RMD160 (s6-networking-2.3.2.0.tar.gz) = b4d6c5966309682698f46f12f9d9694756d0b94c
-SHA512 (s6-networking-2.3.2.0.tar.gz) = 876005e3060493fb22efb59dcdc3392eb746454cf9c11c9c0ebdd6b24789db18e364039096a8a4168dcd4023b98e539d8489d490a0b7a24ddccc437f7076618d
-Size (s6-networking-2.3.2.0.tar.gz) = 87949 bytes
+SHA1 (s6-networking-2.4.0.0.tar.gz) = 7b013b0181d5873555bbaead902533429db207ae
+RMD160 (s6-networking-2.4.0.0.tar.gz) = 21fd26cff9868096d297b415f74e799da3db10ab
+SHA512 (s6-networking-2.4.0.0.tar.gz) = e8646bbfe965db0a736b1624e3533151182fd0d0337c08ab6af52f6872af1e8c82e3afa85fd146fec3f0640360173aa57182065982e1f3d60ec16862f449115b
+Size (s6-networking-2.4.0.0.tar.gz) = 102302 bytes
diff -r cb685c794e73 -r ce6428256f1f net/s6-networking/hacks.mk
--- a/net/s6-networking/hacks.mk Mon Jan 11 18:25:36 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# $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"
diff -r cb685c794e73 -r ce6428256f1f net/s6-networking/options.mk
--- a/net/s6-networking/options.mk Mon Jan 11 18:25:36 2021 +0000
+++ b/net/s6-networking/options.mk Mon Jan 11 18:31:10 2021 +0000
@@ -1,14 +1,39 @@
-# $NetBSD: options.mk,v 1.1 2020/11/22 11:33:22 schmonz Exp $
+# $NetBSD: options.mk,v 1.2 2021/01/11 18:31:10 schmonz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.s6-networking
-PKG_SUPPORTED_OPTIONS+= tls
+PKG_SUPPORTED_OPTIONS+= execline tls
PKG_SUGGESTED_OPTIONS+= tls
.include "../../mk/bsd.options.mk"
+.if !empty(PKG_OPTIONS:Mexecline)
+. include "../../lang/execline/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-execline
+.endif
+
PLIST_VARS= tls
.if !empty(PKG_OPTIONS:Mtls)
PLIST.tls= yes
-. include "../../security/bearssl/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-ssl=bearssl
+. include "../../security/libretls/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-ssl=libressl
+
+PKG_USERS_VARS+= UCSPI_SSL_USER
+PKG_GROUPS_VARS+= UCSPI_SSL_GROUP
+PKG_GROUPS+= ${UCSPI_SSL_GROUP}
+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
+
+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
.endif
Home |
Main Index |
Thread Index |
Old Index