CVS commit: pkgsrc/sysutils/s6

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Jan 16 21:48:20 UTC 2023

Modified Files:
        pkgsrc/sysutils/s6: Makefile PLIST buildlink3.mk distinfo

Log Message:
Update to 2.11.2.0. From the changelog:

- Adaptation to skalibs-2.13.0.0.
- The name of the service is now passed as an argument to ./run and
  as the third argument to ./finish.
- The 1-second service restart delay can now only be skipped when
  the service is ready.
- New s6-log directive: p, to set a log line prefix.
- Implementation of instances! New programs: s6-instance-maker,
  s6-instance-create, s6-instance-delete, s6-instance-control,
  s6-instance-status, s6-instance-list.
- Bugfixes.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/s6/Makefile \
    pkgsrc/sysutils/s6/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/s6/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/s6/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/s6/Makefile
diff -u pkgsrc/sysutils/s6/Makefile:1.12 pkgsrc/sysutils/s6/Makefile:1.13
--- pkgsrc/sysutils/s6/Makefile:1.12    Wed Aug 17 12:11:17 2022
+++ pkgsrc/sysutils/s6/Makefile Mon Jan 16 21:48:20 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2022/08/17 12:11:17 tnn Exp $
+# $NetBSD: Makefile,v 1.13 2023/01/16 21:48:20 schmonz Exp $
 
-DISTNAME=      s6-2.11.1.0
+DISTNAME=      s6-2.11.2.0
 CATEGORIES=    sysutils
 MASTER_SITES=  ${HOMEPAGE}
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES_DIST}
@@ -11,7 +11,7 @@ COMMENT=      The s6 supervision suite
 LICENSE=       isc
 
 # man-pages version is usually not exactly in-sync with PKGVERSION_NOREV
-MANPAGES_VERSION=      2.11.1.0.1
+MANPAGES_VERSION=      2.11.2.0.1
 MANPAGES_DIST=         s6-man-pages-${MANPAGES_VERSION}.tar.gz
 SITES.${MANPAGES_DIST}=        -${MASTER_SITE_GITHUB:=flexibeast/s6-man-pages/archive/}v${MANPAGES_VERSION}.tar.gz
 
Index: pkgsrc/sysutils/s6/distinfo
diff -u pkgsrc/sysutils/s6/distinfo:1.12 pkgsrc/sysutils/s6/distinfo:1.13
--- pkgsrc/sysutils/s6/distinfo:1.12    Wed Aug 17 12:11:17 2022
+++ pkgsrc/sysutils/s6/distinfo Mon Jan 16 21:48:20 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2022/08/17 12:11:17 tnn Exp $
+$NetBSD: distinfo,v 1.13 2023/01/16 21:48:20 schmonz Exp $
 
-BLAKE2s (s6-2.11.1.0.tar.gz) = caee4ba3dc65698034b4ba690fbe6da8ae59def6a15fa29a6091ac1f61b3e455
-SHA512 (s6-2.11.1.0.tar.gz) = ab3cb4a61fae21537eacffdaa427a0a6b23b12088586f0cd8dc993e0de29e9863d04c8706cb044acdc08254002b19eb5f894262d37348d467f8c713d8124e738
-Size (s6-2.11.1.0.tar.gz) = 228745 bytes
-BLAKE2s (s6-man-pages-2.11.1.0.1.tar.gz) = 3ce0a7fe1212ec232be6a56d4be414e9346effb41d16267f60424ac465f99db4
-SHA512 (s6-man-pages-2.11.1.0.1.tar.gz) = 1156970a3477c1dd3f71b914109bf70a59472f5e52cd147e7cc43c24eb69d7a06bd900fec1dfa870a3cbd068a7ac4c1e2288d5f9055b7c9af23360306d8cdd71
-Size (s6-man-pages-2.11.1.0.1.tar.gz) = 87269 bytes
+BLAKE2s (s6-2.11.2.0.tar.gz) = 531495a98594ef37be03d21efca0c009ea8330afb62ab15d986fd01b7c716108
+SHA512 (s6-2.11.2.0.tar.gz) = 6666283d833f300d6d01984ffcc912e2ab49f88b756dc1748a2b997324c17494ad0e9dd40c0b0af8d367eaea99ab33be2d7afb070fa44e1991eb33776172e8a5
+Size (s6-2.11.2.0.tar.gz) = 246294 bytes
+BLAKE2s (s6-man-pages-2.11.2.0.1.tar.gz) = 2dda8826023612ddddfa42c1550cb9b7f07050d61ed38ddd678d351e7d61c98e
+SHA512 (s6-man-pages-2.11.2.0.1.tar.gz) = 99d7f9dd0b963faa9e5434710b6314cb202e30bb9ab9186d2d5f6ec8de7d052276dd5067de5b8a906c49d3456ac4705cf43088f4052ddb967f357ecefb4c2a83
+Size (s6-man-pages-2.11.2.0.1.tar.gz) = 108846 bytes

