Skip to content

Commit

Permalink
Update to 2.11.0.0. From the changelog:
Browse files Browse the repository at this point in the history 
- Adaptation to skalibs-2.11.0.0.
- Bugfixes.
- s6-svwait now supports -r and -R options to wait for restarts.
- New service directory file: lock-fd, to take a lock before
  starting a service, protecting against concurrent instances.
- s6/lock.h, s6/supervise.h, s6/fdholder.h: simpler header names
- s6-ioconnect bugfix; does not support zero-copy anymore.
- New binaries: s6-svlink, s6-svunlink. The former is a rewrite of
  smarden.org's socklog program, in order to implement a fully
  functional syslogd with only s6 programs. The latter are tools that
  start and stop services by symlinking/unlinking service directories
  from a scan directory, in order to make it easier to integrate
  s6-style services in boot scripts for sequential service managers such
  as OpenRC.
  • Loading branch information
@schmonz
schmonz committed Sep 29, 2021
1 parent 833f12b commit bbc5618
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 19 deletions.
6 changes: 3 additions & 3 deletions sysutils/s6/Makefile
View file
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.7 2021/04/26 15:03:53 schmonz Exp $
# $NetBSD: Makefile,v 1.8 2021/09/29 09:54:48 schmonz Exp $

DISTNAME= s6-2.10.0.3
DISTNAME= s6-2.11.0.0
CATEGORIES= sysutils
MASTER_SITES= ${HOMEPAGE}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
Expand All @@ -10,7 +10,7 @@ HOMEPAGE= https://skarnet.org/software/s6/
COMMENT= The s6 supervision suite
LICENSE= isc

MANPAGES= v2.10.0.3.1.tar.gz
MANPAGES= v2.11.0.0.1.tar.gz
SITES.${MANPAGES}= ${MASTER_SITE_GITHUB:=flexibeast/s6-man-pages/archive/}

USE_TOOLS+= gmake
Expand Down
16 changes: 11 additions & 5 deletions sysutils/s6/PLIST
View file
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.3 2021/02/17 19:31:00 schmonz Exp $
@comment $NetBSD: PLIST,v 1.4 2021/09/29 09:54:48 schmonz Exp $
bin/s6-accessrules-cdb-from-fs
bin/s6-accessrules-fs-from-cdb
bin/s6-applyuidgid
Expand Down Expand Up @@ -34,6 +34,7 @@ bin/s6-permafailon
bin/s6-setlock
bin/s6-setsid
bin/s6-setuidgid
bin/s6-socklog
bin/s6-softlimit
bin/s6-sudo
bin/s6-sudoc
Expand All @@ -42,13 +43,15 @@ bin/s6-supervise
bin/s6-svc
bin/s6-svdt
bin/s6-svdt-clear
bin/s6-svlink
bin/s6-svlisten
bin/s6-svlisten1
bin/s6-svok
bin/s6-svperms
bin/s6-svscan
bin/s6-svscanctl
bin/s6-svstat
bin/s6-svunlink
bin/s6-svwait
bin/s6-tai64n
bin/s6-tai64nlocal
Expand All @@ -58,12 +61,12 @@ bin/ucspilogd
include/s6/accessrules.h
include/s6/compat.h
include/s6/config.h
include/s6/fdholder.h
include/s6/ftrigr.h
include/s6/ftrigw.h
include/s6/s6-fdholder.h
include/s6/s6-supervise.h
include/s6/lock.h
include/s6/s6.h
include/s6/s6lock.h
include/s6/supervise.h
lib/s6/libs6.a
libexec/s6lockd-helper
man/man1/s6-accessrules-cdb-from-fs.1
Expand Down Expand Up @@ -98,10 +101,10 @@ man/man1/s6-log.1
man/man1/s6-mkfifodir.1
man/man1/s6-notifyoncheck.1
man/man1/s6-permafailon.1
man/man1/s6-s6lockd.1
man/man1/s6-setlock.1
man/man1/s6-setsid.1
man/man1/s6-setuidgid.1
man/man1/s6-socklog.1
man/man1/s6-softlimit.1
man/man1/s6-sudo.1
man/man1/s6-sudoc.1
Expand All @@ -110,18 +113,21 @@ man/man1/s6-supervise.1
man/man1/s6-svc.1
man/man1/s6-svdt-clear.1
man/man1/s6-svdt.1
man/man1/s6-svlink.1
man/man1/s6-svlisten.1
man/man1/s6-svlisten1.1
man/man1/s6-svok.1
man/man1/s6-svperms.1
man/man1/s6-svscan.1
man/man1/s6-svscanctl.1
man/man1/s6-svstat.1
man/man1/s6-svunlink.1
man/man1/s6-svwait.1
man/man1/s6-tai64n.1
man/man1/s6-tai64nlocal.1
man/man1/s6-usertree-maker.1
man/man1/s6lockd-helper.1
man/man1/s6lockd.1
man/man1/ucspilogd.1
man/man7/s6-accessrules.7
man/man7/s6-fdholder-error-codes.7
Expand Down
4 changes: 2 additions & 2 deletions sysutils/s6/buildlink3.mk
View file
@@ -1,11 +1,11 @@
# $NetBSD: buildlink3.mk,v 1.2 2021/04/26 15:03:53 schmonz Exp $
# $NetBSD: buildlink3.mk,v 1.3 2021/09/29 09:54:48 schmonz Exp $