Index: pkgsrc/sysutils/s6/PLIST
diff -u pkgsrc/sysutils/s6/PLIST:1.5 pkgsrc/sysutils/s6/PLIST:1.6
--- pkgsrc/sysutils/s6/PLIST:1.5        Wed Dec 22 16:03:27 2021
+++ pkgsrc/sysutils/s6/PLIST    Mon Jan 16 21:48:20 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2021/12/22 16:03:27 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/01/16 21:48:20 schmonz Exp $
 bin/s6-accessrules-cdb-from-fs
 bin/s6-accessrules-fs-from-cdb
 bin/s6-applyuidgid
@@ -21,6 +21,12 @@ bin/s6-ftrig-listen1
 bin/s6-ftrig-notify
 bin/s6-ftrig-wait
 bin/s6-ftrigrd
+bin/s6-instance-control
+bin/s6-instance-create
+bin/s6-instance-delete
+bin/s6-instance-list
+bin/s6-instance-maker
+bin/s6-instance-status
 bin/s6-ioconnect
 bin/s6-ipcclient
 bin/s6-ipcserver
@@ -59,6 +65,7 @@ bin/s6-usertree-maker
 bin/s6lockd
 bin/ucspilogd
 include/s6/accessrules.h
+include/s6/auto.h
 include/s6/compat.h
 include/s6/config.h
 include/s6/fdholder.h
@@ -66,8 +73,10 @@ include/s6/ftrigr.h
 include/s6/ftrigw.h
 include/s6/lock.h
 include/s6/s6.h
+include/s6/servicedir.h
 include/s6/supervise.h
 lib/s6/libs6.a
+lib/s6/libs6auto.a
 libexec/s6lockd-helper
 man/man7/s6-accessrules.7
 man/man7/s6-fdholder-error-codes.7
@@ -75,13 +84,18 @@ man/man7/s6-fdholder.7
 man/man7/s6-fifodir.7
 man/man7/s6-ftrigr.7
 man/man7/s6-ftrigw.7
+man/man7/s6-instanced-service.7
 man/man7/s6-libftrig.7
 man/man7/s6-libs6.7
 man/man7/s6-local-service.7
 man/man7/s6-notifywhenup.7
+man/man7/s6-overview.7
 man/man7/s6-s6lock.7
 man/man7/s6-scan-directory.7
 man/man7/s6-service-directory.7
+man/man7/s6-socket-activation.7
+man/man7/s6-svscan-as-process-1.7
+man/man7/s6-svscan-not-as-process-1.7
 man/man8/s6-accessrules-cdb-from-fs.8
 man/man8/s6-accessrules-fs-from-cdb.8
 man/man8/s6-applyuidgid.8
@@ -104,6 +118,12 @@ man/man8/s6-ftrig-listen1.8
 man/man8/s6-ftrig-notify.8
 man/man8/s6-ftrig-wait.8
 man/man8/s6-ftrigrd.8
+man/man8/s6-instance-control.8
+man/man8/s6-instance-create.8
+man/man8/s6-instance-delete.8
+man/man8/s6-instance-list.8
+man/man8/s6-instance-maker.8
+man/man8/s6-instance-status.8
 man/man8/s6-ioconnect.8
 man/man8/s6-ipcclient.8
 man/man8/s6-ipcserver-access.8

Index: pkgsrc/sysutils/s6/buildlink3.mk
diff -u pkgsrc/sysutils/s6/buildlink3.mk:1.3 pkgsrc/sysutils/s6/buildlink3.mk:1.4
--- pkgsrc/sysutils/s6/buildlink3.mk:1.3        Wed Sep 29 09:54:48 2021
+++ pkgsrc/sysutils/s6/buildlink3.mk    Mon Jan 16 21:48:20 2023
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2021/09/29 09:54:48 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2023/01/16 21:48:20 schmonz Exp $
 
 BUILDLINK_TREE+=       s6
 
 .if !defined(S6_BUILDLINK3_MK)
 S6_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.s6+=     s6>=2.11.0.0
+BUILDLINK_API_DEPENDS.s6+=     s6>=2.11.2.0
 BUILDLINK_PKGSRCDIR.s6?=       ../../sysutils/s6
 BUILDLINK_INCDIRS.s6+=         include/s6
 BUILDLINK_LIBDIRS.s6+=         lib/s6