BUILDLINK_TREE+= s6

.if !defined(S6_BUILDLINK3_MK)
S6_BUILDLINK3_MK:=

BUILDLINK_API_DEPENDS.s6+= s6>=2.10.0.3
BUILDLINK_API_DEPENDS.s6+= s6>=2.11.0.0
BUILDLINK_PKGSRCDIR.s6?= ../../sysutils/s6
BUILDLINK_INCDIRS.s6+= include/s6
BUILDLINK_LIBDIRS.s6+= lib/s6
Expand Down
18 changes: 9 additions & 9 deletions sysutils/s6/distinfo
View file
@@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.6 2021/04/26 15:03:53 schmonz Exp $
$NetBSD: distinfo,v 1.7 2021/09/29 09:54:48 schmonz Exp $

SHA1 (s6-2.10.0.3.tar.gz) = d676f72d8bd2772e22b8a2967b6b7dcf6de62968
RMD160 (s6-2.10.0.3.tar.gz) = 856a75907c5488e3b7da845249d6c171bc5e92fc
SHA512 (s6-2.10.0.3.tar.gz) = 67261036498dd0f7857e4b05082eb5662997ebbf7642c1477262f486208361b827aa7ac6f36e1e0e78d7922a0018c52ee9992406b52df668a5dfaab76a6fe7c2
Size (s6-2.10.0.3.tar.gz) = 218797 bytes
SHA1 (v2.10.0.3.1.tar.gz) = 09d2142c742228c36e5651f250fc62dad70a6cae
RMD160 (v2.10.0.3.1.tar.gz) = f4518dd02fa68acde59f71e540124a4848bc04c0
SHA512 (v2.10.0.3.1.tar.gz) = 129dfe619f6e656e13bf4f650fa656e36622b6d29ea9a559f56740301dd69359b8f1f7b96d7199d15292e09b8555b1b3fa8ca9ff457e37806fb69cf7f0f28aa0
Size (v2.10.0.3.1.tar.gz) = 83576 bytes
SHA1 (s6-2.11.0.0.tar.gz) = 143d023fa25d22e1dd92027ea455fb425d18fde8
RMD160 (s6-2.11.0.0.tar.gz) = 3a26359b062b1040cadb1e3408cf779057fee7a1
SHA512 (s6-2.11.0.0.tar.gz) = 5421b01de6d4f75e80056d3335cef409b3eb1330f1585c8b303228a36e60537056bed130f3f375f3f02f9063be04fc8776c4687cb0ec23e969960ad3fb5141e3
Size (s6-2.11.0.0.tar.gz) = 227693 bytes
SHA1 (v2.11.0.0.1.tar.gz) = 56025d8148abf1ba2e9a0752200f0ea41d12e366
RMD160 (v2.11.0.0.1.tar.gz) = 4feb75e1cef46d0684bf11e9e8b9805bfc5c7f5e
SHA512 (v2.11.0.0.1.tar.gz) = 789ec7eb99877d9084295a09c4bcb5deb9aad36dce71a1b42d6ebcba30eb11ee7a8ab2edd06ade574af694483b27e1bc86bdfe1583d1cb7963d2757fae513845
Size (v2.11.0.0.1.tar.gz) = 87770 bytes

0 comments on commit bbc5618

Please sign in to comment.